| Message ID | dd1312ee84adef0161ebeaaf3c0448b1a1371919.1561735433.git.andrzej.p@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,01/22] drm: Include ddc adapter pointer in struct drm_connector | expand |
On Fri, Jun 28, 2019 at 12:31 PM Andrzej Pietrasiewicz <andrzej.p@collabora.com> wrote: > > Use the ddc pointer provided by the generic connector. > > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> > --- > drivers/gpu/drm/radeon/radeon_connectors.c | 82 +++++++++++++++++----- > 1 file changed, 63 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c > index c60d1a44d22a..a876e51d275a 100644 > --- a/drivers/gpu/drm/radeon/radeon_connectors.c > +++ b/drivers/gpu/drm/radeon/radeon_connectors.c > @@ -1946,11 +1946,15 @@ radeon_add_atom_connector(struct drm_device *dev, > radeon_dig_connector->igp_lane_info = igp_lane_info; > radeon_connector->con_priv = radeon_dig_connector; > if (i2c_bus->valid) { > - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > - if (radeon_connector->ddc_bus) > + struct radeon_connector *rcn = radeon_connector; > + > + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > + if (rcn->ddc_bus) { Same comment as the amdgpu patch. I think you can drop this hunk. In fact, you do in some of the other code paths below. Same comment on the other paths below. Alex > has_aux = true; > - else > + connector->ddc = &rcn->ddc_bus->adapter; > + } else { > DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + } > } > switch (connector_type) { > case DRM_MODE_CONNECTOR_VGA: > @@ -2045,9 +2049,13 @@ radeon_add_atom_connector(struct drm_device *dev, > drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); > drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); > if (i2c_bus->valid) { > - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > - if (!radeon_connector->ddc_bus) > + struct radeon_connector *rcn = radeon_connector; > + > + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > + if (!rcn->ddc_bus) > DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = &rcn->ddc_bus->adapter; > } > radeon_connector->dac_load_detect = true; > drm_object_attach_property(&radeon_connector->base.base, > @@ -2070,9 +2078,13 @@ radeon_add_atom_connector(struct drm_device *dev, > drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); > drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); > if (i2c_bus->valid) { > - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > - if (!radeon_connector->ddc_bus) > + struct radeon_connector *rcn = radeon_connector; > + > + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > + if (!rcn->ddc_bus) > DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = &rcn->ddc_bus->adapter; > } > radeon_connector->dac_load_detect = true; > drm_object_attach_property(&radeon_connector->base.base, > @@ -2101,9 +2113,13 @@ radeon_add_atom_connector(struct drm_device *dev, > drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); > drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); > if (i2c_bus->valid) { > - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > - if (!radeon_connector->ddc_bus) > + struct radeon_connector *rcn = radeon_connector; > + > + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > + if (!rcn->ddc_bus) > DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = &rcn->ddc_bus->adapter; > } > subpixel_order = SubPixelHorizontalRGB; > drm_object_attach_property(&radeon_connector->base.base, > @@ -2158,9 +2174,13 @@ radeon_add_atom_connector(struct drm_device *dev, > drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); > drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); > if (i2c_bus->valid) { > - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > - if (!radeon_connector->ddc_bus) > + struct radeon_connector *rcn = radeon_connector; > + > + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > + if (!rcn->ddc_bus) > DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = &rcn->ddc_bus->adapter; > } > drm_object_attach_property(&radeon_connector->base.base, > rdev->mode_info.coherent_mode_property, > @@ -2208,11 +2228,15 @@ radeon_add_atom_connector(struct drm_device *dev, > drm_connector_init(dev, &radeon_connector->base, &radeon_dp_connector_funcs, connector_type); > drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs); > if (i2c_bus->valid) { > - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > - if (radeon_connector->ddc_bus) > + struct radeon_connector *rcn = radeon_connector; > + > + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > + if (rcn->ddc_bus) { > has_aux = true; > - else > + connector->ddc = &rcn->ddc_bus->adapter; > + } else { > DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + } > } > subpixel_order = SubPixelHorizontalRGB; > drm_object_attach_property(&radeon_connector->base.base, > @@ -2258,11 +2282,15 @@ radeon_add_atom_connector(struct drm_device *dev, > drm_connector_init(dev, &radeon_connector->base, &radeon_edp_connector_funcs, connector_type); > drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs); > if (i2c_bus->valid) { > - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > - if (radeon_connector->ddc_bus) > + struct radeon_connector *rcn = radeon_connector; > + > + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > + if (rcn->ddc_bus) { > has_aux = true; > - else > + connector->ddc = &rcn->ddc_bus->adapter; > + } else { > DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + } > } > drm_object_attach_property(&radeon_connector->base.base, > dev->mode_config.scaling_mode_property, > @@ -2297,9 +2325,13 @@ radeon_add_atom_connector(struct drm_device *dev, > drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type); > drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs); > if (i2c_bus->valid) { > - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > - if (!radeon_connector->ddc_bus) > + struct radeon_connector *rcn = radeon_connector; > + > + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > + if (!rcn->ddc_bus) > DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = &rcn->ddc_bus->adapter; > } > drm_object_attach_property(&radeon_connector->base.base, > dev->mode_config.scaling_mode_property, > @@ -2384,6 +2416,9 @@ radeon_add_legacy_connector(struct drm_device *dev, > radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > if (!radeon_connector->ddc_bus) > DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = > + &radeon_connector->ddc_bus->adapter; > } > radeon_connector->dac_load_detect = true; > drm_object_attach_property(&radeon_connector->base.base, > @@ -2401,6 +2436,9 @@ radeon_add_legacy_connector(struct drm_device *dev, > radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > if (!radeon_connector->ddc_bus) > DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = > + &radeon_connector->ddc_bus->adapter; > } > radeon_connector->dac_load_detect = true; > drm_object_attach_property(&radeon_connector->base.base, > @@ -2419,6 +2457,9 @@ radeon_add_legacy_connector(struct drm_device *dev, > radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > if (!radeon_connector->ddc_bus) > DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = > + &radeon_connector->ddc_bus->adapter; > } > if (connector_type == DRM_MODE_CONNECTOR_DVII) { > radeon_connector->dac_load_detect = true; > @@ -2464,6 +2505,9 @@ radeon_add_legacy_connector(struct drm_device *dev, > radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); > if (!radeon_connector->ddc_bus) > DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); > + else > + connector->ddc = > + &radeon_connector->ddc_bus->adapter; > } > drm_object_attach_property(&radeon_connector->base.base, > dev->mode_config.scaling_mode_property, > -- > 2.17.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index c60d1a44d22a..a876e51d275a 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1946,11 +1946,15 @@ radeon_add_atom_connector(struct drm_device *dev, radeon_dig_connector->igp_lane_info = igp_lane_info; radeon_connector->con_priv = radeon_dig_connector; if (i2c_bus->valid) { - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); - if (radeon_connector->ddc_bus) + struct radeon_connector *rcn = radeon_connector; + + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); + if (rcn->ddc_bus) { has_aux = true; - else + connector->ddc = &rcn->ddc_bus->adapter; + } else { DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + } } switch (connector_type) { case DRM_MODE_CONNECTOR_VGA: @@ -2045,9 +2049,13 @@ radeon_add_atom_connector(struct drm_device *dev, drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); if (i2c_bus->valid) { - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); - if (!radeon_connector->ddc_bus) + struct radeon_connector *rcn = radeon_connector; + + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); + if (!rcn->ddc_bus) DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &rcn->ddc_bus->adapter; } radeon_connector->dac_load_detect = true; drm_object_attach_property(&radeon_connector->base.base, @@ -2070,9 +2078,13 @@ radeon_add_atom_connector(struct drm_device *dev, drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type); drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs); if (i2c_bus->valid) { - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); - if (!radeon_connector->ddc_bus) + struct radeon_connector *rcn = radeon_connector; + + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); + if (!rcn->ddc_bus) DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &rcn->ddc_bus->adapter; } radeon_connector->dac_load_detect = true; drm_object_attach_property(&radeon_connector->base.base, @@ -2101,9 +2113,13 @@ radeon_add_atom_connector(struct drm_device *dev, drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); if (i2c_bus->valid) { - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); - if (!radeon_connector->ddc_bus) + struct radeon_connector *rcn = radeon_connector; + + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); + if (!rcn->ddc_bus) DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &rcn->ddc_bus->adapter; } subpixel_order = SubPixelHorizontalRGB; drm_object_attach_property(&radeon_connector->base.base, @@ -2158,9 +2174,13 @@ radeon_add_atom_connector(struct drm_device *dev, drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type); drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs); if (i2c_bus->valid) { - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); - if (!radeon_connector->ddc_bus) + struct radeon_connector *rcn = radeon_connector; + + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); + if (!rcn->ddc_bus) DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &rcn->ddc_bus->adapter; } drm_object_attach_property(&radeon_connector->base.base, rdev->mode_info.coherent_mode_property, @@ -2208,11 +2228,15 @@ radeon_add_atom_connector(struct drm_device *dev, drm_connector_init(dev, &radeon_connector->base, &radeon_dp_connector_funcs, connector_type); drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs); if (i2c_bus->valid) { - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); - if (radeon_connector->ddc_bus) + struct radeon_connector *rcn = radeon_connector; + + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); + if (rcn->ddc_bus) { has_aux = true; - else + connector->ddc = &rcn->ddc_bus->adapter; + } else { DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + } } subpixel_order = SubPixelHorizontalRGB; drm_object_attach_property(&radeon_connector->base.base, @@ -2258,11 +2282,15 @@ radeon_add_atom_connector(struct drm_device *dev, drm_connector_init(dev, &radeon_connector->base, &radeon_edp_connector_funcs, connector_type); drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs); if (i2c_bus->valid) { - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); - if (radeon_connector->ddc_bus) + struct radeon_connector *rcn = radeon_connector; + + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); + if (rcn->ddc_bus) { has_aux = true; - else + connector->ddc = &rcn->ddc_bus->adapter; + } else { DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + } } drm_object_attach_property(&radeon_connector->base.base, dev->mode_config.scaling_mode_property, @@ -2297,9 +2325,13 @@ radeon_add_atom_connector(struct drm_device *dev, drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type); drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs); if (i2c_bus->valid) { - radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); - if (!radeon_connector->ddc_bus) + struct radeon_connector *rcn = radeon_connector; + + rcn->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); + if (!rcn->ddc_bus) DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &rcn->ddc_bus->adapter; } drm_object_attach_property(&radeon_connector->base.base, dev->mode_config.scaling_mode_property, @@ -2384,6 +2416,9 @@ radeon_add_legacy_connector(struct drm_device *dev, radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); if (!radeon_connector->ddc_bus) DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = + &radeon_connector->ddc_bus->adapter; } radeon_connector->dac_load_detect = true; drm_object_attach_property(&radeon_connector->base.base, @@ -2401,6 +2436,9 @@ radeon_add_legacy_connector(struct drm_device *dev, radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); if (!radeon_connector->ddc_bus) DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = + &radeon_connector->ddc_bus->adapter; } radeon_connector->dac_load_detect = true; drm_object_attach_property(&radeon_connector->base.base, @@ -2419,6 +2457,9 @@ radeon_add_legacy_connector(struct drm_device *dev, radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); if (!radeon_connector->ddc_bus) DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = + &radeon_connector->ddc_bus->adapter; } if (connector_type == DRM_MODE_CONNECTOR_DVII) { radeon_connector->dac_load_detect = true; @@ -2464,6 +2505,9 @@ radeon_add_legacy_connector(struct drm_device *dev, radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus); if (!radeon_connector->ddc_bus) DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = + &radeon_connector->ddc_bus->adapter; } drm_object_attach_property(&radeon_connector->base.base, dev->mode_config.scaling_mode_property,
Use the ddc pointer provided by the generic connector. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> --- drivers/gpu/drm/radeon/radeon_connectors.c | 82 +++++++++++++++++----- 1 file changed, 63 insertions(+), 19 deletions(-)