diff options
| author | Alex Deucher | 2014-07-14 23:57:19 +0200 |
|---|---|---|
| committer | Alex Deucher | 2014-07-17 15:01:29 +0200 |
| commit | 0ac66effe7fcdee55bda6d5d10d3372c95a41920 (patch) | |
| tree | 50e441e2b2684ee59b299003c0f61dd187180ef8 /drivers/gpu | |
| parent | Merge branch 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux in... (diff) | |
| download | kernel-qcow2-linux-0ac66effe7fcdee55bda6d5d10d3372c95a41920.tar.gz kernel-qcow2-linux-0ac66effe7fcdee55bda6d5d10d3372c95a41920.tar.xz kernel-qcow2-linux-0ac66effe7fcdee55bda6d5d10d3372c95a41920.zip | |
drm/radeon: avoid leaking edid data
In some cases we fetch the edid in the detect() callback
in order to determine what sort of monitor is connected.
If that happens, don't fetch the edid again in the get_modes()
callback or we will leak the edid.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_display.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index 13896edcf0b6..65501af453be 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -830,6 +830,10 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector) struct radeon_device *rdev = dev->dev_private; int ret = 0; + /* don't leak the edid if we already fetched it in detect() */ + if (radeon_connector->edid) + goto got_edid; + /* on hw with routers, select right port */ if (radeon_connector->router.ddc_valid) radeon_router_select_ddc_port(radeon_connector); @@ -868,6 +872,7 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector) radeon_connector->edid = radeon_bios_get_hardcoded_edid(rdev); } if (radeon_connector->edid) { +got_edid: drm_mode_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid); ret = drm_add_edid_modes(&radeon_connector->base, radeon_connector->edid); drm_edid_to_eld(&radeon_connector->base, radeon_connector->edid); |