Re: [Intel-gfx] [PATCH v.2 05/12] DRM/i915: Get rid if the 'hotplug_supported_mask' in struct drm_i915_private.

[Egbert Eich]

Daniel Vetter writes:
  On Mon, Feb 25, 2013 at 12:06:52PM -0500, Egbert Eich wrote:
   Now since we have replaced the bits to show interest in hotplug IRQs
   we can go and nuke the 'hotplug_supported_mask'.
   
   Signed-off-by: Egbert Eich e...@suse.de
  
  I've applied your patch up to this one. Patch four needed some manual
  convincing to fit correctly, but the new hpd infrastructure is now in
  place.
  
  To get the actual hpd irq storm detection going I think it'd be good to
  resend the remaining patches on top of latest drm-intel-nightly. I'll try
  to yell at people a bit harder to review things more timely this time
  around.
  
  Thanks for the patches.

Thanks guys for reviewing the patches. I will try to spare some time tonight
to look into the issues that came up. 
I got dragged into other tasks as well so I didn't even find the time to 
follow up on the patches myself.

For now I need to go back and debug yet another issue with SDVO on GM45 :(

Cheers,
Egbert.
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v.2 05/12] DRM/i915: Get rid if the 'hotplug_supported_mask' in struct drm_i915_private.

[Egbert Eich]

Now since we have replaced the bits to show interest in hotplug IRQs
we can go and nuke the 'hotplug_supported_mask'.

Signed-off-by: Egbert Eich e...@suse.de
---
 drivers/gpu/drm/i915/i915_drv.h   |1 -
 drivers/gpu/drm/i915/intel_crt.c  |2 --
 drivers/gpu/drm/i915/intel_dp.c   |3 ---
 drivers/gpu/drm/i915/intel_hdmi.c |3 ---
 drivers/gpu/drm/i915/intel_sdvo.c |9 +++--
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 316747a..d8604a6 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -922,7 +922,6 @@ typedef struct drm_i915_private {
u32 irq_mask;
u32 gt_irq_mask;
 
-   u32 hotplug_supported_mask;
struct work_struct hotplug_work;
bool enable_hotplug_processing;
 
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index de43cab..5654583 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -800,8 +800,6 @@ void intel_crt_init(struct drm_device *dev)
 */
crt-force_hotplug_required = 0;
 
-   dev_priv-hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS;
-
/*
 * TODO: find a proper way to discover whether we need to set the the
 * polarity and link reversal bits or not, instead of relying on the
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 549933a..5a77d40 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2839,17 +2839,14 @@ intel_dp_init_connector(struct intel_digital_port 
*intel_dig_port,
name = DPDDC-A;
break;
case PORT_B:
-   dev_priv-hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS;
intel_encoder-hpd_pin = HPD_PORT_B;
name = DPDDC-B;
break;
case PORT_C:
-   dev_priv-hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS;
intel_encoder-hpd_pin = HPD_PORT_C;
name = DPDDC-C;
break;
case PORT_D:
-   dev_priv-hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS;
intel_encoder-hpd_pin = HPD_PORT_D;
name = DPDDC-D;
break;
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c 
b/drivers/gpu/drm/i915/intel_hdmi.c
index 8cd6bc1..e48452a 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1023,17 +1023,14 @@ void intel_hdmi_init_connector(struct 
intel_digital_port *intel_dig_port,
case PORT_B:
intel_hdmi-ddc_bus = GMBUS_PORT_DPB;
intel_encoder-hpd_pin = HPD_PORT_B;
-   dev_priv-hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS;
break;
case PORT_C:
intel_hdmi-ddc_bus = GMBUS_PORT_DPC;
intel_encoder-hpd_pin = HPD_PORT_C;
-   dev_priv-hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS;
break;
case PORT_D:
intel_hdmi-ddc_bus = GMBUS_PORT_DPD;
intel_encoder-hpd_pin = HPD_PORT_D;
-   dev_priv-hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS;
break;
case PORT_A:
intel_encoder-hpd_pin = HPD_PORT_A;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c 
b/drivers/gpu/drm/i915/intel_sdvo.c
index cf57705..d362dd5 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2780,6 +2780,9 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t 
sdvo_reg, bool is_sdvob)
SDVOB_HOTPLUG_INT_STATUS_I915 : 
SDVOC_HOTPLUG_INT_STATUS_I915;
}
 
+   /* Only enable the hotplug irq if we need it, to work around noisy
+* hotplug lines.
+*/
if (intel_sdvo-hotplug_active)
intel_encoder-hpd_pin = HPD_SDVO_B ? HPD_SDVO_B : HPD_SDVO_C;
 
@@ -2811,12 +2814,6 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t 
sdvo_reg, bool is_sdvob)
 */
intel_sdvo-base.cloneable = false;
 
-   /* Only enable the hotplug irq if we need it, to work around noisy
-* hotplug lines.
-*/
-   if (intel_sdvo-hotplug_active)
-   dev_priv-hotplug_supported_mask |= hotplug_mask;
-
intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo, sdvo_reg);
 
/* Set the input timing to the screen. Assume always input 0. */
-- 
1.7.7

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx