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

Commit f69c11ae authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: give G45 and GM45 their own platform enums 



Distinguish them better.

Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/987709804bc8fe55475e7481fcee03e7b86b1ba3.1480520526.git.jani.nikula@intel.com
parent 2a307c2e

drivers/gpu/drm/i915/i915_drv.h

+5 −3
Original line number Diff line number Diff line
@@ -757,7 +757,8 @@ enum intel_platform { 
	INTEL_PINEVIEW,

	INTEL_I965G,

	INTEL_I965GM,

	INTEL_G4X,

	INTEL_G45,

	INTEL_GM45,

	INTEL_IRONLAKE,

	INTEL_SANDYBRIDGE,

	INTEL_IVYBRIDGE,
@@ -2524,8 +2525,9 @@ intel_info(const struct drm_i915_private *dev_priv) 
#define IS_I945GM(dev_priv)	((dev_priv)->info.platform == INTEL_I945GM)

#define IS_I965G(dev_priv)	((dev_priv)->info.platform == INTEL_I965G)

#define IS_I965GM(dev_priv)	((dev_priv)->info.platform == INTEL_I965GM)

#define IS_GM45(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2A42)

#define IS_G4X(dev_priv)	((dev_priv)->info.platform == INTEL_G4X)

#define IS_G45(dev_priv)	((dev_priv)->info.platform == INTEL_G45)

#define IS_GM45(dev_priv)	((dev_priv)->info.platform == INTEL_GM45)

#define IS_G4X(dev_priv)	(IS_G45(dev_priv) || IS_GM45(dev_priv))

#define IS_PINEVIEW_G(dev_priv)	(INTEL_DEVID(dev_priv) == 0xa001)

#define IS_PINEVIEW_M(dev_priv)	(INTEL_DEVID(dev_priv) == 0xa011)

#define IS_PINEVIEW(dev_priv)	((dev_priv)->info.is_pineview)

drivers/gpu/drm/i915/i915_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -172,14 +172,14 @@ static const struct intel_device_info intel_i965gm_info = { 


static const struct intel_device_info intel_g45_info = {

	GEN4_FEATURES,

	.platform = INTEL_G4X,

	.platform = INTEL_G45,

	.has_pipe_cxsr = 1,

	.ring_mask = RENDER_RING | BSD_RING,

};



static const struct intel_device_info intel_gm45_info = {

	GEN4_FEATURES,

	.platform = INTEL_G4X,

	.platform = INTEL_GM45,

	.is_mobile = 1, .has_fbc = 1,

	.has_pipe_cxsr = 1,

	.supports_tv = 1,

drivers/gpu/drm/i915/intel_device_info.c

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ static const char * const platform_names[] = { 
	PLATFORM_NAME(PINEVIEW),

	PLATFORM_NAME(I965G),

	PLATFORM_NAME(I965GM),

	PLATFORM_NAME(G4X),

	PLATFORM_NAME(G45),

	PLATFORM_NAME(GM45),

	PLATFORM_NAME(IRONLAKE),

	PLATFORM_NAME(SANDYBRIDGE),

	PLATFORM_NAME(IVYBRIDGE),