OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f514c2d
)
drm/i915/skl: Removed assert for csr-fw-loading check during disabling dc6
author
Animesh Manna
<animesh.manna@intel.com>
Wed, 28 Oct 2015 21:59:07 +0000
(23:59 +0200)
committer
Jani Nikula
<jani.nikula@intel.com>
Thu, 12 Nov 2015 15:32:06 +0000
(17:32 +0200)
As during disabling dc6 no need to check for csr firmware
loading status, so removed the assert call (Requested by Damien).
Cc: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Tested-by: Daniel Stone <daniels@collabora.com> # SKL
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link:
http://patchwork.freedesktop.org/patch/msgid/1446069547-24760-14-git-send-email-imre.deak@intel.com
drivers/gpu/drm/i915/intel_runtime_pm.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_runtime_pm.c
b/drivers/gpu/drm/i915/intel_runtime_pm.c
index
35a344d
..
4bd8343
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/
drivers/gpu/drm/i915/intel_runtime_pm.c
@@
-553,7
+553,6
@@
static void assert_can_disable_dc6(struct drm_i915_private *dev_priv)
if (dev_priv->power_domains.initializing)
return;
- assert_csr_loaded(dev_priv);
WARN_ONCE(!(I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC6),
"DC6 already programmed to be disabled.\n");
}