| Message ID | 20210722054338.12891-8-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/10] drm/i915/bios: Allow DSI ports to be parsed by parse_ddi_port() | expand |
On Wed, Jul 21, 2021 at 10:43:36PM -0700, José Roberto de Souza wrote: > All the users was converted now we can drop it. > > Cc: Jani Nikula <jani.nikula@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 36 ----------------------- > drivers/gpu/drm/i915/i915_drv.h | 1 - > 2 files changed, 37 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index a1a1cc0c462fd..d1ad6d625e521 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -211,41 +211,6 @@ get_lvds_fp_timing(const struct bdb_header *bdb, > return (const struct lvds_fp_timing *)((const u8 *)bdb + ofs); > } > > -/* > - * Parse and set vbt.panel_type, it will be used by the VBT blocks that are > - * not being called from parse_integrated_panel() yet. > - */ > -static void parse_panel_type(struct drm_i915_private *i915, > - const struct bdb_header *bdb) > -{ > - const struct bdb_lvds_options *lvds_options; > - int ret, panel_type; > - > - lvds_options = find_section(bdb, BDB_LVDS_OPTIONS); > - if (!lvds_options) > - return; > - > - ret = intel_opregion_get_panel_type(i915); > - if (ret >= 0) { > - drm_WARN_ON(&i915->drm, ret > 0xf); > - panel_type = ret; > - drm_dbg_kms(&i915->drm, "Panel type: %d (OpRegion)\n", > - panel_type); > - } else { > - if (lvds_options->panel_type > 0xf) { > - drm_dbg_kms(&i915->drm, > - "Invalid VBT panel type 0x%x\n", > - lvds_options->panel_type); > - return; > - } > - panel_type = lvds_options->panel_type; > - drm_dbg_kms(&i915->drm, "Panel type: %d (VBT)\n", > - panel_type); > - } > - > - i915->vbt.panel_type = panel_type; > -} > - > /* Parse general panel options */ > static void > parse_panel_options(struct drm_i915_private *i915, > @@ -2489,7 +2454,6 @@ void intel_bios_init(struct drm_i915_private *i915) > /* Grab useful general definitions */ > parse_general_features(i915, bdb); > parse_general_definitions(i915, bdb); > - parse_panel_type(i915, bdb); > parse_sdvo_panel_data(i915, bdb); > parse_driver_features(i915, bdb); > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index adcacb8cb248a..8a09f9ed881b9 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -729,7 +729,6 @@ struct intel_vbt_data { > unsigned int int_lvds_support:1; > unsigned int display_clock_mode:1; > unsigned int fdi_rx_polarity_inverted:1; > - unsigned int panel_type:4; > int lvds_ssc_freq; > unsigned int bios_lvds_val; /* initial [PCH_]LVDS reg val in VBIOS */ > enum drm_panel_orientation orientation; > -- > 2.32.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index a1a1cc0c462fd..d1ad6d625e521 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -211,41 +211,6 @@ get_lvds_fp_timing(const struct bdb_header *bdb, return (const struct lvds_fp_timing *)((const u8 *)bdb + ofs); } -/* - * Parse and set vbt.panel_type, it will be used by the VBT blocks that are - * not being called from parse_integrated_panel() yet. - */ -static void parse_panel_type(struct drm_i915_private *i915, - const struct bdb_header *bdb) -{ - const struct bdb_lvds_options *lvds_options; - int ret, panel_type; - - lvds_options = find_section(bdb, BDB_LVDS_OPTIONS); - if (!lvds_options) - return; - - ret = intel_opregion_get_panel_type(i915); - if (ret >= 0) { - drm_WARN_ON(&i915->drm, ret > 0xf); - panel_type = ret; - drm_dbg_kms(&i915->drm, "Panel type: %d (OpRegion)\n", - panel_type); - } else { - if (lvds_options->panel_type > 0xf) { - drm_dbg_kms(&i915->drm, - "Invalid VBT panel type 0x%x\n", - lvds_options->panel_type); - return; - } - panel_type = lvds_options->panel_type; - drm_dbg_kms(&i915->drm, "Panel type: %d (VBT)\n", - panel_type); - } - - i915->vbt.panel_type = panel_type; -} - /* Parse general panel options */ static void parse_panel_options(struct drm_i915_private *i915, @@ -2489,7 +2454,6 @@ void intel_bios_init(struct drm_i915_private *i915) /* Grab useful general definitions */ parse_general_features(i915, bdb); parse_general_definitions(i915, bdb); - parse_panel_type(i915, bdb); parse_sdvo_panel_data(i915, bdb); parse_driver_features(i915, bdb); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index adcacb8cb248a..8a09f9ed881b9 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -729,7 +729,6 @@ struct intel_vbt_data { unsigned int int_lvds_support:1; unsigned int display_clock_mode:1; unsigned int fdi_rx_polarity_inverted:1; - unsigned int panel_type:4; int lvds_ssc_freq; unsigned int bios_lvds_val; /* initial [PCH_]LVDS reg val in VBIOS */ enum drm_panel_orientation orientation;
All the users was converted now we can drop it. Cc: Jani Nikula <jani.nikula@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_bios.c | 36 ----------------------- drivers/gpu/drm/i915/i915_drv.h | 1 - 2 files changed, 37 deletions(-)