Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f02cc3f authored by Eric Anholt's avatar Eric Anholt Committed by Dave Airlie
Browse files

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



Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent e08870c8

drivers/char/drm/drmP.h

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/char/drm/drm_stub.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/char/drm/i915_dma.c

+4 −4
Original line number Diff line number Diff line
@@ -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