drm/i915/bios: Assume panel_type==0 if the VBT has bogus data

Just assume panel_type==0 always if the VBT gives us bogus data.
We actually already do this everywhere else except in
parse_panel_options() since we just leave i915->vbt.panel_type
zeroed. This also seems to be what Windows does.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220504150440.13748-6-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 4d7953e7481476dedad5290e936f4e51e30e3b01..bbf49e98fe02d3af22fbd5af7841a6b0736cdd67 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -618,13 +618,14 @@ parse_panel_options(struct drm_i915_private *i915)
        } else {
                if (lvds_options->panel_type > 0xf) {
                        drm_dbg_kms(&i915->drm,
-                                   "Invalid VBT panel type 0x%x\n",
+                                   "Invalid VBT panel type 0x%x, assuming 0\n",
                                    lvds_options->panel_type);
-                       return;
+                       panel_type = 0;
+               } else {
+                       panel_type = lvds_options->panel_type;
+                       drm_dbg_kms(&i915->drm, "Panel type: %d (VBT)\n",
+                                   panel_type);
                }
-               panel_type = lvds_options->panel_type;
-               drm_dbg_kms(&i915->drm, "Panel type: %d (VBT)\n",
-                           panel_type);
        }
 
        i915->vbt.panel_type = panel_type;