openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Consistency FTW.

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/9ab811dc06570bd3fc05a917ade1bdc9bb805a75.1480520526.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2016-11-30 17:43:04 +02:00
parent c0f86832e3
commit 2a307c2e91
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -2955,7 +2955,7 @@ static bool cursor_active(struct drm_i915_private *dev_priv, int pipe)
{ {
u32 state; 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; state = I915_READ(CURCNTR(PIPE_A)) & CURSOR_ENABLE;
else else
state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE; state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;

4
drivers/gpu/drm/i915/i915_drv.h
View File

@ -2515,7 +2515,7 @@ intel_info(const struct drm_i915_private *dev_priv)
(INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until)) (INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))
#define IS_I830(dev_priv) (INTEL_DEVID(dev_priv) == 0x3577) #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_I85X(dev_priv) ((dev_priv)->info.platform == INTEL_I85X)
#define IS_I865G(dev_priv) (INTEL_DEVID(dev_priv) == 0x2572) #define IS_I865G(dev_priv) (INTEL_DEVID(dev_priv) == 0x2572)
#define IS_I915G(dev_priv) ((dev_priv)->info.platform == INTEL_I915G) #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) ((dev_priv)->info.overlay_needs_physical)
/* Early gen2 have a totally busted CS tlb and require pinned batches. */ /* 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 */ /* WaRsDisableCoarsePowerGating:skl,bxt */
#define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \ #define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \

2
drivers/gpu/drm/i915/i915_gem_stolen.c
View File

@ -153,7 +153,7 @@ static unsigned long i915_stolen_to_physical(struct drm_i915_private *dev_priv)
tom = tmp * MB(32); tom = tmp * MB(32);
base = tom - tseg_size - ggtt->stolen_size; base = tom - tseg_size - ggtt->stolen_size;
} else if (IS_845G(dev_priv)) { } else if (IS_I845G(dev_priv)) {
u32 tseg_size = 0; u32 tseg_size = 0;
u32 tom; u32 tom;
u8 tmp; u8 tmp;

4
drivers/gpu/drm/i915/i915_pci.c
View File

@ -71,7 +71,7 @@ static const struct intel_device_info intel_i830_info = {
.num_pipes = 2, /* legal, last one wins */ .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, GEN2_FEATURES,
.platform = INTEL_I845G, .platform = INTEL_I845G,
}; };
@ -432,7 +432,7 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
*/ */
static const struct pci_device_id pciidlist[] = { static const struct pci_device_id pciidlist[] = {
INTEL_I830_IDS(&intel_i830_info), 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_I85X_IDS(&intel_i85x_info),
INTEL_I865G_IDS(&intel_i865g_info), INTEL_I865G_IDS(&intel_i865g_info),
INTEL_I915G_IDS(&intel_i915g_info), INTEL_I915G_IDS(&intel_i915g_info),

14
drivers/gpu/drm/i915/intel_display.c
View File

@ -1233,7 +1233,7 @@ static void assert_cursor(struct drm_i915_private *dev_priv,
{ {
bool cur_state; 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; cur_state = I915_READ(CURCNTR(PIPE_A)) & CURSOR_ENABLE;
else else
cur_state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE; 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); 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); i845_update_cursor(crtc, base, plane_state);
else else
i9xx_update_cursor(crtc, base, plane_state); 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 * the precision of the register. Everything else requires
* square cursors, limited to a few power-of-two sizes. * 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) if ((width & 63) != 0)
return false; return false;
if (width > (IS_845G(dev_priv) ? 64 : 512)) if (width > (IS_I845G(dev_priv) ? 64 : 512))
return false; return false;
if (height > 1023) if (height > 1023)
@ -16127,7 +16127,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
else if (IS_I915G(dev_priv)) else if (IS_I915G(dev_priv))
dev_priv->display.get_display_clock_speed = dev_priv->display.get_display_clock_speed =
i915_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 = dev_priv->display.get_display_clock_speed =
i9xx_misc_get_display_clock_speed; i9xx_misc_get_display_clock_speed;
else if (IS_I915GM(dev_priv)) else if (IS_I915GM(dev_priv))
@ -16549,8 +16549,8 @@ int intel_modeset_init(struct drm_device *dev)
dev->mode_config.max_height = 8192; dev->mode_config.max_height = 8192;
} }
if (IS_845G(dev_priv) || IS_I865G(dev_priv)) { if (IS_I845G(dev_priv) || IS_I865G(dev_priv)) {
dev->mode_config.cursor_width = IS_845G(dev_priv) ? 64 : 512; dev->mode_config.cursor_width = IS_I845G(dev_priv) ? 64 : 512;
dev->mode_config.cursor_height = 1023; dev->mode_config.cursor_height = 1023;
} else if (IS_GEN2(dev_priv)) { } else if (IS_GEN2(dev_priv)) {
dev->mode_config.cursor_width = GEN2_CURSOR_WIDTH; dev->mode_config.cursor_width = GEN2_CURSOR_WIDTH;

2
drivers/gpu/drm/i915/intel_i2c.c
View File

@ -139,7 +139,7 @@ static u32 get_reserved(struct intel_gmbus *bus)
u32 reserved = 0; u32 reserved = 0;
/* On most chips, these bits must be preserved in software. */ /* On most chips, these bits must be preserved in software. */
if (!IS_I830(dev_priv) && !IS_845G(dev_priv)) if (!IS_I830(dev_priv) && !IS_I845G(dev_priv))
reserved = I915_READ_NOTRACE(bus->gpio_reg) & reserved = I915_READ_NOTRACE(bus->gpio_reg) &
(GPIO_DATA_PULLUP_DISABLE | (GPIO_DATA_PULLUP_DISABLE |
GPIO_CLOCK_PULLUP_DISABLE); GPIO_CLOCK_PULLUP_DISABLE);

4
drivers/gpu/drm/i915/intel_overlay.c
View File

@ -957,7 +957,7 @@ static int check_overlay_src(struct drm_i915_private *dev_priv,
u32 tmp; u32 tmp;
/* check src dimensions */ /* check src dimensions */
if (IS_845G(dev_priv) || IS_I830(dev_priv)) { if (IS_I845G(dev_priv) || IS_I830(dev_priv)) {
if (rec->src_height > IMAGE_MAX_HEIGHT_LEGACY || if (rec->src_height > IMAGE_MAX_HEIGHT_LEGACY ||
rec->src_width > IMAGE_MAX_WIDTH_LEGACY) rec->src_width > IMAGE_MAX_WIDTH_LEGACY)
return -EINVAL; return -EINVAL;
@ -1009,7 +1009,7 @@ static int check_overlay_src(struct drm_i915_private *dev_priv,
return -EINVAL; return -EINVAL;
/* stride checking */ /* stride checking */
if (IS_I830(dev_priv) || IS_845G(dev_priv)) if (IS_I830(dev_priv) || IS_I845G(dev_priv))
stride_mask = 255; stride_mask = 255;
else else
stride_mask = 63; stride_mask = 63;

4
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@ -1912,7 +1912,7 @@ intel_engine_create_ring(struct intel_engine_cs *engine, int size)
* of the buffer. * of the buffer.
*/ */
ring->effective_size = size; ring->effective_size = size;
if (IS_I830(engine->i915) || IS_845G(engine->i915)) if (IS_I830(engine->i915) || IS_I845G(engine->i915))
ring->effective_size -= 2 * CACHELINE_BYTES; ring->effective_size -= 2 * CACHELINE_BYTES;
ring->last_retired_head = -1; ring->last_retired_head = -1;
@ -2608,7 +2608,7 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv,
engine->emit_bb_start = gen6_emit_bb_start; engine->emit_bb_start = gen6_emit_bb_start;
else if (INTEL_GEN(dev_priv) >= 4) else if (INTEL_GEN(dev_priv) >= 4)
engine->emit_bb_start = i965_emit_bb_start; engine->emit_bb_start = i965_emit_bb_start;
else if (IS_I830(dev_priv) || IS_845G(dev_priv)) else if (IS_I830(dev_priv) || IS_I845G(dev_priv))
engine->emit_bb_start = i830_emit_bb_start; engine->emit_bb_start = i830_emit_bb_start;
else else
engine->emit_bb_start = i915_emit_bb_start; engine->emit_bb_start = i915_emit_bb_start;