redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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
hifive-unleashed-5.1
Daniel Vetter 2015-10-28 23:59:01 +02:00 committed by Jani Nikula
parent c729ed88af
commit bffbcd9343
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_csr.c
View File

@ -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;