projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| b39dc9c4 GKH |
1 | From be23da8ad219650517cbbb7acbeaeb235667113a Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Deucher <alexdeucher@gmail.com> | |
| 3 | Date: Tue, 18 Jan 2011 18:26:11 +0000 | |
| 4 | Subject: drm/radeon/kms: make the mac rv630 quirk generic | |
| 5 | ||
| 6 | From: Alex Deucher <alexdeucher@gmail.com> | |
| 7 | ||
| 8 | commit be23da8ad219650517cbbb7acbeaeb235667113a upstream. | |
| 9 | ||
| 10 | Seems some other boards do this as well. | |
| 11 | ||
| 12 | Reported-by: Andrea Merello <andrea.merello@gmail.com> | |
| 13 | Signed-off-by: Alex Deucher <alexdeucher@gmail.com> | |
| 14 | Signed-off-by: Dave Airlie <airlied@gmail.com> | |
| 15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 16 | ||
| 17 | --- | |
| 18 | drivers/gpu/drm/radeon/radeon_atombios.c | 14 +++++--------- | |
| 19 | 1 file changed, 5 insertions(+), 9 deletions(-) | |
| 20 | ||
| 21 | --- a/drivers/gpu/drm/radeon/radeon_atombios.c | |
| 22 | +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |
| 23 | @@ -387,15 +387,11 @@ static bool radeon_atom_apply_quirks(str | |
| 24 | *line_mux = 0x90; | |
| 25 | } | |
| 26 | ||
| 27 | - /* mac rv630 */ | |
| 28 | - if ((dev->pdev->device == 0x9588) && | |
| 29 | - (dev->pdev->subsystem_vendor == 0x106b) && | |
| 30 | - (dev->pdev->subsystem_device == 0x00a6)) { | |
| 31 | - if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) && | |
| 32 | - (*connector_type == DRM_MODE_CONNECTOR_DVII)) { | |
| 33 | - *connector_type = DRM_MODE_CONNECTOR_9PinDIN; | |
| 34 | - *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1; | |
| 35 | - } | |
| 36 | + /* mac rv630, rv730, others */ | |
| 37 | + if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) && | |
| 38 | + (*connector_type == DRM_MODE_CONNECTOR_DVII)) { | |
| 39 | + *connector_type = DRM_MODE_CONNECTOR_9PinDIN; | |
| 40 | + *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1; | |
| 41 | } | |
| 42 | ||
| 43 | /* ASUS HD 3600 XT board lists the DVI port as HDMI */ |