[lkml]   [2013]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[ 27/50] drm/i915: fix rps.vlv_work initialization
3.11-stable review patch.  If anyone has any objections, please let me know.


From: Imre Deak <>

commit 671952a2a290a90017c64e75b7dd0343b0d005b4 upstream.

During driver loading we are initializing rps.vlv_work in
valleyview_enable_rps() via the rps.delayed_resume_work delayed work.
This is too late since we are using vlv_work already via
intel_disable_gt_powersave(). This at least leads to the following
kernel warning:

INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.

Fix this by initialzing vlv_work before we call intel_uncore_sanitize().

The regression was introduced in

commit 7dcd2677ea912573d9ed4bcd629b0023b2d11505
Author: Konstantin Khlebnikov <>
Date: Wed Jul 17 10:22:58 2013 +0400

drm/i915: fix long-standing SNB regression in power consumption
after resume

though there was no good reason to initialize the static vlv_work from
another delayed work to begin with (especially since this will happen
multiple times).

Tested-by: shui yangwei <>
Signed-off-by: Imre Deak <>
Signed-off-by: Daniel Vetter <>
Signed-off-by: Greg Kroah-Hartman <>

drivers/gpu/drm/i915/intel_pm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3603,8 +3603,6 @@ static void valleyview_enable_rps(struct

- INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work);
valleyview_set_rps(dev_priv->dev, dev_priv->rps.rpe_delay);

/* requires MSI enabled */
@@ -5567,6 +5565,8 @@ void intel_pm_init(struct drm_device *de

+ INIT_DELAYED_WORK(&dev_priv->rps.vlv_work, vlv_rps_timer_work);

int sandybridge_pcode_read(struct drm_i915_private *dev_priv, u8 mbox, u32 *val)

 \ /
  Last update: 2013-10-16 20:21    [W:0.196 / U:2.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site