浏览代码

drm: add device/vendor id to drm_device_t for compat with FreeBSD drivers

Signed-off-by: Dave Airlie <airlied@linux.ie>
Eric Anholt 18 年之前
父节点
当前提交
2f02cc3fb8
共有 3 个文件被更改,包括 8 次插入4 次删除
  1. 2 0
      drivers/char/drm/drmP.h
  2. 2 0
      drivers/char/drm/drm_stub.c
  3. 4 4
      drivers/char/drm/i915_dma.c

+ 2 - 0
drivers/char/drm/drmP.h

@@ -723,6 +723,8 @@ typedef struct drm_device {
 	drm_agp_head_t *agp;	/**< AGP data */
 
 	struct pci_dev *pdev;		/**< PCI device structure */
+	int pci_vendor;			/**< PCI vendor id */
+	int pci_device;			/**< PCI device id */
 #ifdef __alpha__
 	struct pci_controller *hose;
 #endif

+ 2 - 0
drivers/char/drm/drm_stub.c

@@ -65,6 +65,8 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
 	mutex_init(&dev->ctxlist_mutex);
 
 	dev->pdev = pdev;
+	dev->pci_device = pdev->device;
+	dev->pci_vendor = pdev->vendor;
 
 #ifdef __alpha__
 	dev->hose = pdev->sysdata;

+ 4 - 4
drivers/char/drm/i915_dma.c

@@ -31,10 +31,10 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-#define IS_I965G(dev) (dev->pdev->device == 0x2972 || \
-		       dev->pdev->device == 0x2982 || \
-		       dev->pdev->device == 0x2992 || \
-		       dev->pdev->device == 0x29A2)
+#define IS_I965G(dev) (dev->pci_device == 0x2972 || \
+		       dev->pci_device == 0x2982 || \
+		       dev->pci_device == 0x2992 || \
+		       dev->pci_device == 0x29A2)
 
 /* Really want an OS-independent resettable timer.  Would like to have
  * this loop run for (eg) 3 sec, but have the timer reset every time