summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnimesh Manna <animesh.manna@intel.com>2015-08-26 01:36:06 +0530
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-09-30 10:14:23 +0200
commitc268444a2cecabc0ab567ca275662d80fa0ac813 (patch)
treea814f1c99204d4357c0f4cb6b3b89cd737c968f6
parent4b7ab5fca1976a53d59ef1558ddb06ba69fab356 (diff)
downloadlinux-stable-c268444a2cecabc0ab567ca275662d80fa0ac813.tar.gz
linux-stable-c268444a2cecabc0ab567ca275662d80fa0ac813.tar.bz2
linux-stable-c268444a2cecabc0ab567ca275662d80fa0ac813.zip
drm/i915/skl Remove the call for csr uninitialization from suspend path
This patch remove the function call to set the firmware loading status as uninitialized during suspend. Dmc firmware will restore the firmware in normal suspend. In previous patch added a check to directly read the hardware status and load the firmware if got reset during resume from suspend-hibernation. Cc: Daniel Vetter <daniel.vetter@intel.com> Signed-off-by: Animesh Manna <animesh.manna@intel.com> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com> Reviewed-by: A.Sunil Kamath <sunil.kamath@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b31485a8bd39..1cb6b82e17d4 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1051,12 +1051,6 @@ static int skl_suspend_complete(struct drm_i915_private *dev_priv)
{
/* Enabling DC6 is not a hard requirement to enter runtime D3 */
- /*
- * This is to ensure that CSR isn't identified as loaded before
- * CSR-loading program is called during runtime-resume.
- */
- intel_csr_load_status_set(dev_priv, FW_UNINITIALIZED);
-
skl_uninit_cdclk(dev_priv);
return 0;