From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH] drm/i915/vlv: reset VLV media force wake request register Date: Fri, 09 May 2014 16:34:28 +0300 Message-ID: <87d2fn6pp7.fsf@gaia.fi.intel.com> References: <1399639278-30941-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 0346B6EFA0 for ; Fri, 9 May 2014 06:35:32 -0700 (PDT) In-Reply-To: <1399639278-30941-1-git-send-email-jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org, Darren Hart , Imre Deak Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org Jani Nikula writes: > Media force wake get hangs the machine when the system is booted without > displays attached. The assumption is that (at least some versions of) > the firmware has skipped some initialization in that case. > > Empirical evidence suggests we need to reset the media force wake > request register in addition to the render one to avoid hangs. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75895 > Reported-by: Imre Deak > Reported-by: Darren Hart > Cc: stable@vger.kernel.org > Signed-off-by: Jani Nikula Reviewed-by: Mika Kuoppala > --- > > Darren, a Tested-by would be much appreciated! > > Thanks, > Jani. > --- > drivers/gpu/drm/i915/intel_uncore.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index 76dc185793ce..27fe2df47d73 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -185,6 +185,8 @@ static void vlv_force_wake_reset(struct drm_i915_private *dev_priv) > { > __raw_i915_write32(dev_priv, FORCEWAKE_VLV, > _MASKED_BIT_DISABLE(0xffff)); > + __raw_i915_write32(dev_priv, FORCEWAKE_MEDIA_VLV, > + _MASKED_BIT_DISABLE(0xffff)); > /* something from same cacheline, but !FORCEWAKE_VLV */ > __raw_posting_read(dev_priv, FORCEWAKE_ACK_VLV); > } > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx