diff options
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 7 |
3 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index df9cbc78e168..8ca3783f2deb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |||
@@ -358,7 +358,6 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) | |||
358 | if (amdgpu_connector->edid) { | 358 | if (amdgpu_connector->edid) { |
359 | drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid); | 359 | drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid); |
360 | ret = drm_add_edid_modes(connector, amdgpu_connector->edid); | 360 | ret = drm_add_edid_modes(connector, amdgpu_connector->edid); |
361 | drm_edid_to_eld(connector, amdgpu_connector->edid); | ||
362 | return ret; | 361 | return ret; |
363 | } | 362 | } |
364 | drm_mode_connector_update_edid_property(connector, NULL); | 363 | drm_mode_connector_update_edid_property(connector, NULL); |
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index f71fe6d2ddda..c324c3b76fac 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |||
@@ -3333,8 +3333,6 @@ static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector, | |||
3333 | amdgpu_dm_connector->num_modes = | 3333 | amdgpu_dm_connector->num_modes = |
3334 | drm_add_edid_modes(connector, edid); | 3334 | drm_add_edid_modes(connector, edid); |
3335 | 3335 | ||
3336 | drm_edid_to_eld(connector, edid); | ||
3337 | |||
3338 | amdgpu_dm_get_native_mode(connector); | 3336 | amdgpu_dm_get_native_mode(connector); |
3339 | } else { | 3337 | } else { |
3340 | amdgpu_dm_connector->num_modes = 0; | 3338 | amdgpu_dm_connector->num_modes = 0; |
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index f8efb98b1fa7..707928b88448 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | |||
@@ -177,12 +177,7 @@ static const struct drm_connector_funcs dm_dp_mst_connector_funcs = { | |||
177 | static int dm_connector_update_modes(struct drm_connector *connector, | 177 | static int dm_connector_update_modes(struct drm_connector *connector, |
178 | struct edid *edid) | 178 | struct edid *edid) |
179 | { | 179 | { |
180 | int ret; | 180 | return drm_add_edid_modes(connector, edid); |
181 | |||
182 | ret = drm_add_edid_modes(connector, edid); | ||
183 | drm_edid_to_eld(connector, edid); | ||
184 | |||
185 | return ret; | ||
186 | } | 181 | } |
187 | 182 | ||
188 | static int dm_dp_mst_get_modes(struct drm_connector *connector) | 183 | static int dm_dp_mst_get_modes(struct drm_connector *connector) |