diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-10-03 05:09:16 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-10-03 05:09:16 -0400 |
| commit | 0d3c24e936feefeca854073ccb40613cd6eba9a9 (patch) | |
| tree | 1f675397b924846740b0931b066ddce6f3d7eb3d /drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |
| parent | 1af0838de60e723cb02253ecc9b555c30f8f6a6f (diff) | |
| parent | ebec44a2456fbe5fe18aae88f6010f6878f0cb4a (diff) | |
Merge airlied/drm-next into drm-misc-next
Just catching up with upstream.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 8d1cf2d3e663..f51b41f094ef 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |||
| @@ -346,10 +346,8 @@ static void amdgpu_connector_free_edid(struct drm_connector *connector) | |||
| 346 | { | 346 | { |
| 347 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); | 347 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); |
| 348 | 348 | ||
| 349 | if (amdgpu_connector->edid) { | 349 | kfree(amdgpu_connector->edid); |
| 350 | kfree(amdgpu_connector->edid); | 350 | amdgpu_connector->edid = NULL; |
| 351 | amdgpu_connector->edid = NULL; | ||
| 352 | } | ||
| 353 | } | 351 | } |
| 354 | 352 | ||
| 355 | static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) | 353 | static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) |