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

Commit 5f5f9d4c authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Dave Airlie
Browse files

i915: Add chipset id for Intel Integrated Graphics Device 



This adds new chipset id in drm.

Signed-off-by: default avatarZhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 3e684eae

drivers/char/drm/drm_pciids.h

+1 −0
Original line number Diff line number Diff line
@@ -311,4 +311,5 @@ 
	{0x8086, 0x29d2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0x8086, 0x2a42, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0, 0, 0}

drivers/char/drm/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int i915_suspend(struct drm_device *dev) 
	dev_priv->saveDSPBSIZE = I915_READ(DSPBSIZE);

	dev_priv->saveDSPBPOS = I915_READ(DSPBPOS);

	dev_priv->saveDSPBBASE = I915_READ(DSPBBASE);

	if (IS_I965GM(dev)) {

	if (IS_I965GM(dev) || IS_IGD_GM(dev)) {

		dev_priv->saveDSPBSURF = I915_READ(DSPBSURF);

		dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF);

	}

drivers/char/drm/i915_drv.h

+5 −2
Original line number Diff line number Diff line
@@ -1084,10 +1084,13 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); 
		       (dev)->pci_device == 0x2992 || \

		       (dev)->pci_device == 0x29A2 || \

		       (dev)->pci_device == 0x2A02 || \

		       (dev)->pci_device == 0x2A12)

		       (dev)->pci_device == 0x2A12 || \

		       (dev)->pci_device == 0x2A42)



#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)



#define IS_IGD_GM(dev) ((dev)->pci_device == 0x2A42)



#define IS_G33(dev)    ((dev)->pci_device == 0x29C2 ||	\

			(dev)->pci_device == 0x29B2 ||	\

			(dev)->pci_device == 0x29D2)
@@ -1096,7 +1099,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); 
		      IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev))



#define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \

			IS_I945GM(dev) || IS_I965GM(dev))

			IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev))



#define PRIMARY_RINGBUFFER_SIZE         (128*1024)