This is a note to let you know that I've just added the patch titled
drm/i915/vlv: remove wait for previous GFX clk disable request
to the 3.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-vlv-remove-wait-for-previous-gfx-clk-disable-request.patch
and it can be found in the queue-3.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5df0582bf036bb5f9a8ad8db5884fe13a55347d1 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Date: Wed, 1 Apr 2015 14:22:58 -0700
Subject: drm/i915/vlv: remove wait for previous GFX clk disable request
From: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
commit 5df0582bf036bb5f9a8ad8db5884fe13a55347d1 upstream.
Looks like it was introduced in:
commit 650ad970a39f8b6164fe8613edc150f585315289
Author: Imre Deak <imre.deak@xxxxxxxxx>
Date: Fri Apr 18 16:35:02 2014 +0300
drm/i915: vlv: factor out vlv_force_gfx_clock and check for pending force-of
but I'm not sure why. It has caused problems for us in the past (see
85250ddff7a6 "drm/i915/chv: Remove Wait for a previous gfx force-off"
and 8d4eee9cd7a1 "drm/i915: vlv: increase timeout when forcing on the
GFX clock") and doesn't seem to be required, so let's just drop it.
References: https://bugs.freedesktop.org/show_bug.cgi?id=89611
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Tested-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Reviewed-by: Deepak S <deepak.s@xxxxxxxxxxxxxxx>
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/i915_drv.c | 14 --------------
1 file changed, 14 deletions(-)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1197,21 +1197,7 @@ int vlv_force_gfx_clock(struct drm_i915_
u32 val;
int err;
- val = I915_READ(VLV_GTLC_SURVIVABILITY_REG);
-
#define COND (I915_READ(VLV_GTLC_SURVIVABILITY_REG) & VLV_GFX_CLK_STATUS_BIT)
- /* Wait for a previous force-off to settle */
- if (force_on && !IS_CHERRYVIEW(dev_priv->dev)) {
- /* WARN_ON only for the Valleyview */
- WARN_ON(!!(val & VLV_GFX_CLK_FORCE_ON_BIT) == force_on);
-
- err = wait_for(!COND, 20);
- if (err) {
- DRM_ERROR("timeout waiting for GFX clock force-off (%08x)\n",
- I915_READ(VLV_GTLC_SURVIVABILITY_REG));
- return err;
- }
- }
val = I915_READ(VLV_GTLC_SURVIVABILITY_REG);
val &= ~VLV_GFX_CLK_FORCE_ON_BIT;
Patches currently in stable-queue which might be from jbarnes@xxxxxxxxxxxxxxxx are
queue-3.19/drm-i915-vlv-remove-wait-for-previous-gfx-clk-disable-request.patch
queue-3.19/drm-i915-vlv-save-restore-the-power-context-base-reg.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html