summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/include
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:23 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:48 +1000
commitc7af0ff0e89327918743052d12bf5536e34c7f1a (patch)
treef08b84e8560ba540143d5a5a4b1cacc9e50ea881 /drivers/gpu/drm/nouveau/include
parent7e8820fed712c6de1933dcc91edbf08dcec74925 (diff)
drm/nouveau/device: import pciid list and integrate quirks with it
PCI IDs taken from the NVIDIA binary driver, with permission. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
-rw-r--r--drivers/gpu/drm/nouveau/include/nvkm/core/device.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index 1fd0a07faadc..5741bf228762 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -153,6 +153,9 @@ struct nvkm_device_func {
};
struct nvkm_device_quirk {
+ u8 tv_pin_mask;
+ u8 tv_gpio;
+ bool War00C800_0;
};
struct nvkm_device_chip {
@@ -218,14 +221,6 @@ int nvkm_device_list(u64 *name, int size);
})
static inline bool
-nv_device_match(struct nvkm_device *device, u16 dev, u16 ven, u16 sub)
-{
- return device->pdev->device == dev &&
- device->pdev->subsystem_vendor == ven &&
- device->pdev->subsystem_device == sub;
-}
-
-static inline bool
nv_device_is_pci(struct nvkm_device *device)
{
return device->pdev != NULL;