]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/cdclk: Suck the compression_enable check into intel_vdsc_min_cdclk()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 29 Oct 2024 21:52:14 +0000 (23:52 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 7 Nov 2024 12:51:07 +0000 (14:51 +0200)
Declutter intel_crtc_compute_min_cdclk() by moving the
crtc_state->dsc.compression_enable check into
intel_vdsc_min_cdclk().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241029215217.3697-9-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_cdclk.c

index 34166d00766b7143b79894858a93b1d3a6d7aef7..544b9820ee948c31aba53f9c4d34c7059d71f76e 100644 (file)
@@ -2812,6 +2812,9 @@ static int intel_vdsc_min_cdclk(const struct intel_crtc_state *crtc_state)
        int num_vdsc_instances = intel_dsc_get_num_vdsc_instances(crtc_state);
        int min_cdclk = 0;
 
+       if (!crtc_state->dsc.compression_enable)
+               return 0;
+
        /*
         * When we decide to use only one VDSC engine, since
         * each VDSC operates with 1 ppc throughput, pixel clock
@@ -2860,9 +2863,7 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state)
        min_cdclk = max(intel_audio_min_cdclk(crtc_state), min_cdclk);
        min_cdclk = max(vlv_dsi_min_cdclk(crtc_state), min_cdclk);
        min_cdclk = max(intel_planes_min_cdclk(crtc_state), min_cdclk);
-
-       if (crtc_state->dsc.compression_enable)
-               min_cdclk = max(min_cdclk, intel_vdsc_min_cdclk(crtc_state));
+       min_cdclk = max(min_cdclk, intel_vdsc_min_cdclk(crtc_state));
 
        return min_cdclk;
 }