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

Commit 2a307c2e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: add some more "i" in platform names for consistency 



Consistency FTW.

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/9ab811dc06570bd3fc05a917ade1bdc9bb805a75.1480520526.git.jani.nikula@intel.com
parent c0f86832

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -2955,7 +2955,7 @@ static bool cursor_active(struct drm_i915_private *dev_priv, int pipe) 
{

	u32 state;



	if (IS_845G(dev_priv) || IS_I865G(dev_priv))

	if (IS_I845G(dev_priv) || IS_I865G(dev_priv))

		state = I915_READ(CURCNTR(PIPE_A)) & CURSOR_ENABLE;

	else

		state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;

drivers/gpu/drm/i915/i915_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -2515,7 +2515,7 @@ intel_info(const struct drm_i915_private *dev_priv) 
	(INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))



#define IS_I830(dev_priv)	(INTEL_DEVID(dev_priv) == 0x3577)

#define IS_845G(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2562)

#define IS_I845G(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2562)

#define IS_I85X(dev_priv)	((dev_priv)->info.platform == INTEL_I85X)

#define IS_I865G(dev_priv)	(INTEL_DEVID(dev_priv) == 0x2572)

#define IS_I915G(dev_priv)	((dev_priv)->info.platform == INTEL_I915G)
@@ -2667,7 +2667,7 @@ intel_info(const struct drm_i915_private *dev_priv) 
		((dev_priv)->info.overlay_needs_physical)



/* Early gen2 have a totally busted CS tlb and require pinned batches. */

#define HAS_BROKEN_CS_TLB(dev_priv)	(IS_I830(dev_priv) || IS_845G(dev_priv))

#define HAS_BROKEN_CS_TLB(dev_priv)	(IS_I830(dev_priv) || IS_I845G(dev_priv))



/* WaRsDisableCoarsePowerGating:skl,bxt */

#define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \

drivers/gpu/drm/i915/i915_gem_stolen.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static unsigned long i915_stolen_to_physical(struct drm_i915_private *dev_priv) 
		tom = tmp * MB(32);



		base = tom - tseg_size - ggtt->stolen_size;

	} else if (IS_845G(dev_priv)) {

	} else if (IS_I845G(dev_priv)) {

		u32 tseg_size = 0;

		u32 tom;

		u8 tmp;

drivers/gpu/drm/i915/i915_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static const struct intel_device_info intel_i830_info = { 
	.num_pipes = 2, /* legal, last one wins */

};



static const struct intel_device_info intel_845g_info = {

static const struct intel_device_info intel_i845g_info = {

	GEN2_FEATURES,

	.platform = INTEL_I845G,

};
@@ -432,7 +432,7 @@ static const struct intel_device_info intel_kabylake_gt3_info = { 
 */

static const struct pci_device_id pciidlist[] = {

	INTEL_I830_IDS(&intel_i830_info),

	INTEL_I845G_IDS(&intel_845g_info),

	INTEL_I845G_IDS(&intel_i845g_info),

	INTEL_I85X_IDS(&intel_i85x_info),

	INTEL_I865G_IDS(&intel_i865g_info),

	INTEL_I915G_IDS(&intel_i915g_info),

drivers/gpu/drm/i915/intel_display.c

+7 −7
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ static void assert_cursor(struct drm_i915_private *dev_priv, 
{

	bool cur_state;



	if (IS_845G(dev_priv) || IS_I865G(dev_priv))

	if (IS_I845G(dev_priv) || IS_I865G(dev_priv))

		cur_state = I915_READ(CURCNTR(PIPE_A)) & CURSOR_ENABLE;

	else

		cur_state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;
@@ -10936,7 +10936,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, 


	I915_WRITE(CURPOS(pipe), pos);



	if (IS_845G(dev_priv) || IS_I865G(dev_priv))

	if (IS_I845G(dev_priv) || IS_I865G(dev_priv))

		i845_update_cursor(crtc, base, plane_state);

	else

		i9xx_update_cursor(crtc, base, plane_state);
@@ -10954,11 +10954,11 @@ static bool cursor_size_ok(struct drm_i915_private *dev_priv, 
	 * the precision of the register. Everything else requires

	 * square cursors, limited to a few power-of-two sizes.

	 */

	if (IS_845G(dev_priv) || IS_I865G(dev_priv)) {

	if (IS_I845G(dev_priv) || IS_I865G(dev_priv)) {

		if ((width & 63) != 0)

			return false;



		if (width > (IS_845G(dev_priv) ? 64 : 512))

		if (width > (IS_I845G(dev_priv) ? 64 : 512))

			return false;



		if (height > 1023)
@@ -16127,7 +16127,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) 
	else if (IS_I915G(dev_priv))

		dev_priv->display.get_display_clock_speed =

			i915_get_display_clock_speed;

	else if (IS_I945GM(dev_priv) || IS_845G(dev_priv))

	else if (IS_I945GM(dev_priv) || IS_I845G(dev_priv))

		dev_priv->display.get_display_clock_speed =

			i9xx_misc_get_display_clock_speed;

	else if (IS_I915GM(dev_priv))
@@ -16549,8 +16549,8 @@ int intel_modeset_init(struct drm_device *dev) 
		dev->mode_config.max_height = 8192;

	}



	if (IS_845G(dev_priv) || IS_I865G(dev_priv)) {

		dev->mode_config.cursor_width = IS_845G(dev_priv) ? 64 : 512;

	if (IS_I845G(dev_priv) || IS_I865G(dev_priv)) {

		dev->mode_config.cursor_width = IS_I845G(dev_priv) ? 64 : 512;

		dev->mode_config.cursor_height = 1023;

	} else if (IS_GEN2(dev_priv)) {

		dev->mode_config.cursor_width = GEN2_CURSOR_WIDTH;