]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915: Re-order if/else ladder in intel_detect_pch()
authorLucas De Marchi <lucas.demarchi@intel.com>
Tue, 19 Sep 2023 19:21:11 +0000 (12:21 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Thu, 21 Sep 2023 14:39:48 +0000 (07:39 -0700)
Follow the convention of checking the last platform first and reword the
comment to convey there are more platforms than just DG1.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919192128.2045154-5-lucas.demarchi@intel.com
drivers/gpu/drm/i915/soc/intel_pch.c

index 19a8f27c404e1957df052cb4015e8201d2102691..dfffdfa50b978df58f97bc5eb4b94a0eb5bb626b 100644 (file)
@@ -218,13 +218,16 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
        unsigned short id;
        enum intel_pch pch_type;
 
-       /* DG1 has south engine display on the same PCI device */
-       if (IS_DG1(dev_priv)) {
-               dev_priv->pch_type = PCH_DG1;
-               return;
-       } else if (IS_DG2(dev_priv)) {
+       /*
+        * South display engine on the same PCI device: just assign the fake
+        * PCH.
+        */
+       if (IS_DG2(dev_priv)) {
                dev_priv->pch_type = PCH_DG2;
                return;
+       } else if (IS_DG1(dev_priv)) {
+               dev_priv->pch_type = PCH_DG1;
+               return;
        }
 
        /*