提交 fc131bf2 编写于 作者: P Patrik Jakobsson 提交者: Imre Deak

drm/i915: Don't trust CSR program memory contents

Replaces "drm/i915: Force loading of csr program at boot" in the old
series.

Previously we called blindly into intel_csr_load_program() and depended
on a check of whether the CSR program memory was cleared or not.
This check is not reliable and no longer needed since we fixed the
call-sites of intel_csr_load_program().
Signed-off-by: NPatrik Jakobsson <patrik.jakobsson@linux.intel.com>
Reviewed-by: NImre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1447084107-8521-2-git-send-email-patrik.jakobsson@linux.intel.com
上级 d314cd43
...@@ -216,14 +216,10 @@ void intel_csr_load_program(struct drm_i915_private *dev_priv) ...@@ -216,14 +216,10 @@ void intel_csr_load_program(struct drm_i915_private *dev_priv)
return; return;
} }
/* if (!dev_priv->csr.dmc_payload) {
* FIXME: Firmware gets lost on S3/S4, but not when entering system DRM_ERROR("Tried to program CSR with empty payload\n");
* standby or suspend-to-idle (which is just like forced runtime pm).
* Unfortunately the ACPI subsystem doesn't yet give us a way to
* differentiate this, hence figure it out with this hack.
*/
if ((!dev_priv->csr.dmc_payload) || I915_READ(CSR_PROGRAM(0)))
return; return;
}
fw_size = dev_priv->csr.dmc_fw_size; fw_size = dev_priv->csr.dmc_fw_size;
for (i = 0; i < fw_size; i++) for (i = 0; i < fw_size; i++)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册