Messages in this thread | | | Date | Thu, 8 Apr 2010 09:35:35 -0700 | From | Jesse Barnes <> | Subject | Re: [RFC PATCH] drm/i915: Don't touch PORT_HOTPLUG_EN in intel_dp_detect() |
| |
On Sat, 27 Mar 2010 22:48:33 +0100 Karsten Wiese <fzuuzf@googlemail.com> wrote:
> PORT_HOTPLUG_EN has allready been setup in i915_driver_irq_postinstall(), > when intel_dp_detect() runs. > > Delete the DP[BCD]_HOTPLUG_INT_EN defines, they are not referenced anymore. > > I found this while searching for a fix for > https://bugzilla.redhat.com/show_bug.cgi?id=528312 > > Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> > --- > See also > "drm/i915: only enable hotplug for detected outputs" > b01f2c3a4a37d09a47ad73ccbb46d554d21cfeb0 > > drivers/gpu/drm/i915/i915_reg.h | 3 --- > drivers/gpu/drm/i915/intel_dp.c | 10 ---------- > 2 files changed, 0 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index ab1bd2d..92f440d 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -854,11 +854,8 @@ > /* Hotplug control (945+ only) */ > #define PORT_HOTPLUG_EN 0x61110 > #define HDMIB_HOTPLUG_INT_EN (1 << 29) > -#define DPB_HOTPLUG_INT_EN (1 << 29) > #define HDMIC_HOTPLUG_INT_EN (1 << 28) > -#define DPC_HOTPLUG_INT_EN (1 << 28) > #define HDMID_HOTPLUG_INT_EN (1 << 27) > -#define DPD_HOTPLUG_INT_EN (1 << 27) > #define SDVOB_HOTPLUG_INT_EN (1 << 26) > #define SDVOC_HOTPLUG_INT_EN (1 << 25) > #define TV_HOTPLUG_INT_EN (1 << 18) > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 439506c..7a3b5c8 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -1179,16 +1179,6 @@ intel_dp_detect(struct drm_connector *connector) > if (IS_IRONLAKE(dev)) > return ironlake_dp_detect(connector); > > - temp = I915_READ(PORT_HOTPLUG_EN); > - > - I915_WRITE(PORT_HOTPLUG_EN, > - temp | > - DPB_HOTPLUG_INT_EN | > - DPC_HOTPLUG_INT_EN | > - DPD_HOTPLUG_INT_EN); > - > - POSTING_READ(PORT_HOTPLUG_EN); > - > switch (dp_priv->output_reg) { > case DP_B: > bit = DPB_HOTPLUG_INT_STATUS; > -- >
Yeah, looks like we already cover this with the hotplug_supported_mask setup we do here, so we should be able to drop these bits.
So assuming it's been tested with a real DP output + hotplug:
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-- Jesse Barnes, Intel Open Source Technology Center
| |