bios: rename display_device_data to intel_bios_encoder_data

Lucas De Marchi Tue, 23 Feb 2021 16:37:31 -0800

On Tue, Feb 23, 2021 at 02:50:30PM +0200, Jani Nikula wrote:

On Wed, 17 Feb 2021, Jani Nikula <jani.nik...@intel.com> wrote:

On Wed, 17 Feb 2021, Lucas De Marchi <lucas.demar...@intel.com> wrote:

On Wed, Feb 17, 2021 at 07:03:36PM +0200, Jani Nikula wrote:

Make the naming suitable for exposing to the rest of the driver as an
opaque type. No functional changes.


ack, but..


Cc: Lucas De Marchi <lucas.demar...@intel.com>
Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
drivers/gpu/drm/i915/display/intel_bios.c | 30 +++++++++++------------
1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c 
b/drivers/gpu/drm/i915/display/intel_bios.c
index 59d315b395c2..0e882da165be 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -59,7 +59,7 @@
 */

/* Wrapper for VBT child device config */
-struct display_device_data {
+struct intel_bios_encoder_data {
        struct child_device_config child;
        struct dsc_compression_parameters_entry *dsc;
        struct list_head node;
@@ -600,7 +600,7 @@ static void
parse_sdvo_device_mapping(struct drm_i915_private *i915)
{
        struct sdvo_device_mapping *mapping;
-       const struct display_device_data *devdata;
+       const struct intel_bios_encoder_data *devdata;


shouldn't we also replace devdata with a better name?


Yes, see cover letter. :)

I've rolled with devdata for now because that's what was there.


So. Does "intel_bios_encoder_data" make sense as a name, or do we have
better ideas? It's basically just a wrapper to VBT child device config.

The name "devdata" depends on the struct name too I guess. Within
intel_bios.c, s/devdata/whatever/g isn't a big deal. The real question
is what to call the pointer within struct intel_encoder.

I'm really not hung up on the names I used, but I'd only like to do the
rename+rebase of this series once and be done with it.


On that lack of a better suggestion for the name, I'm convinced we can
actually leave this for later


Reviewed-by: Lucas De Marchi <lucas.demar...@intel.com>

Lucas De Marchi



BR,
Jani.


BR,
Jani.


Lucas De Marchi

        const struct child_device_config *child;
        int count = 0;

@@ -1439,7 +1439,7 @@ parse_compression_parameters(struct drm_i915_private 
*i915,
                             const struct bdb_header *bdb)
{
        const struct bdb_compression_parameters *params;
-       struct display_device_data *devdata;
+       struct intel_bios_encoder_data *devdata;
        const struct child_device_config *child;
        u16 block_size;
        int index;
@@ -1760,7 +1760,7 @@ static enum port dvo_port_to_port(struct drm_i915_private 
*i915,
}

static void parse_ddi_port(struct drm_i915_private *i915,
-                          struct display_device_data *devdata)
+                          struct intel_bios_encoder_data *devdata)
{
        const struct child_device_config *child = &devdata->child;
        struct ddi_vbt_port_info *info;
@@ -1908,7 +1908,7 @@ static void parse_ddi_port(struct drm_i915_private *i915,

static void parse_ddi_ports(struct drm_i915_private *i915)
{
-       struct display_device_data *devdata;
+       struct intel_bios_encoder_data *devdata;

        if (!HAS_DDI(i915) && !IS_CHERRYVIEW(i915))
                return;
@@ -1925,7 +1925,7 @@ parse_general_definitions(struct drm_i915_private *i915,
                          const struct bdb_header *bdb)
{
        const struct bdb_general_definitions *defs;
-       struct display_device_data *devdata;
+       struct intel_bios_encoder_data *devdata;
        const struct child_device_config *child;
        int i, child_device_num;
        u8 expected_size;
@@ -2063,7 +2063,7 @@ init_vbt_missing_defaults(struct drm_i915_private *i915)
                return;

        for_each_port_masked(port, ports) {
-               struct display_device_data *devdata;
+               struct intel_bios_encoder_data *devdata;
                struct child_device_config *child;
                enum phy phy = intel_port_to_phy(i915, port);

@@ -2302,7 +2302,7 @@ void intel_bios_init(struct drm_i915_private *i915)
 */
void intel_bios_driver_remove(struct drm_i915_private *i915)
{
-       struct display_device_data *devdata, *n;
+       struct intel_bios_encoder_data *devdata, *n;

        list_for_each_entry_safe(devdata, n, &i915->vbt.display_devices, node) {
                list_del(&devdata->node);
@@ -2333,7 +2333,7 @@ void intel_bios_driver_remove(struct drm_i915_private 
*i915)
 */
bool intel_bios_is_tv_present(struct drm_i915_private *i915)
{
-       const struct display_device_data *devdata;
+       const struct intel_bios_encoder_data *devdata;
        const struct child_device_config *child;

        if (!i915->vbt.int_tv_support)
@@ -2376,7 +2376,7 @@ bool intel_bios_is_tv_present(struct drm_i915_private 
*i915)
 */
bool intel_bios_is_lvds_present(struct drm_i915_private *i915, u8 *i2c_pin)
{
-       const struct display_device_data *devdata;
+       const struct intel_bios_encoder_data *devdata;
        const struct child_device_config *child;

        if (list_empty(&i915->vbt.display_devices))
@@ -2425,7 +2425,7 @@ bool intel_bios_is_lvds_present(struct drm_i915_private 
*i915, u8 *i2c_pin)
 */
bool intel_bios_is_port_present(struct drm_i915_private *i915, enum port port)
{
-       const struct display_device_data *devdata;
+       const struct intel_bios_encoder_data *devdata;
        const struct child_device_config *child;
        static const struct {
                u16 dp, hdmi;
@@ -2471,7 +2471,7 @@ bool intel_bios_is_port_present(struct drm_i915_private 
*i915, enum port port)
 */
bool intel_bios_is_port_edp(struct drm_i915_private *i915, enum port port)
{
-       const struct display_device_data *devdata;
+       const struct intel_bios_encoder_data *devdata;
        const struct child_device_config *child;
        static const short port_mapping[] = {
                [PORT_B] = DVO_PORT_DPB,
@@ -2534,7 +2534,7 @@ static bool child_dev_is_dp_dual_mode(const struct 
child_device_config *child,
bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *i915,
                                     enum port port)
{
-       const struct display_device_data *devdata;
+       const struct intel_bios_encoder_data *devdata;

        list_for_each_entry(devdata, &i915->vbt.display_devices, node) {
                if (child_dev_is_dp_dual_mode(&devdata->child, port))
@@ -2554,7 +2554,7 @@ bool intel_bios_is_port_dp_dual_mode(struct 
drm_i915_private *i915,
bool intel_bios_is_dsi_present(struct drm_i915_private *i915,
                               enum port *port)
{
-       const struct display_device_data *devdata;
+       const struct intel_bios_encoder_data *devdata;
        const struct child_device_config *child;
        u8 dvo_port;

@@ -2654,7 +2654,7 @@ bool intel_bios_get_dsc_params(struct intel_encoder 
*encoder,
                               int dsc_max_bpc)
{
        struct drm_i915_private *i915 = to_i915(encoder->base.dev);
-       const struct display_device_data *devdata;
+       const struct intel_bios_encoder_data *devdata;
        const struct child_device_config *child;

        list_for_each_entry(devdata, &i915->vbt.display_devices, node) {
--
2.20.1


--
Jani Nikula, Intel Open Source Graphics Center

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 06/12] drm/i915/bios: rename display_device_data to intel_bios_encoder_data

Reply via email to