From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 03/12] drm/i915: Disable semaphore wait event idle message on BDW Date: Fri, 21 Mar 2014 11:48:12 -0700 Message-ID: <1395427701-13434-4-git-send-email-benjamin.widawsky@linux.intel.com> References: <1395427701-13434-1-git-send-email-benjamin.widawsky@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1395427701-13434-1-git-send-email-benjamin.widawsky@linux.intel.com> Sender: stable-owner@vger.kernel.org To: Intel GFX Cc: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org =46rom: Ville Syrj=C3=A4l=C3=A4 According to BSpec we need to always set this magic bit in ring buffer mode. Signed-off-by: Ville Syrj=C3=A4l=C3=A4 Reviewed-by: Mika Kuoppala Signed-off-by: Daniel Vetter [BDW 3.14 backport] Cc: stable@vger.kernel.org Signed-off-by: Ben Widawsky Conflicts: drivers/gpu/drm/i915/intel_pm.c --- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i91= 5_reg.h index a48b7ca..1240250 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -941,6 +941,9 @@ #define GEN6_BLITTER_LOCK_SHIFT 16 #define GEN6_BLITTER_FBC_NOTIFY (1<<3) =20 +#define GEN6_RC_SLEEP_PSMI_CONTROL 0x2050 +#define GEN8_RC_SEMA_IDLE_MSG_DISABLE (1 << 12) + #define GEN6_BSD_SLEEP_PSMI_CONTROL 0x12050 #define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0) #define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/int= el_pm.c index e1fc35a..7b79c18 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4755,6 +4755,9 @@ static void gen8_init_clock_gating(struct drm_dev= ice *dev) I915_WRITE(GEN7_FF_THREAD_MODE, I915_READ(GEN7_FF_THREAD_MODE) & ~(GEN8_FF_DS_REF_CNT_FFME | GEN7_FF_VS_REF_CNT_FFME)); + + I915_WRITE(GEN6_RC_SLEEP_PSMI_CONTROL, + _MASKED_BIT_ENABLE(GEN8_RC_SEMA_IDLE_MSG_DISABLE)); } =20 static void haswell_init_clock_gating(struct drm_device *dev) --=20 1.9.1