drm/i915: fix guest virtual PCH detection on non-PCH systems

Virtualized non-PCH systems such as Broxton or Geminilake should use
PCH_NONE to indicate no PCH rather than PCH_NOP. The latter is a
specific case to indicate a PCH system without south display.

Reported-by: Colin Xu <[email protected]>
Cc: Colin Xu <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]>
Tested-by: Colin Xu <[email protected]>
Reviewed-by: Colin Xu <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 0a1b09bb658fe8c2fe29d403e9d6bd03ad897c41..8f22ae8925fc656d01be3921919a54beee6957c7 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -289,7 +289,7 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)
                                if (WARN_ON(pch_type == PCH_NONE))
                                        pch_type = PCH_NOP;
                        } else {
-                               pch_type = PCH_NOP;
+                               pch_type = PCH_NONE;
                        }
                        dev_priv->pch_type = pch_type;
                        dev_priv->pch_id = id;