]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/bw: Don't call intel_dram_info() too early
authorGustavo Sousa <gustavo.sousa@intel.com>
Mon, 18 May 2026 16:14:00 +0000 (13:14 -0300)
committerGustavo Sousa <gustavo.sousa@intel.com>
Tue, 19 May 2026 17:25:03 +0000 (14:25 -0300)
If we end-up bailing early from intel_bw_init_hw() due to
!HAS_DISPLAY(display), the call to intel_dram_info() to initialize
dram_info will be meaningless.  Move the call to be done after that
check.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260518-separate-platform-from-diplay-ip-specific-bw-params-v4-1-918528006549@intel.com
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
drivers/gpu/drm/i915/display/intel_bw.c

index 9c3a9bbb49f665925d8d62cfd9c5b5eecfd06e74..7eef693b51ad9f142e54565073ef99661d3648ca 100644 (file)
@@ -791,11 +791,13 @@ static unsigned int icl_qgv_bw(struct intel_display *display,
 
 void intel_bw_init_hw(struct intel_display *display)
 {
-       const struct dram_info *dram_info = intel_dram_info(display);
+       const struct dram_info *dram_info;
 
        if (!HAS_DISPLAY(display))
                return;
 
+       dram_info = intel_dram_info(display);
+
        /*
         * Starting with Xe3p_LPD, the hardware tells us whether memory has ECC
         * enabled that would impact display bandwidth.  However, so far there