From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 17/24] drm/i915: disable pipe DDI function when disabling pipe Date: Mon, 30 Apr 2012 17:23:43 -0700 Message-ID: <20120430172343.75acc6e9@jbarnes-desktop> References: <1335464479-648-1-git-send-email-eugeni.dodonov@intel.com> <1335464479-648-18-git-send-email-eugeni.dodonov@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy9.bluehost.com (oproxy9.bluehost.com [69.89.24.6]) by gabe.freedesktop.org (Postfix) with SMTP id C83749EB4E for ; Mon, 30 Apr 2012 17:23:45 -0700 (PDT) In-Reply-To: <1335464479-648-18-git-send-email-eugeni.dodonov@intel.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: Eugeni Dodonov Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, 26 Apr 2012 15:21:12 -0300 Eugeni Dodonov wrote: > Signed-off-by: Eugeni Dodonov > --- > drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 5be2ff1..b7e50af 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1627,6 +1627,16 @@ static void intel_disable_pipe(struct drm_i915_private *dev_priv, > > I915_WRITE(reg, val & ~PIPECONF_ENABLE); > intel_wait_for_pipe_off(dev_priv->dev, pipe); > + > + /* On HSW, disable pipe DDI function the pipe */ > + if (IS_HASWELL(dev_priv->dev)) { > + val = I915_READ(DDI_FUNC_CTL(pipe)); > + val &= ~PIPE_DDI_PORT_MASK; > + val &= ~PIPE_DDI_FUNC_ENABLE; > + I915_WRITE(DDI_FUNC_CTL(pipe), > + val); > + } > + > } > > /* Looks like we could just write 0 here? -- Jesse Barnes, Intel Open Source Technology Center