From: Ville Syrjälä Date: Mon, 24 Jan 2022 19:26:34 +0000 (+0200) Subject: drm/i915: Skip dsc readout if the transcoder is disabled X-Git-Tag: core-urgent-2022-04-03~84^2~19^2~56 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9f807822abf5e210d8656fb5304f662bee64ca80;p=users%2Fdwmw2%2Flinux.git drm/i915: Skip dsc readout if the transcoder is disabled Trying to do readout when we don't even have a cpu transcoder is not a great idea. Don't do it. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20220124192638.26262-1-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 2bf0c3cd23ddd..a10f693c3b6ef 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -4379,13 +4379,13 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc, active = true; } + if (!active) + goto out; + intel_dsc_get_config(pipe_config); if (DISPLAY_VER(dev_priv) >= 13 && !pipe_config->dsc.compression_enable) intel_uncompressed_joiner_get_config(pipe_config); - if (!active) - goto out; - if (!transcoder_is_dsi(pipe_config->cpu_transcoder) || DISPLAY_VER(dev_priv) >= 11) intel_get_transcoder_timings(crtc, pipe_config);