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

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

drm/i915: rename BROADWATER and CRESTLINE to I965G and I965GM, respectively 



Add more consistency to our naming. Pineview remains the outlier. Keep
using code names for gen5+.

v2: rebased

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/1481105584-23033-1-git-send-email-jani.nikula@intel.com
parent a5ce929b

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,7 @@ static int i915_sr_status(struct seq_file *m, void *unused) 


	if (HAS_PCH_SPLIT(dev_priv))

		sr_enabled = I915_READ(WM1_LP_ILK) & WM1_LP_SR_EN;

	else if (IS_CRESTLINE(dev_priv) || IS_G4X(dev_priv) ||

	else if (IS_I965GM(dev_priv) || IS_G4X(dev_priv) ||

		 IS_I945G(dev_priv) || IS_I945GM(dev_priv))

		sr_enabled = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN;

	else if (IS_I915GM(dev_priv))

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 
	 * behaviour if any general state is accessed within a page above 4GB,

	 * which also needs to be handled carefully.

	 */

	if (IS_BROADWATER(dev_priv) || IS_CRESTLINE(dev_priv)) {

	if (IS_I965G(dev_priv) || IS_I965GM(dev_priv)) {

		ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));



		if (ret) {

drivers/gpu/drm/i915/i915_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -755,8 +755,8 @@ enum intel_platform { 
	INTEL_I945GM,

	INTEL_G33,

	INTEL_PINEVIEW,

	INTEL_BROADWATER,

	INTEL_CRESTLINE,

	INTEL_I965G,

	INTEL_I965GM,

	INTEL_G4X,

	INTEL_IRONLAKE,

	INTEL_SANDYBRIDGE,
@@ -2522,8 +2522,8 @@ intel_info(const struct drm_i915_private *dev_priv) 
#define IS_I915GM(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2592)

#define IS_I945G(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2772)

#define IS_I945GM(dev_priv)	((dev_priv)->info.platform == INTEL_I945GM)

#define IS_BROADWATER(dev_priv)	((dev_priv)->info.platform == INTEL_BROADWATER)

#define IS_CRESTLINE(dev_priv)	((dev_priv)->info.platform == INTEL_CRESTLINE)

#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_PINEVIEW_G(dev_priv)	(INTEL_DEVID(dev_priv) == 0xa001)

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -3999,7 +3999,7 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size) 
		goto fail;



	mask = GFP_HIGHUSER | __GFP_RECLAIMABLE;

	if (IS_CRESTLINE(dev_priv) || IS_BROADWATER(dev_priv)) {

	if (IS_I965GM(dev_priv) || IS_I965G(dev_priv)) {

		/* 965gm cannot relocate objects above 4GiB. */

		mask &= ~__GFP_HIGHMEM;

		mask |= __GFP_DMA32;

drivers/gpu/drm/i915/i915_gem_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) 
#endif



	gfp = GFP_KERNEL | __GFP_HIGHMEM | __GFP_RECLAIMABLE;

	if (IS_CRESTLINE(i915) || IS_BROADWATER(i915)) {

	if (IS_I965GM(i915) || IS_I965G(i915)) {

		/* 965gm cannot relocate objects above 4GiB. */

		gfp &= ~__GFP_HIGHMEM;

		gfp |= __GFP_DMA32;