On Wed, Jun 08, 2022 at 10:50:41AM +0300, Jani Nikula wrote:
> Try to use struct drm_edid where possible, even if having to fall back
> to looking into struct edid down low via drm_edid_raw().
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 23 ++++++++++++-----------
> 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 +-
> 4 files changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index c42b9e7d0dce..be0b4264d526 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -604,13 +604,13 @@ get_lfp_data_tail(const struct bdb_lvds_lfp_data *data,
> }
>
> static int opregion_get_panel_type(struct drm_i915_private *i915,
> - const struct edid *edid)
> + const struct drm_edid *drm_edid)
> {
> return intel_opregion_get_panel_type(i915);
> }
>
> static int vbt_get_panel_type(struct drm_i915_private *i915,
> - const struct edid *edid)
> + const struct drm_edid *drm_edid)
> {
> const struct bdb_lvds_options *lvds_options;
>
> @@ -629,12 +629,13 @@ static int vbt_get_panel_type(struct drm_i915_private *i915,
> }
>
> static int pnpid_get_panel_type(struct drm_i915_private *i915,
> - const struct edid *edid)
> + const struct drm_edid *drm_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;
> + const struct edid *edid = drm_edid_raw(drm_edid); /* FIXME */
> int i, best = -1;
>
> if (!edid)
> @@ -675,7 +676,7 @@ static int pnpid_get_panel_type(struct drm_i915_private *i915,
> }
>
> static int fallback_get_panel_type(struct drm_i915_private *i915,
> - const struct edid *edid)
> + const struct drm_edid *drm_edid)
> {
> return 0;
> }
> @@ -688,12 +689,12 @@ enum panel_type {
> };
>
> static int get_panel_type(struct drm_i915_private *i915,
> - const struct edid *edid)
> + const struct drm_edid *drm_edid)
> {
> struct {
> const char *name;
> int (*get_panel_type)(struct drm_i915_private *i915,
> - const struct edid *edid);
> + const struct drm_edid *drm_edid);
> int panel_type;
> } panel_types[] = {
> [PANEL_TYPE_OPREGION] = {
> @@ -716,7 +717,7 @@ static int get_panel_type(struct drm_i915_private *i915,
> int i;
>
> for (i = 0; i < ARRAY_SIZE(panel_types); i++) {
> - panel_types[i].panel_type = panel_types[i].get_panel_type(i915, edid);
> + panel_types[i].panel_type = panel_types[i].get_panel_type(i915, drm_edid);
>
> drm_WARN_ON(&i915->drm, panel_types[i].panel_type > 0xf &&
> panel_types[i].panel_type != 0xff);
> @@ -747,7 +748,7 @@ static int get_panel_type(struct drm_i915_private *i915,
> static void
> parse_panel_options(struct drm_i915_private *i915,
> struct intel_panel *panel,
> - const struct edid *edid)
> + const struct drm_edid *drm_edid)
> {
> const struct bdb_lvds_options *lvds_options;
> int panel_type;
> @@ -759,7 +760,7 @@ parse_panel_options(struct drm_i915_private *i915,
>
> panel->vbt.lvds_dither = lvds_options->pixel_dither;
>
> - panel_type = get_panel_type(i915, edid);
> + panel_type = get_panel_type(i915, drm_edid);
>
> panel->vbt.panel_type = panel_type;
>
> @@ -3092,11 +3093,11 @@ void intel_bios_init(struct drm_i915_private *i915)
>
> void intel_bios_init_panel(struct drm_i915_private *i915,
> struct intel_panel *panel,
> - const struct edid *edid)
> + const struct drm_edid *drm_edid)
> {
> init_vbt_panel_defaults(panel);
>
> - parse_panel_options(i915, panel, edid);
> + parse_panel_options(i915, panel, drm_edid);
> parse_generic_dtd(i915, panel);
> parse_lfp_data(i915, panel);
> parse_lfp_backlight(i915, panel);
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
> index b112200ae0a0..7bcc818e8d80 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.h
> +++ b/drivers/gpu/drm/i915/display/intel_bios.h
> @@ -32,8 +32,8 @@
>
> #include <linux/types.h>
>
> +struct drm_edid;
> struct drm_i915_private;
> -struct edid;
> struct intel_bios_encoder_data;
> struct intel_crtc_state;
> struct intel_encoder;
> @@ -234,7 +234,7 @@ struct mipi_pps_data {
> void intel_bios_init(struct drm_i915_private *dev_priv);
> void intel_bios_init_panel(struct drm_i915_private *dev_priv,
> struct intel_panel *panel,
> - const struct edid *edid);
> + const struct drm_edid *drm_edid);
> void intel_bios_fini_panel(struct intel_panel *panel);
> void intel_bios_driver_remove(struct drm_i915_private *dev_priv);
> bool intel_bios_is_valid_vbt(const void *buf, size_t size);
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 64b6481225f1..2f47f1e7607b 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -5217,7 +5217,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
> intel_connector->edid = drm_edid;
>
> intel_bios_init_panel(dev_priv, &intel_connector->panel,
> - IS_ERR_OR_NULL(drm_edid) ? NULL : drm_edid_raw(drm_edid));
> + IS_ERR(drm_edid) ? NULL : drm_edid);
>
> intel_panel_add_edid_fixed_modes(intel_connector,
> intel_connector->panel.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 d4389054bf59..ed5fceb93952 100644
> --- a/drivers/gpu/drm/i915/display/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/display/intel_lvds.c
> @@ -971,7 +971,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> intel_connector->edid = drm_edid;
>
> intel_bios_init_panel(dev_priv, &intel_connector->panel,
> - IS_ERR_OR_NULL(drm_edid) ? NULL : drm_edid_raw(drm_edid));
> + IS_ERR(drm_edid) ? NULL : drm_edid);
>
> /* Try EDID first */
> intel_panel_add_edid_fixed_modes(intel_connector,
> --
> 2.30.2
--
Ville Syrjälä
Intel
