From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2) Date: Tue, 26 Mar 2013 08:57:13 +0100 Message-ID: <20130326075713.GO9021@phenom.ffwll.local> References: <1364240405-9700-1-git-send-email-ajax@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by gabe.freedesktop.org (Postfix) with ESMTP id B054AE5CD9 for ; Tue, 26 Mar 2013 00:54:24 -0700 (PDT) Received: by mail-ee0-f41.google.com with SMTP id c1so1258246eek.28 for ; Tue, 26 Mar 2013 00:54:23 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1364240405-9700-1-git-send-email-ajax@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Adam Jackson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Mar 25, 2013 at 03:40:05PM -0400, Adam Jackson wrote: > f40ebd6b properly disabled the hsync/vsync logic at disable time, but > neglected to re-enable them at enable time. > > v2: In the enable hook, restore the connector's expected DPMS level > instead of forcing ON. Do this by stashing a back pointer to the > connector in the crt (suggested by danvet) since otherwise it's awkward > to look up. > > Signed-off-by: Adam Jackson Picked up for -fixes, thanks for the patch. Also adding Patrick to cc in case he wants to chime in. -Daniel > --- > drivers/gpu/drm/i915/intel_crt.c | 40 +++++++++++++++++----------------------- > 1 file changed, 17 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c > index 32a3693..498dafd 100644 > --- a/drivers/gpu/drm/i915/intel_crt.c > +++ b/drivers/gpu/drm/i915/intel_crt.c > @@ -45,6 +45,9 @@ > > struct intel_crt { > struct intel_encoder base; > + /* DPMS state is stored in the connector, which we need in the > + * encoder's enable/disable callbacks */ > + struct intel_connector *connector; > bool force_hotplug_required; > u32 adpa_reg; > }; > @@ -81,29 +84,6 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder, > return true; > } > > -static void intel_disable_crt(struct intel_encoder *encoder) > -{ > - struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; > - struct intel_crt *crt = intel_encoder_to_crt(encoder); > - u32 temp; > - > - temp = I915_READ(crt->adpa_reg); > - temp |= ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE; > - temp &= ~ADPA_DAC_ENABLE; > - I915_WRITE(crt->adpa_reg, temp); > -} > - > -static void intel_enable_crt(struct intel_encoder *encoder) > -{ > - struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; > - struct intel_crt *crt = intel_encoder_to_crt(encoder); > - u32 temp; > - > - temp = I915_READ(crt->adpa_reg); > - temp |= ADPA_DAC_ENABLE; > - I915_WRITE(crt->adpa_reg, temp); > -} > - > /* Note: The caller is required to filter out dpms modes not supported by the > * platform. */ > static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode) > @@ -135,6 +115,19 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode) > I915_WRITE(crt->adpa_reg, temp); > } > > +static void intel_disable_crt(struct intel_encoder *encoder) > +{ > + intel_crt_set_dpms(encoder, DRM_MODE_DPMS_OFF); > +} > + > +static void intel_enable_crt(struct intel_encoder *encoder) > +{ > + struct intel_crt *crt = intel_encoder_to_crt(encoder); > + > + intel_crt_set_dpms(encoder, crt->connector->dpms); > +} > + > + > static void intel_crt_dpms(struct drm_connector *connector, int mode) > { > struct drm_device *dev = connector->dev; > @@ -746,6 +739,7 @@ void intel_crt_init(struct drm_device *dev) > } > > connector = &intel_connector->base; > + crt->connector = connector; > drm_connector_init(dev, &intel_connector->base, > &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA); > > -- > 1.8.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch