1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 386cfa4c194d..776e03d6ac81 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -759,19 +759,18 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
 
         if (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) !=
             ENCODER_OBJECT_ID_NONE) {
-                struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
-
-                if (dig->dp_i2c_bus)
+                if (radeon_connector->ddc_bus->has_aux)
                         radeon_connector->edid = drm_get_edid(&radeon_connector->base,
-                                                              &dig->dp_i2c_bus->adapter);
+                                                              &radeon_connector->ddc_bus->aux.ddc);
         } else if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
                    (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)) {
                 struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
 
                 if ((dig->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT ||
-                     dig->dp_sink_type == CONNECTOR_OBJECT_ID_eDP) && dig->dp_i2c_bus)
+                     dig->dp_sink_type == CONNECTOR_OBJECT_ID_eDP) &&
+                    radeon_connector->ddc_bus->has_aux)
                         radeon_connector->edid = drm_get_edid(&radeon_connector->base,
-                                                              &dig->dp_i2c_bus->adapter);
+                                                              &radeon_connector->ddc_bus->aux.ddc);
                 else if (radeon_connector->ddc_bus && !radeon_connector->edid)
                         radeon_connector->edid = drm_get_edid(&radeon_connector->base,
                                                               &radeon_connector->ddc_bus->adapter);