diff options
| author | José Roberto de Souza | 2018-09-18 22:47:11 +0200 |
|---|---|---|
| committer | Rodrigo Vivi | 2018-09-27 02:06:11 +0200 |
| commit | fd847b8e60e0db72fd7d8922da0d1b07c1454efa (patch) | |
| tree | a6eac3685b616dabaa6f7f306e54b20cbdc8f293 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: Unset reset pch handshake when PCH is not present in one place (diff) | |
| download | kernel-qcow2-linux-fd847b8e60e0db72fd7d8922da0d1b07c1454efa.tar.gz kernel-qcow2-linux-fd847b8e60e0db72fd7d8922da0d1b07c1454efa.tar.xz kernel-qcow2-linux-fd847b8e60e0db72fd7d8922da0d1b07c1454efa.zip | |
drm/i915: Do not modifiy reserved bit in gens that do not have IPC
IPC was only added in SKL+(actually we don't even enable for SKL due
WA) so without this change, driver was writing to a reserved bit.
Also removing the uncessary dev_priv->ipc_enabled = false; as now
gens without IPC will not have IPC enabled.
v2(Rodrigo):
- moved the new handling of WA #0477 to the next patch
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180918204714.27306-3-jose.souza@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 1db9b8328275..e2ca04534e23 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -6117,6 +6117,9 @@ void intel_enable_ipc(struct drm_i915_private *dev_priv) { u32 val; + if (!HAS_IPC(dev_priv)) + return; + /* Display WA #0477 WaDisableIPC: skl */ if (IS_SKYLAKE(dev_priv)) dev_priv->ipc_enabled = false; @@ -6138,7 +6141,6 @@ void intel_enable_ipc(struct drm_i915_private *dev_priv) void intel_init_ipc(struct drm_i915_private *dev_priv) { - dev_priv->ipc_enabled = false; if (!HAS_IPC(dev_priv)) return; |