aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-08-12 15:19:34 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-08-17 04:10:00 -0400
commitdcdaed6eae0d7ed0c68aaa1ebfceb242625b3bf0 (patch)
tree557f268aad8fa6e440df01f56a60ec5a3bc7396b /drivers
parente9a851ed634628489ca4a392740694d0ded78cb9 (diff)
drm/i915: add missing gen2 pipe A quirk entries
For some odd reason we've missed i830 and a i855 variant. Also kill the two now redundant i830 entries. v2: Don't add the missing 855 id to the pipe A quirk list, we seem to lack justification for it. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 46a4c921a174..dd760f43f577 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7017,21 +7017,16 @@ static struct intel_quirk intel_quirks[] = {
7017 /* HP Mini needs pipe A force quirk (LP: #322104) */ 7017 /* HP Mini needs pipe A force quirk (LP: #322104) */
7018 { 0x27ae, 0x103c, 0x361a, quirk_pipea_force }, 7018 { 0x27ae, 0x103c, 0x361a, quirk_pipea_force },
7019 7019
7020 /* Thinkpad R31 needs pipe A force quirk */
7021 { 0x3577, 0x1014, 0x0505, quirk_pipea_force },
7022 /* Toshiba Protege R-205, S-209 needs pipe A force quirk */ 7020 /* Toshiba Protege R-205, S-209 needs pipe A force quirk */
7023 { 0x2592, 0x1179, 0x0001, quirk_pipea_force }, 7021 { 0x2592, 0x1179, 0x0001, quirk_pipea_force },
7024 7022
7025 /* ThinkPad X30 needs pipe A force quirk (LP: #304614) */
7026 { 0x3577, 0x1014, 0x0513, quirk_pipea_force },
7027 /* ThinkPad X40 needs pipe A force quirk */
7028
7029 /* ThinkPad T60 needs pipe A force quirk (bug #16494) */ 7023 /* ThinkPad T60 needs pipe A force quirk (bug #16494) */
7030 { 0x2782, 0x17aa, 0x201a, quirk_pipea_force }, 7024 { 0x2782, 0x17aa, 0x201a, quirk_pipea_force },
7031 7025
7032 /* 855 & before need to leave pipe A & dpll A up */ 7026 /* 855 & before need to leave pipe A & dpll A up */
7033 { 0x3582, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, 7027 { 0x3582, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
7034 { 0x2562, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force }, 7028 { 0x2562, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
7029 { 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
7035 7030
7036 /* Lenovo U160 cannot use SSC on LVDS */ 7031 /* Lenovo U160 cannot use SSC on LVDS */
7037 { 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable }, 7032 { 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable },