summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorFrancisco Jerez2010-07-18 17:07:16 +0200
committerBen Skeggs2010-07-26 03:42:09 +0200
commit20b240059297d1748f6120f432d0db0db9115c32 (patch)
treeab438bf623783f428246b438094ad2dcacba02f3 /drivers/gpu/drm
parentdrm/nouveau: Don't pick an interlaced mode as the panel native mode. (diff)
downloadkernel-qcow2-linux-20b240059297d1748f6120f432d0db0db9115c32.tar.gz
kernel-qcow2-linux-20b240059297d1748f6120f432d0db0db9115c32.tar.xz
kernel-qcow2-linux-20b240059297d1748f6120f432d0db0db9115c32.zip
drm/nouveau: Add another Zotac FX5200 TV-out quirk.
Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/nv17_tv.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 359506e553a1..bb3a284c31e5 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -120,9 +120,10 @@ static bool
get_tv_detect_quirks(struct drm_device *dev, uint32_t *pin_mask)
{
/* Zotac FX5200 */
- if ((dev->pdev->device == 0x0322) &&
- (dev->pdev->subsystem_vendor == 0x19da) &&
- (dev->pdev->subsystem_device == 0x2035)) {
+ if (dev->pdev->device == 0x0322 &&
+ dev->pdev->subsystem_vendor == 0x19da &&
+ (dev->pdev->subsystem_device == 0x1035 ||
+ dev->pdev->subsystem_device == 0x2035)) {
*pin_mask = 0xc;
return false;
}