diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-18 03:08:43 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-01-10 14:53:54 -0500 |
commit | 704cfb87886cddffd79e78ea5f717963dac68175 (patch) | |
tree | 0950d262fa716d8f4af693adfcbef413fe418d98 | |
parent | 49938ac4592fee8a1405e379cf6fc57aedbec798 (diff) |
drm/i915: s/hotplugt_status_gen4/hotplug_status_g4x/
We specifically exclude original gen4 (i.e. i965g/gm), so update the
naming for consistency. Spotted while reviewing related code due to a
report from Jesse about byt needing again different values.
v2: g4x, not gm45 since this also applies to the desktop version.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 261254a8a385..a9b0b181cb40 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -62,7 +62,7 @@ static const u32 hpd_mask_i915[] = { | |||
62 | [HPD_PORT_D] = PORTD_HOTPLUG_INT_EN | 62 | [HPD_PORT_D] = PORTD_HOTPLUG_INT_EN |
63 | }; | 63 | }; |
64 | 64 | ||
65 | static const u32 hpd_status_gen4[] = { | 65 | static const u32 hpd_status_g4x[] = { |
66 | [HPD_CRT] = CRT_HOTPLUG_INT_STATUS, | 66 | [HPD_CRT] = CRT_HOTPLUG_INT_STATUS, |
67 | [HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_G4X, | 67 | [HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_G4X, |
68 | [HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_G4X, | 68 | [HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_G4X, |
@@ -3658,7 +3658,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) | |||
3658 | hotplug_status); | 3658 | hotplug_status); |
3659 | 3659 | ||
3660 | intel_hpd_irq_handler(dev, hotplug_trigger, | 3660 | intel_hpd_irq_handler(dev, hotplug_trigger, |
3661 | IS_G4X(dev) ? hpd_status_gen4 : hpd_status_i915); | 3661 | IS_G4X(dev) ? hpd_status_g4x : hpd_status_i915); |
3662 | 3662 | ||
3663 | if (IS_G4X(dev) && | 3663 | if (IS_G4X(dev) && |
3664 | (hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)) | 3664 | (hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)) |