hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Use INTEL_GEN everywhere 

Coccinelle patch:

 @@
 identifier p;
 @@
 -INTEL_INFO(p)->gen
 +INTEL_GEN(p)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180208130606.15556-12-tvrtko.ursulin@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180209215847.6660-1-chris@chris-wilson.co.uk
This commit is contained in:
Tvrtko Ursulin 2018-02-09 21:58:46 +00:00 committed by Chris Wilson
parent 6a20fe7b17
commit c56b89f16d
18 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2801,7 +2801,7 @@ intel_info(const struct drm_i915_private *dev_priv)
#define HAS_FW_BLC(dev_priv) (INTEL_GEN(dev_priv) > 2) #define HAS_FW_BLC(dev_priv) (INTEL_GEN(dev_priv) > 2)
#define HAS_FBC(dev_priv) ((dev_priv)->info.has_fbc) #define HAS_FBC(dev_priv) ((dev_priv)->info.has_fbc)
#define HAS_CUR_FBC(dev_priv) (!HAS_GMCH_DISPLAY(dev_priv) && INTEL_INFO(dev_priv)->gen >= 7) #define HAS_CUR_FBC(dev_priv) (!HAS_GMCH_DISPLAY(dev_priv) && INTEL_GEN(dev_priv) >= 7)
#define HAS_IPS(dev_priv) (IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv)) #define HAS_IPS(dev_priv) (IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv))

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

@ -5424,10 +5424,10 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv)
{ {
int i; int i;
if (INTEL_INFO(dev_priv)->gen >= 7 && !IS_VALLEYVIEW(dev_priv) && if (INTEL_GEN(dev_priv) >= 7 && !IS_VALLEYVIEW(dev_priv) &&
!IS_CHERRYVIEW(dev_priv)) !IS_CHERRYVIEW(dev_priv))
dev_priv->num_fence_regs = 32; dev_priv->num_fence_regs = 32;
else if (INTEL_INFO(dev_priv)->gen >= 4 || else if (INTEL_GEN(dev_priv) >= 4 ||
IS_I945G(dev_priv) || IS_I945GM(dev_priv) || IS_I945G(dev_priv) || IS_I945GM(dev_priv) ||
IS_G33(dev_priv) || IS_PINEVIEW(dev_priv)) IS_G33(dev_priv) || IS_PINEVIEW(dev_priv))
dev_priv->num_fence_regs = 16; dev_priv->num_fence_regs = 16;

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

@ -64,7 +64,7 @@ static void i965_write_fence_reg(struct drm_i915_fence_reg *fence,
int fence_pitch_shift; int fence_pitch_shift;
u64 val; u64 val;
if (INTEL_INFO(fence->i915)->gen >= 6) { if (INTEL_GEN(fence->i915) >= 6) {
fence_reg_lo = FENCE_REG_GEN6_LO(fence->id); fence_reg_lo = FENCE_REG_GEN6_LO(fence->id);
fence_reg_hi = FENCE_REG_GEN6_HI(fence->id); fence_reg_hi = FENCE_REG_GEN6_HI(fence->id);
fence_pitch_shift = GEN6_FENCE_PITCH_SHIFT; fence_pitch_shift = GEN6_FENCE_PITCH_SHIFT;

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

@ -2109,7 +2109,7 @@ static int __hw_ppgtt_init(struct i915_hw_ppgtt *ppgtt,
ppgtt->base.i915 = dev_priv; ppgtt->base.i915 = dev_priv;
ppgtt->base.dma = &dev_priv->drm.pdev->dev; ppgtt->base.dma = &dev_priv->drm.pdev->dev;
if (INTEL_INFO(dev_priv)->gen < 8) if (INTEL_GEN(dev_priv) < 8)
return gen6_ppgtt_init(ppgtt); return gen6_ppgtt_init(ppgtt);
else else
return gen8_ppgtt_init(ppgtt); return gen8_ppgtt_init(ppgtt);

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

@ -356,7 +356,7 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
reserved_base = 0; reserved_base = 0;
reserved_size = 0; reserved_size = 0;
switch (INTEL_INFO(dev_priv)->gen) { switch (INTEL_GEN(dev_priv)) {
case 2: case 2:
case 3: case 3:
break; break;

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

@ -704,7 +704,7 @@ void intel_init_audio_hooks(struct drm_i915_private *dev_priv)
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
dev_priv->display.audio_codec_enable = ilk_audio_codec_enable; dev_priv->display.audio_codec_enable = ilk_audio_codec_enable;
dev_priv->display.audio_codec_disable = ilk_audio_codec_disable; dev_priv->display.audio_codec_disable = ilk_audio_codec_disable;
} else if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8) { } else if (IS_HASWELL(dev_priv) || INTEL_GEN(dev_priv) >= 8) {
dev_priv->display.audio_codec_enable = hsw_audio_codec_enable; dev_priv->display.audio_codec_enable = hsw_audio_codec_enable;
dev_priv->display.audio_codec_disable = hsw_audio_codec_disable; dev_priv->display.audio_codec_disable = hsw_audio_codec_disable;
} else if (HAS_PCH_SPLIT(dev_priv)) { } else if (HAS_PCH_SPLIT(dev_priv)) {

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

@ -391,7 +391,7 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv,
static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv, static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
bool alternate) bool alternate)
{ {
switch (INTEL_INFO(dev_priv)->gen) { switch (INTEL_GEN(dev_priv)) {
case 2: case 2:
return alternate ? 66667 : 48000; return alternate ? 66667 : 48000;
case 3: case 3:

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

@ -2233,7 +2233,7 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv)
return max_cdclk_freq; return max_cdclk_freq;
else if (IS_CHERRYVIEW(dev_priv)) else if (IS_CHERRYVIEW(dev_priv))
return max_cdclk_freq*95/100; return max_cdclk_freq*95/100;
else if (INTEL_INFO(dev_priv)->gen < 4) else if (INTEL_GEN(dev_priv) < 4)
return 2*max_cdclk_freq*90/100; return 2*max_cdclk_freq*90/100;
else else
return max_cdclk_freq*90/100; return max_cdclk_freq*90/100;

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

@ -2123,7 +2123,7 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder,
I915_WRITE(DPLL_CTRL2, val); I915_WRITE(DPLL_CTRL2, val);
} else if (INTEL_INFO(dev_priv)->gen < 9) { } else if (INTEL_GEN(dev_priv) < 9) {
I915_WRITE(PORT_CLK_SEL(port), hsw_pll_to_ddi_pll_sel(pll)); I915_WRITE(PORT_CLK_SEL(port), hsw_pll_to_ddi_pll_sel(pll));
} }

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

@ -2029,12 +2029,12 @@ static unsigned int intel_cursor_alignment(const struct drm_i915_private *dev_pr
static unsigned int intel_linear_alignment(const struct drm_i915_private *dev_priv) static unsigned int intel_linear_alignment(const struct drm_i915_private *dev_priv)
{ {
if (INTEL_INFO(dev_priv)->gen >= 9) if (INTEL_GEN(dev_priv) >= 9)
return 256 * 1024; return 256 * 1024;
else if (IS_I965G(dev_priv) || IS_I965GM(dev_priv) || else if (IS_I965G(dev_priv) || IS_I965GM(dev_priv) ||
IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
return 128 * 1024; return 128 * 1024;
else if (INTEL_INFO(dev_priv)->gen >= 4) else if (INTEL_GEN(dev_priv) >= 4)
return 4 * 1024; return 4 * 1024;
else else
return 0; return 0;
@ -6307,7 +6307,7 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc)
const struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); const struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
/* GDG double wide on either pipe, otherwise pipe A only */ /* GDG double wide on either pipe, otherwise pipe A only */
return INTEL_INFO(dev_priv)->gen < 4 && return INTEL_GEN(dev_priv) < 4 &&
(crtc->pipe == PIPE_A || IS_I915G(dev_priv)); (crtc->pipe == PIPE_A || IS_I915G(dev_priv));
} }
@ -8185,7 +8185,7 @@ static void haswell_set_pipemisc(struct drm_crtc *crtc)
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_crtc_state *config = intel_crtc->config; struct intel_crtc_state *config = intel_crtc->config;
if (IS_BROADWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 9) { if (IS_BROADWELL(dev_priv) || INTEL_GEN(dev_priv) >= 9) {
u32 val = 0; u32 val = 0;
switch (intel_crtc->config->pipe_bpp) { switch (intel_crtc->config->pipe_bpp) {
@ -13928,7 +13928,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
* gen2/3 display engine uses the fence if present, * gen2/3 display engine uses the fence if present,
* so the tiling mode must match the fb modifier exactly. * so the tiling mode must match the fb modifier exactly.
*/ */
if (INTEL_INFO(dev_priv)->gen < 4 && if (INTEL_GEN(dev_priv) < 4 &&
tiling != intel_fb_modifier_to_tiling(mode_cmd->modifier[0])) { tiling != intel_fb_modifier_to_tiling(mode_cmd->modifier[0])) {
DRM_DEBUG_KMS("tiling_mode must match fb modifier exactly on gen2/3\n"); DRM_DEBUG_KMS("tiling_mode must match fb modifier exactly on gen2/3\n");
goto err; goto err;
@ -14116,7 +14116,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)
{ {
intel_init_cdclk_hooks(dev_priv); intel_init_cdclk_hooks(dev_priv);
if (INTEL_INFO(dev_priv)->gen >= 9) { if (INTEL_GEN(dev_priv) >= 9) {
dev_priv->display.get_pipe_config = haswell_get_pipe_config; dev_priv->display.get_pipe_config = haswell_get_pipe_config;
dev_priv->display.get_initial_plane_config = dev_priv->display.get_initial_plane_config =
skylake_get_initial_plane_config; skylake_get_initial_plane_config;

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

@ -1443,7 +1443,7 @@ static i915_reg_t skl_aux_data_reg(struct drm_i915_private *dev_priv,
static i915_reg_t intel_aux_ctl_reg(struct drm_i915_private *dev_priv, static i915_reg_t intel_aux_ctl_reg(struct drm_i915_private *dev_priv,
enum port port) enum port port)
{ {
if (INTEL_INFO(dev_priv)->gen >= 9) if (INTEL_GEN(dev_priv) >= 9)
return skl_aux_ctl_reg(dev_priv, port); return skl_aux_ctl_reg(dev_priv, port);
else if (HAS_PCH_SPLIT(dev_priv)) else if (HAS_PCH_SPLIT(dev_priv))
return ilk_aux_ctl_reg(dev_priv, port); return ilk_aux_ctl_reg(dev_priv, port);
@ -1454,7 +1454,7 @@ static i915_reg_t intel_aux_ctl_reg(struct drm_i915_private *dev_priv,
static i915_reg_t intel_aux_data_reg(struct drm_i915_private *dev_priv, static i915_reg_t intel_aux_data_reg(struct drm_i915_private *dev_priv,
enum port port, int index) enum port port, int index)
{ {
if (INTEL_INFO(dev_priv)->gen >= 9) if (INTEL_GEN(dev_priv) >= 9)
return skl_aux_data_reg(dev_priv, port, index); return skl_aux_data_reg(dev_priv, port, index);
else if (HAS_PCH_SPLIT(dev_priv)) else if (HAS_PCH_SPLIT(dev_priv))
return ilk_aux_data_reg(dev_priv, port, index); return ilk_aux_data_reg(dev_priv, port, index);

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

@ -189,7 +189,7 @@ static void intel_lvds_pps_get_hw_state(struct drm_i915_private *dev_priv,
/* Convert from 100ms to 100us units */ /* Convert from 100ms to 100us units */
pps->t4 = val * 1000; pps->t4 = val * 1000;
if (INTEL_INFO(dev_priv)->gen <= 4 && if (INTEL_GEN(dev_priv) <= 4 &&
pps->t1_t2 == 0 && pps->t5 == 0 && pps->t3 == 0 && pps->tx == 0) { pps->t1_t2 == 0 && pps->t5 == 0 && pps->t3 == 0 && pps->tx == 0) {
DRM_DEBUG_KMS("Panel power timings uninitialized, " DRM_DEBUG_KMS("Panel power timings uninitialized, "
"setting defaults\n"); "setting defaults\n");

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

@ -187,7 +187,7 @@ static bool get_mocs_settings(struct drm_i915_private *dev_priv,
table->table = broxton_mocs_table; table->table = broxton_mocs_table;
result = true; result = true;
} else { } else {
WARN_ONCE(INTEL_INFO(dev_priv)->gen >= 9, WARN_ONCE(INTEL_GEN(dev_priv) >= 9,
"Platform that should have a MOCS table does not.\n"); "Platform that should have a MOCS table does not.\n");
} }

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

@ -497,7 +497,7 @@ static u32 i9xx_get_backlight(struct intel_connector *connector)
u32 val; u32 val;
val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK; val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
if (INTEL_INFO(dev_priv)->gen < 4) if (INTEL_GEN(dev_priv) < 4)
val >>= 1; val >>= 1;
if (panel->backlight.combination_mode) { if (panel->backlight.combination_mode) {

8
drivers/gpu/drm/i915/intel_pm.c
View File

@ -6943,7 +6943,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv)
* No floor required for ring frequency on SKL. * No floor required for ring frequency on SKL.
*/ */
ring_freq = gpu_freq; ring_freq = gpu_freq;
} else if (INTEL_INFO(dev_priv)->gen >= 8) { } else if (INTEL_GEN(dev_priv) >= 8) {
/* max(2 * GT, DDR). NB: GT is 50MHz units */ /* max(2 * GT, DDR). NB: GT is 50MHz units */
ring_freq = max(min_ring_freq, gpu_freq); ring_freq = max(min_ring_freq, gpu_freq);
} else if (IS_HASWELL(dev_priv)) { } else if (IS_HASWELL(dev_priv)) {
@ -7554,7 +7554,7 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv)
{ {
unsigned long val; unsigned long val;
if (INTEL_INFO(dev_priv)->gen != 5) if (INTEL_GEN(dev_priv) != 5)
return 0; return 0;
spin_lock_irq(&mchdev_lock); spin_lock_irq(&mchdev_lock);
@ -7638,7 +7638,7 @@ static void __i915_update_gfx_val(struct drm_i915_private *dev_priv)
void i915_update_gfx_val(struct drm_i915_private *dev_priv) void i915_update_gfx_val(struct drm_i915_private *dev_priv)
{ {
if (INTEL_INFO(dev_priv)->gen != 5) if (INTEL_GEN(dev_priv) != 5)
return; return;
spin_lock_irq(&mchdev_lock); spin_lock_irq(&mchdev_lock);
@ -7689,7 +7689,7 @@ unsigned long i915_gfx_val(struct drm_i915_private *dev_priv)
{ {
unsigned long val; unsigned long val;
if (INTEL_INFO(dev_priv)->gen != 5) if (INTEL_GEN(dev_priv) != 5)
return 0; return 0;
spin_lock_irq(&mchdev_lock); spin_lock_irq(&mchdev_lock);

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

@ -126,7 +126,7 @@ static void vlv_psr_enable_sink(struct intel_dp *intel_dp)
static i915_reg_t psr_aux_ctl_reg(struct drm_i915_private *dev_priv, static i915_reg_t psr_aux_ctl_reg(struct drm_i915_private *dev_priv,
enum port port) enum port port)
{ {
if (INTEL_INFO(dev_priv)->gen >= 9) if (INTEL_GEN(dev_priv) >= 9)
return DP_AUX_CH_CTL(port); return DP_AUX_CH_CTL(port);
else else
return EDP_PSR_AUX_CTL; return EDP_PSR_AUX_CTL;
@ -135,7 +135,7 @@ static i915_reg_t psr_aux_ctl_reg(struct drm_i915_private *dev_priv,
static i915_reg_t psr_aux_data_reg(struct drm_i915_private *dev_priv, static i915_reg_t psr_aux_data_reg(struct drm_i915_private *dev_priv,
enum port port, int index) enum port port, int index)
{ {
if (INTEL_INFO(dev_priv)->gen >= 9) if (INTEL_GEN(dev_priv) >= 9)
return DP_AUX_CH_DATA(port, index); return DP_AUX_CH_DATA(port, index);
else else
return EDP_PSR_AUX_DATA(index); return EDP_PSR_AUX_DATA(index);

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

@ -655,7 +655,7 @@ static int init_render_ring(struct intel_engine_cs *engine)
if (IS_GEN(dev_priv, 6, 7)) if (IS_GEN(dev_priv, 6, 7))
I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING)); I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
if (INTEL_INFO(dev_priv)->gen >= 6) if (INTEL_GEN(dev_priv) >= 6)
I915_WRITE_IMR(engine, ~engine->irq_keep_mask); I915_WRITE_IMR(engine, ~engine->irq_keep_mask);
return init_workarounds_ring(engine); return init_workarounds_ring(engine);

6
drivers/gpu/drm/i915/intel_uncore.c
View File

@ -1874,9 +1874,9 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)
if (!i915_modparams.reset) if (!i915_modparams.reset)
return NULL; return NULL;
if (INTEL_INFO(dev_priv)->gen >= 8) if (INTEL_GEN(dev_priv) >= 8)
return gen8_reset_engines; return gen8_reset_engines;
else if (INTEL_INFO(dev_priv)->gen >= 6) else if (INTEL_GEN(dev_priv) >= 6)
return gen6_reset_engines; return gen6_reset_engines;
else if (IS_GEN5(dev_priv)) else if (IS_GEN5(dev_priv))
return ironlake_do_reset; return ironlake_do_reset;
@ -1884,7 +1884,7 @@ static reset_func intel_get_gpu_reset(struct drm_i915_private *dev_priv)
return g4x_do_reset; return g4x_do_reset;
else if (IS_G33(dev_priv) || IS_PINEVIEW(dev_priv)) else if (IS_G33(dev_priv) || IS_PINEVIEW(dev_priv))
return g33_do_reset; return g33_do_reset;
else if (INTEL_INFO(dev_priv)->gen >= 3) else if (INTEL_GEN(dev_priv) >= 3)
return i915_do_reset; return i915_do_reset;
else else
return NULL; return NULL;