]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: Sanitize the display fused-off check on GEN7/8
authorImre Deak <imre.deak@intel.com>
Wed, 8 Feb 2023 11:43:00 +0000 (13:43 +0200)
committerImre Deak <imre.deak@intel.com>
Wed, 15 Feb 2023 09:47:08 +0000 (11:47 +0200)
Detecting in intel_device_info_runtime_init() that the display is fused
off or not present should only zero intel_runtime_info::pipe_mask, while
the other related masks will be accordingly zeroed later in the
function. Remove the redundant zeroing of the related fields on GEN7/8.

Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230208114300.3123934-5-imre.deak@intel.com
drivers/gpu/drm/i915/intel_device_info.c

index 94fca01c088b5e27cc3c9a76c28335ba352a9867..1d859de6c46cfb85439494c3483af6bfb1204c59 100644 (file)
@@ -470,8 +470,6 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
                        drm_info(&dev_priv->drm,
                                 "Display fused off, disabling\n");
                        runtime->pipe_mask = 0;
-                       runtime->cpu_transcoder_mask = 0;
-                       runtime->fbc_mask = 0;
                } else if (fuse_strap & IVB_PIPE_C_DISABLE) {
                        drm_info(&dev_priv->drm, "PipeC fused off\n");
                        runtime->pipe_mask &= ~BIT(PIPE_C);