diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2016-11-30 17:43:05 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-12-07 15:19:51 +0200 |
| commit | f69c11aeb872e51bf3900a6c0c8397f9ddb9f5bc (patch) | |
| tree | ef4c50d4d738ce83a7e17447fa3d266fcb5c4175 | |
| parent | 2a307c2e91b9478a2a06c09ffcbfc00851c7be26 (diff) | |
drm/i915: give G45 and GM45 their own platform enums
Distinguish them better.
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/987709804bc8fe55475e7481fcee03e7b86b1ba3.1480520526.git.jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_pci.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_device_info.c | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index e2a99649d594..01e9f5b11f35 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -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) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 2bf9b75ac392..f7ec6e944e09 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -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, diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 6f4cd4fca957..c46415b8c1b9 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -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), |