On Thu, Apr 07, 2022 at 08:55:29PM +0300, Jani Nikula wrote: > On Wed, 06 Apr 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > > Apparently when the VBT panel_type==0xff we should trawl through > > the PNPID table and check for a match against the EDID. If a > > match is found the index gives us the panel_type. > > > > Tried to match the Windows behaviour here with first looking > > for an exact match, and if one isn't found we fall back to > > looking for a match w/o the mfg year/week. > > Does Windows also probe the EDID first, or does it use some side channel > to use the GOP probed EDID? ISTR there's something in the EFI interface > for this, but never looked deeper. Lost some hair while trawling through it, but it does look it tries the OpRegion mailbox first, then falls back to standard i2c stuff. In a totally different codepath there's also an implementation of APCI _DDC, but that doesn't seem get called from the eDP init path that I was looking at so dunno what that is for. > > > > > v2: Rebase due to vlv_dsi changes > > > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5545 > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > > --- > > drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- > > drivers/gpu/drm/i915/display/intel_bios.c | 82 ++++++++++++++++++++--- > > drivers/gpu/drm/i915/display/intel_bios.h | 4 +- > > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > > drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- > > drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- > > drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- > > 7 files changed, 82 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c > > index 688176d4a54a..49715485a3a6 100644 > > --- a/drivers/gpu/drm/i915/display/icl_dsi.c > > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c > > @@ -2048,7 +2048,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) > > /* attach connector to encoder */ > > intel_connector_attach_encoder(intel_connector, encoder); > > > > - intel_bios_init_panel(dev_priv); > > + intel_bios_init_panel(dev_priv, NULL); > > > > mutex_lock(&dev->mode_config.mutex); > > intel_panel_add_vbt_lfp_fixed_mode(intel_connector); > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > > index 0e76c554581a..4c0680356134 100644 > > --- a/drivers/gpu/drm/i915/display/intel_bios.c > > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > > @@ -582,6 +582,14 @@ get_lvds_fp_timing(const struct bdb_lvds_lfp_data *data, > > return (const void *)data + ptrs->ptr[index].fp_timing.offset; > > } > > > > +static const struct lvds_pnp_id * > > +get_lvds_pnp_id(const struct bdb_lvds_lfp_data *data, > > + const struct bdb_lvds_lfp_data_ptrs *ptrs, > > + int index) > > +{ > > + return (const void *)data + ptrs->ptr[index].panel_pnp_id.offset; > > +} > > + > > static const struct bdb_lvds_lfp_data_tail * > > get_lfp_data_tail(const struct bdb_lvds_lfp_data *data, > > const struct bdb_lvds_lfp_data_ptrs *ptrs) > > @@ -592,6 +600,52 @@ get_lfp_data_tail(const struct bdb_lvds_lfp_data *data, > > return NULL; > > } > > > > +static int pnp_id_panel_type(struct drm_i915_private *i915, > > + const struct edid *edid) > > +{ > > + const struct bdb_lvds_lfp_data *data; > > + const struct bdb_lvds_lfp_data_ptrs *ptrs; > > + const struct lvds_pnp_id *edid_id; > > + struct lvds_pnp_id edid_id_nodate; > > + int i, best = -1; > > + > > + if (!edid) > > + return -1; > > + > > + edid_id = (const void *)&edid->mfg_id[0]; > > + > > + edid_id_nodate = *edid_id; > > + edid_id_nodate.mfg_week = 0; > > + edid_id_nodate.mfg_year = 0; > > + > > + ptrs = find_section(i915, BDB_LVDS_LFP_DATA_PTRS); > > + if (!ptrs) > > + return -1; > > + > > + data = find_section(i915, BDB_LVDS_LFP_DATA); > > + if (!data) > > + return -1; > > + > > + for (i = 0; i < 16; i++) { > > + const struct lvds_pnp_id *vbt_id = > > + get_lvds_pnp_id(data, ptrs, i); > > + > > + /* full match? */ > > + if (!memcmp(vbt_id, edid_id, sizeof(*vbt_id))) > > + return i; > > + > > + /* > > + * Accept a match w/o date if no full match is found, > > + * and the VBT entry does not specify a date. > > + */ > > + if (best < 0 && > > + !memcmp(vbt_id, &edid_id_nodate, sizeof(*vbt_id))) > > + best = i; > > + } > > + > > + return best; > > +} > > + > > static int vbt_panel_type(struct drm_i915_private *i915) > > { > > const struct bdb_lvds_options *lvds_options; > > @@ -600,7 +654,8 @@ static int vbt_panel_type(struct drm_i915_private *i915) > > if (!lvds_options) > > return -1; > > > > - if (lvds_options->panel_type > 0xf) { > > + if (lvds_options->panel_type > 0xf && > > + lvds_options->panel_type != 0xff) { > > drm_dbg_kms(&i915->drm, "Invalid VBT panel type 0x%x\n", > > lvds_options->panel_type); > > return -1; > > @@ -612,10 +667,12 @@ static int vbt_panel_type(struct drm_i915_private *i915) > > enum panel_type { > > PANEL_TYPE_OPREGION, > > PANEL_TYPE_VBT, > > + PANEL_TYPE_PNPID, > > PANEL_TYPE_FALLBACK, > > }; > > > > -static int get_panel_type(struct drm_i915_private *i915) > > +static int get_panel_type(struct drm_i915_private *i915, > > + const struct edid *edid) > > { > > struct { > > const char *name; > > @@ -623,15 +680,18 @@ static int get_panel_type(struct drm_i915_private *i915) > > } panel_types[] = { > > [PANEL_TYPE_OPREGION] = { .name = "OpRegion", .panel_type = -1, }, > > [PANEL_TYPE_VBT] = { .name = "VBT", .panel_type = -1, }, > > + [PANEL_TYPE_PNPID] = { .name = "PNPID", .panel_type = -1, }, > > [PANEL_TYPE_FALLBACK] = { .name = "fallback", .panel_type = 0, }, > > }; > > int i; > > > > panel_types[PANEL_TYPE_OPREGION].panel_type = intel_opregion_get_panel_type(i915); > > panel_types[PANEL_TYPE_VBT].panel_type = vbt_panel_type(i915); > > + panel_types[PANEL_TYPE_PNPID].panel_type = pnp_id_panel_type(i915, edid); > > > > for (i = 0; i < ARRAY_SIZE(panel_types); i++) { > > - drm_WARN_ON(&i915->drm, panel_types[i].panel_type > 0xf); > > + drm_WARN_ON(&i915->drm, panel_types[i].panel_type > 0xf && > > + panel_types[i].panel_type != 0xff); > > > > if (panel_types[i].panel_type >= 0) > > drm_dbg_kms(&i915->drm, "Panel type (%s): %d\n", > > @@ -640,7 +700,11 @@ static int get_panel_type(struct drm_i915_private *i915) > > > > if (panel_types[PANEL_TYPE_OPREGION].panel_type >= 0) > > i = PANEL_TYPE_OPREGION; > > - else if (panel_types[PANEL_TYPE_VBT].panel_type >= 0) > > + else if (panel_types[PANEL_TYPE_VBT].panel_type == 0xff && > > + panel_types[PANEL_TYPE_PNPID].panel_type >= 0) > > + i = PANEL_TYPE_PNPID; > > + else if (panel_types[PANEL_TYPE_VBT].panel_type != 0xff && > > + panel_types[PANEL_TYPE_VBT].panel_type >= 0) > > i = PANEL_TYPE_VBT; > > else > > i = PANEL_TYPE_FALLBACK; > > @@ -653,7 +717,8 @@ static int get_panel_type(struct drm_i915_private *i915) > > > > /* Parse general panel options */ > > static void > > -parse_panel_options(struct drm_i915_private *i915) > > +parse_panel_options(struct drm_i915_private *i915, > > + const struct edid *edid) > > { > > const struct bdb_lvds_options *lvds_options; > > int panel_type; > > @@ -665,7 +730,7 @@ parse_panel_options(struct drm_i915_private *i915) > > > > i915->vbt.lvds_dither = lvds_options->pixel_dither; > > > > - panel_type = get_panel_type(i915); > > + panel_type = get_panel_type(i915, edid); > > > > i915->vbt.panel_type = panel_type; > > > > @@ -2953,9 +3018,10 @@ void intel_bios_init(struct drm_i915_private *i915) > > kfree(oprom_vbt); > > } > > > > -void intel_bios_init_panel(struct drm_i915_private *i915) > > +void intel_bios_init_panel(struct drm_i915_private *i915, > > + const struct edid *edid) > > { > > - parse_panel_options(i915); > > + parse_panel_options(i915, edid); > > /* > > * Older VBTs provided DTD information for internal displays through > > * the "LFP panel tables" block (42). As of VBT revision 229 the > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h > > index c744d75fa435..be6d57bd0f5a 100644 > > --- a/drivers/gpu/drm/i915/display/intel_bios.h > > +++ b/drivers/gpu/drm/i915/display/intel_bios.h > > @@ -33,6 +33,7 @@ > > #include <linux/types.h> > > > > struct drm_i915_private; > > +struct edid; > > struct intel_bios_encoder_data; > > struct intel_crtc_state; > > struct intel_encoder; > > @@ -230,7 +231,8 @@ struct mipi_pps_data { > > } __packed; > > > > void intel_bios_init(struct drm_i915_private *dev_priv); > > -void intel_bios_init_panel(struct drm_i915_private *dev_priv); > > +void intel_bios_init_panel(struct drm_i915_private *dev_priv, > > + const struct edid *edid); > > void intel_bios_driver_remove(struct drm_i915_private *dev_priv); > > bool intel_bios_is_valid_vbt(const void *buf, size_t size); > > bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv); > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > > index a1b5d7f5388b..41ac55a700e9 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > @@ -5179,7 +5179,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > > } > > intel_connector->edid = edid; > > > > - intel_bios_init_panel(dev_priv); > > + intel_bios_init_panel(dev_priv, IS_ERR(edid) ? NULL : edid); > > > > intel_panel_add_edid_fixed_modes(intel_connector, > > dev_priv->vbt.drrs_type != DRRS_TYPE_NONE); > > diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c > > index 554badf041f2..660bb95f2bf7 100644 > > --- a/drivers/gpu/drm/i915/display/intel_lvds.c > > +++ b/drivers/gpu/drm/i915/display/intel_lvds.c > > @@ -967,7 +967,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) > > } > > intel_connector->edid = edid; > > > > - intel_bios_init_panel(dev_priv); > > + intel_bios_init_panel(dev_priv, IS_ERR(edid) ? NULL : edid); > > > > /* Try EDID first */ > > intel_panel_add_edid_fixed_modes(intel_connector, > > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c > > index 661a1057a073..25195bc1edca 100644 > > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c > > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c > > @@ -2900,7 +2900,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) > > if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector)) > > goto err; > > > > - intel_bios_init_panel(i915); > > + intel_bios_init_panel(i915, NULL); > > > > /* > > * Fetch modes from VBT. For SDVO prefer the VBT mode since some > > diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c > > index 08fb554ff7ad..1af6e927af9b 100644 > > --- a/drivers/gpu/drm/i915/display/vlv_dsi.c > > +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c > > @@ -1929,7 +1929,7 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) > > else > > intel_dsi->ports = BIT(port); > > > > - intel_bios_init_panel(dev_priv); > > + intel_bios_init_panel(dev_priv, NULL); > > > > intel_dsi->dcs_backlight_ports = dev_priv->vbt.dsi.bl_ports; > > intel_dsi->dcs_cabc_ports = dev_priv->vbt.dsi.cabc_ports; > > -- > Jani Nikula, Intel Open Source Graphics Center -- Ville Syrjälä Intel
