]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: ddi_clock_get sort platforms newer-to-older.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 22 Oct 2018 17:15:22 +0000 (10:15 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 22 Oct 2018 21:40:35 +0000 (14:40 -0700)
No functional change.

Just sorting this "if" block from newer to older platform.

v2: Invert gen9_bc and gen9_lp (Ville)

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181022171526.15641-1-rodrigo.vivi@intel.com
drivers/gpu/drm/i915/intel_ddi.c

index 6b9742baa5f24e4be1aecdddd27b5d1e6f7bfb15..e4f8e738c47bb2574ae61052e79235c24a28540e 100644 (file)
@@ -1737,16 +1737,16 @@ static void intel_ddi_clock_get(struct intel_encoder *encoder,
 {
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 
-       if (INTEL_GEN(dev_priv) <= 8)
-               hsw_ddi_clock_get(encoder, pipe_config);
-       else if (IS_GEN9_BC(dev_priv))
-               skl_ddi_clock_get(encoder, pipe_config);
-       else if (IS_GEN9_LP(dev_priv))
-               bxt_ddi_clock_get(encoder, pipe_config);
+       if (IS_ICELAKE(dev_priv))
+               icl_ddi_clock_get(encoder, pipe_config);
        else if (IS_CANNONLAKE(dev_priv))
                cnl_ddi_clock_get(encoder, pipe_config);
-       else if (IS_ICELAKE(dev_priv))
-               icl_ddi_clock_get(encoder, pipe_config);
+       else if (IS_GEN9_LP(dev_priv))
+               bxt_ddi_clock_get(encoder, pipe_config);
+       else if (IS_GEN9_BC(dev_priv))
+               skl_ddi_clock_get(encoder, pipe_config);
+       else if (INTEL_GEN(dev_priv) <= 8)
+               hsw_ddi_clock_get(encoder, pipe_config);
 }
 
 void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state)