Commit a9c287c9 authored by Jani Nikula's avatar Jani Nikula

drm/i915/irq: switch to kernel types

Mixed C99 and kernel types use is getting ugly.	Prefer kernel types.

sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/841f4eac1c52f4ed3efe2ac9e343d6640c03b774.1547629303.git.jani.nikula@intel.com
parent e5315213
...@@ -223,10 +223,10 @@ static void gen9_guc_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir); ...@@ -223,10 +223,10 @@ static void gen9_guc_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir);
/* For display hotplug interrupt */ /* For display hotplug interrupt */
static inline void static inline void
i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv, i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,
uint32_t mask, u32 mask,
uint32_t bits) u32 bits)
{ {
uint32_t val; u32 val;
lockdep_assert_held(&dev_priv->irq_lock); lockdep_assert_held(&dev_priv->irq_lock);
WARN_ON(bits & ~mask); WARN_ON(bits & ~mask);
...@@ -250,8 +250,8 @@ i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv, ...@@ -250,8 +250,8 @@ i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,
* version is also available. * version is also available.
*/ */
void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv, void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv,
uint32_t mask, u32 mask,
uint32_t bits) u32 bits)
{ {
spin_lock_irq(&dev_priv->irq_lock); spin_lock_irq(&dev_priv->irq_lock);
i915_hotplug_interrupt_update_locked(dev_priv, mask, bits); i915_hotplug_interrupt_update_locked(dev_priv, mask, bits);
...@@ -300,10 +300,10 @@ static bool gen11_reset_one_iir(struct drm_i915_private * const i915, ...@@ -300,10 +300,10 @@ static bool gen11_reset_one_iir(struct drm_i915_private * const i915,
* @enabled_irq_mask: mask of interrupt bits to enable * @enabled_irq_mask: mask of interrupt bits to enable
*/ */
void ilk_update_display_irq(struct drm_i915_private *dev_priv, void ilk_update_display_irq(struct drm_i915_private *dev_priv,
uint32_t interrupt_mask, u32 interrupt_mask,
uint32_t enabled_irq_mask) u32 enabled_irq_mask)
{ {
uint32_t new_val; u32 new_val;
lockdep_assert_held(&dev_priv->irq_lock); lockdep_assert_held(&dev_priv->irq_lock);
...@@ -330,8 +330,8 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv, ...@@ -330,8 +330,8 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv,
* @enabled_irq_mask: mask of interrupt bits to enable * @enabled_irq_mask: mask of interrupt bits to enable
*/ */
static void ilk_update_gt_irq(struct drm_i915_private *dev_priv, static void ilk_update_gt_irq(struct drm_i915_private *dev_priv,
uint32_t interrupt_mask, u32 interrupt_mask,
uint32_t enabled_irq_mask) u32 enabled_irq_mask)
{ {
lockdep_assert_held(&dev_priv->irq_lock); lockdep_assert_held(&dev_priv->irq_lock);
...@@ -345,13 +345,13 @@ static void ilk_update_gt_irq(struct drm_i915_private *dev_priv, ...@@ -345,13 +345,13 @@ static void ilk_update_gt_irq(struct drm_i915_private *dev_priv,
I915_WRITE(GTIMR, dev_priv->gt_irq_mask); I915_WRITE(GTIMR, dev_priv->gt_irq_mask);
} }
void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask) void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, u32 mask)
{ {
ilk_update_gt_irq(dev_priv, mask, mask); ilk_update_gt_irq(dev_priv, mask, mask);
POSTING_READ_FW(GTIMR); POSTING_READ_FW(GTIMR);
} }
void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask) void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, u32 mask)
{ {
ilk_update_gt_irq(dev_priv, mask, 0); ilk_update_gt_irq(dev_priv, mask, 0);
} }
...@@ -390,10 +390,10 @@ static i915_reg_t gen6_pm_ier(struct drm_i915_private *dev_priv) ...@@ -390,10 +390,10 @@ static i915_reg_t gen6_pm_ier(struct drm_i915_private *dev_priv)
* @enabled_irq_mask: mask of interrupt bits to enable * @enabled_irq_mask: mask of interrupt bits to enable
*/ */
static void snb_update_pm_irq(struct drm_i915_private *dev_priv, static void snb_update_pm_irq(struct drm_i915_private *dev_priv,
uint32_t interrupt_mask, u32 interrupt_mask,
uint32_t enabled_irq_mask) u32 enabled_irq_mask)
{ {
uint32_t new_val; u32 new_val;
WARN_ON(enabled_irq_mask & ~interrupt_mask); WARN_ON(enabled_irq_mask & ~interrupt_mask);
...@@ -577,11 +577,11 @@ void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv) ...@@ -577,11 +577,11 @@ void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv)
* @enabled_irq_mask: mask of interrupt bits to enable * @enabled_irq_mask: mask of interrupt bits to enable
*/ */
static void bdw_update_port_irq(struct drm_i915_private *dev_priv, static void bdw_update_port_irq(struct drm_i915_private *dev_priv,
uint32_t interrupt_mask, u32 interrupt_mask,
uint32_t enabled_irq_mask) u32 enabled_irq_mask)
{ {
uint32_t new_val; u32 new_val;
uint32_t old_val; u32 old_val;
lockdep_assert_held(&dev_priv->irq_lock); lockdep_assert_held(&dev_priv->irq_lock);
...@@ -611,10 +611,10 @@ static void bdw_update_port_irq(struct drm_i915_private *dev_priv, ...@@ -611,10 +611,10 @@ static void bdw_update_port_irq(struct drm_i915_private *dev_priv,
*/ */
void bdw_update_pipe_irq(struct drm_i915_private *dev_priv, void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
enum pipe pipe, enum pipe pipe,
uint32_t interrupt_mask, u32 interrupt_mask,
uint32_t enabled_irq_mask) u32 enabled_irq_mask)
{ {
uint32_t new_val; u32 new_val;
lockdep_assert_held(&dev_priv->irq_lock); lockdep_assert_held(&dev_priv->irq_lock);
...@@ -641,10 +641,10 @@ void bdw_update_pipe_irq(struct drm_i915_private *dev_priv, ...@@ -641,10 +641,10 @@ void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
* @enabled_irq_mask: mask of interrupt bits to enable * @enabled_irq_mask: mask of interrupt bits to enable
*/ */
void ibx_display_interrupt_update(struct drm_i915_private *dev_priv, void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
uint32_t interrupt_mask, u32 interrupt_mask,
uint32_t enabled_irq_mask) u32 enabled_irq_mask)
{ {
uint32_t sdeimr = I915_READ(SDEIMR); u32 sdeimr = I915_READ(SDEIMR);
sdeimr &= ~interrupt_mask; sdeimr &= ~interrupt_mask;
sdeimr |= (~enabled_irq_mask & interrupt_mask); sdeimr |= (~enabled_irq_mask & interrupt_mask);
...@@ -1368,8 +1368,8 @@ static void ivybridge_parity_work(struct work_struct *work) ...@@ -1368,8 +1368,8 @@ static void ivybridge_parity_work(struct work_struct *work)
container_of(work, typeof(*dev_priv), l3_parity.error_work); container_of(work, typeof(*dev_priv), l3_parity.error_work);
u32 error_status, row, bank, subbank; u32 error_status, row, bank, subbank;
char *parity_event[6]; char *parity_event[6];
uint32_t misccpctl; u32 misccpctl;
uint8_t slice = 0; u8 slice = 0;
/* We must turn off DOP level clock gating to access the L3 registers. /* We must turn off DOP level clock gating to access the L3 registers.
* In order to prevent a get/put style interface, acquire struct mutex * In order to prevent a get/put style interface, acquire struct mutex
...@@ -1730,13 +1730,13 @@ static void dp_aux_irq_handler(struct drm_i915_private *dev_priv) ...@@ -1730,13 +1730,13 @@ static void dp_aux_irq_handler(struct drm_i915_private *dev_priv)
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
enum pipe pipe, enum pipe pipe,
uint32_t crc0, uint32_t crc1, u32 crc0, u32 crc1,
uint32_t crc2, uint32_t crc3, u32 crc2, u32 crc3,
uint32_t crc4) u32 crc4)
{ {
struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];
struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe); struct intel_crtc *crtc = intel_get_crtc_for_pipe(dev_priv, pipe);
uint32_t crcs[5]; u32 crcs[5];
spin_lock(&pipe_crc->lock); spin_lock(&pipe_crc->lock);
/* /*
...@@ -1768,9 +1768,9 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, ...@@ -1768,9 +1768,9 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
static inline void static inline void
display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
enum pipe pipe, enum pipe pipe,
uint32_t crc0, uint32_t crc1, u32 crc0, u32 crc1,
uint32_t crc2, uint32_t crc3, u32 crc2, u32 crc3,
uint32_t crc4) {} u32 crc4) {}
#endif #endif
...@@ -1796,7 +1796,7 @@ static void ivb_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, ...@@ -1796,7 +1796,7 @@ static void ivb_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
static void i9xx_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, static void i9xx_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
enum pipe pipe) enum pipe pipe)
{ {
uint32_t res1, res2; u32 res1, res2;
if (INTEL_GEN(dev_priv) >= 3) if (INTEL_GEN(dev_priv) >= 3)
res1 = I915_READ(PIPE_CRC_RES_RES1_I915(pipe)); res1 = I915_READ(PIPE_CRC_RES_RES1_I915(pipe));
...@@ -3172,7 +3172,7 @@ static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe) ...@@ -3172,7 +3172,7 @@ static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
unsigned long irqflags; unsigned long irqflags;
uint32_t bit = INTEL_GEN(dev_priv) >= 7 ? u32 bit = INTEL_GEN(dev_priv) >= 7 ?
DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe); DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
spin_lock_irqsave(&dev_priv->irq_lock, irqflags); spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
...@@ -3234,7 +3234,7 @@ static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe) ...@@ -3234,7 +3234,7 @@ static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe)
{ {
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
unsigned long irqflags; unsigned long irqflags;
uint32_t bit = INTEL_GEN(dev_priv) >= 7 ? u32 bit = INTEL_GEN(dev_priv) >= 7 ?
DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe); DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);
spin_lock_irqsave(&dev_priv->irq_lock, irqflags); spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
...@@ -3452,7 +3452,7 @@ static void gen11_irq_reset(struct drm_device *dev) ...@@ -3452,7 +3452,7 @@ static void gen11_irq_reset(struct drm_device *dev)
void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv, void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
u8 pipe_mask) u8 pipe_mask)
{ {
uint32_t extra_ier = GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN; u32 extra_ier = GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN;
enum pipe pipe; enum pipe pipe;
spin_lock_irq(&dev_priv->irq_lock); spin_lock_irq(&dev_priv->irq_lock);
...@@ -3921,7 +3921,7 @@ static int valleyview_irq_postinstall(struct drm_device *dev) ...@@ -3921,7 +3921,7 @@ static int valleyview_irq_postinstall(struct drm_device *dev)
static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv) static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv)
{ {
/* These are interrupts we'll toggle with the ring mask register */ /* These are interrupts we'll toggle with the ring mask register */
uint32_t gt_interrupts[] = { u32 gt_interrupts[] = {
GT_RENDER_USER_INTERRUPT << GEN8_RCS_IRQ_SHIFT | GT_RENDER_USER_INTERRUPT << GEN8_RCS_IRQ_SHIFT |
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_RCS_IRQ_SHIFT | GT_CONTEXT_SWITCH_INTERRUPT << GEN8_RCS_IRQ_SHIFT |
GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT | GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT |
...@@ -3949,8 +3949,8 @@ static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv) ...@@ -3949,8 +3949,8 @@ static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv)
static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
{ {
uint32_t de_pipe_masked = GEN8_PIPE_CDCLK_CRC_DONE; u32 de_pipe_masked = GEN8_PIPE_CDCLK_CRC_DONE;
uint32_t de_pipe_enables; u32 de_pipe_enables;
u32 de_port_masked = GEN8_AUX_CHANNEL_A; u32 de_port_masked = GEN8_AUX_CHANNEL_A;
u32 de_port_enables; u32 de_port_enables;
u32 de_misc_masked = GEN8_DE_EDP_PSR; u32 de_misc_masked = GEN8_DE_EDP_PSR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment