summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_csr.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@intel.com>2015-10-29 00:59:01 +0300
committerJani Nikula <jani.nikula@intel.com>2015-11-12 18:22:03 +0300
commitbffbcd934360721cee27ed45a6558830b0cb7d29 (patch)
tree9210997562cae445d22a2e94851aa2cec3dc8dd4 /drivers/gpu/drm/i915/intel_csr.c
parentc729ed88af7b5266325d324672c4fdf8debd70a9 (diff)
downloadlinux-bffbcd934360721cee27ed45a6558830b0cb7d29.tar.xz
drm/i915/gen9: Don't try to load garbage dmc firmware on resume
We need to make sure we don't put garbage into the hw if dmc firmware loading failed mid-thru. Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: Sunil Kamath <sunil.kamath@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@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-8-git-send-email-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_csr.c')
-rw-r--r--drivers/gpu/drm/i915/intel_csr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 4bd2747d9c92..a65a8d508dc9 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -223,7 +223,7 @@ void intel_csr_load_program(struct drm_device *dev)
* Unfortunately the ACPI subsystem doesn't yet give us a way to
* differentiate this, hence figure it out with this hack.
*/
- if (I915_READ(CSR_PROGRAM(0)))
+ if ((!dev_priv->csr.dmc_payload) || I915_READ(CSR_PROGRAM(0)))
return;
fw_size = dev_priv->csr.dmc_fw_size;