OSDN Git Service

drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs()
authorLucas De Marchi <lucas.demarchi@intel.com>
Thu, 22 Jul 2021 23:29:22 +0000 (16:29 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Sun, 25 Jul 2021 04:56:42 +0000 (21:56 -0700)
commitec387b8ff8d757561369be9a280cf63f23bbb926
tree91b6b9d738b88f0989ab5f0684179a1cae10087b
parent4fd177288a4ee046bd8590355a64de855dcf77e2
drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs()

Commit 5a9d38b20a5a ("drm/i915/display: hide workaround for broken vbt
in intel_bios.c") moved the workaround for broken or missing VBT to
intel_bios.c. However is_port_valid() only protects the handling of
different skus of the same display version. Since in
intel_setup_outputs() we share the code path with version 9, this would
also create port F for SKL/KBL, which does not exist.

Missing VBT can be reproduced when starting a headless QEMU with no
opregion available.

Avoid the issue by splitting versions 9 and 10 in intel_setup_outputs(),
which also makes it more clear what code path it's taking for each
version.

v2: move generic display version after Geminilake since that one has
a different set of outputs

Fixes: 5a9d38b20a5a ("drm/i915/display: hide workaround for broken vbt in intel_bios.c")
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Tested-by: Christoph Hellwig <hch@lst.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210722232922.3796835-1-lucas.demarchi@intel.com
drivers/gpu/drm/i915/display/intel_display.c