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

Commit b9bfdfe6 authored by Jesse Barnes's avatar Jesse Barnes Committed by Dave Airlie
Browse files

new chip name is GM45 



Author: Zhenyu Wang <zhenyu.z.wang@intel.com>

i915: official name for GM45 chipset

Signed-off-by: default avatarZhenyu Wang <zhenyu.z.wang@intel.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 317c35d1

drivers/gpu/drm/i915/i915_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); 


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



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

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



#define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \

		     (dev)->pci_device == 0x2E12 || \
@@ -378,9 +378,9 @@ 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_IGD_GM(dev))

			IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev))



#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev) || IS_G4X(dev))

#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))



#define PRIMARY_RINGBUFFER_SIZE         (128*1024)

drivers/gpu/drm/i915/i915_suspend.c

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

	dev_priv->saveDSPBPOS = I915_READ(DSPBPOS);

	dev_priv->saveDSPBADDR = I915_READ(DSPBADDR);

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

	if (IS_I965GM(dev) || IS_GM45(dev)) {

		dev_priv->saveDSPBSURF = I915_READ(DSPBSURF);

		dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF);

	}