Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 32e39ba

Browse files
vsyrjalarodrigovivi
authored andcommitted
drm/i915/bios: Tolerate devdata==NULL in intel_bios_encoder_supports_dp_dual_mode()
If we have no VBT, or the VBT didn't declare the encoder in question, we won't have the 'devdata' for the encoder. Instead of oopsing just bail early. We won't be able to tell whether the port is DP++ or not, but so be it. Cc: stable@vger.kernel.org Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10464 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240319092443.15769-1-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 2641089) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 582dc04 commit 32e39ba

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/gpu/drm/i915/display/intel_bios.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3382,6 +3382,9 @@ bool intel_bios_encoder_supports_dp_dual_mode(const struct intel_bios_encoder_da
33823382
{
33833383
const struct child_device_config *child = &devdata->child;
33843384

3385+
if (!devdata)
3386+
return false;
3387+
33853388
if (!intel_bios_encoder_supports_dp(devdata) ||
33863389
!intel_bios_encoder_supports_hdmi(devdata))
33873390
return false;

0 commit comments

Comments
 (0)