drm/i915: use INTEL_GEN(dev_priv) wherever possible
Subsystems (2)
cover drm/i915: use INTEL_GEN(dev_priv) wherever possible
Wherever we find "INTEL_INFO(dev)->gen", and have a suitable "dev_priv" in scope, replace it with "INTEL_GEN(dev_priv)", which is the preferred wasy to access this device property.
This is mostly achieved automatically by the following Coccinelle script, with a little manual postprocessing of a few files.
@dev_priv_param@
function FUNC;
idexpression struct drm_device *DEV;
identifier DEV_PRIV;
@@FUNC(..., struct drm_i915_private *DEV_PRIV, ...)
{
<...
- INTEL_INFO(DEV)->gen
+ INTEL_GEN(DEV_PRIV)
...>
}@dev_priv_local@
idexpression struct drm_device *DEV;
identifier DEV_PRIV;
expression E;
@@
{
...
(
struct drm_i915_private *DEV_PRIV;
|
struct drm_i915_private *DEV_PRIV = E;
)
<...
- INTEL_INFO(DEV)->gen
+ INTEL_GEN(DEV_PRIV)
...>
}Patch 1 covers those that were purely autoconverted, patch 2 deals with those that needed a little manual tweaking, and patch 3 is just intel_display.c separated out 'cos it's huge.
Dave Gordon (3):
drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen (part 2) drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen (part 3)
drivers/gpu/drm/i915/i915_gem.c | 4 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +- drivers/gpu/drm/i915/i915_gem_fence.c | 9 ++- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +- drivers/gpu/drm/i915/i915_gpu_error.c | 14 ++-- drivers/gpu/drm/i915/i915_irq.c | 12 ++-- drivers/gpu/drm/i915/i915_suspend.c | 12 ++-- drivers/gpu/drm/i915/intel_color.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 6 +- drivers/gpu/drm/i915/intel_ddi.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 107 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_dp.c | 14 ++-- drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 18 ++--- drivers/gpu/drm/i915/intel_psr.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 8 +-- drivers/gpu/drm/i915/intel_tv.c | 2 +- 19 files changed, 118 insertions(+), 120 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/3 drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen
More Coccinellery ...
Wherever we find "INTEL_INFO(dev)->gen", and have a suitable "dev_priv" in scope, replace it with "INTEL_GEN(dev_priv)", which is the preferred wasy to access this device property.
This patch covers all the files that contained only relatively few instances, and where no manual fixup was required. A few more complex instances may be updated in a later patch.
@dev_priv_param@
function FUNC;
idexpression struct drm_device *DEV;
identifier DEV_PRIV;
@@FUNC(..., struct drm_i915_private *DEV_PRIV, ...)
{
<...
- INTEL_INFO(DEV)->gen
+ INTEL_GEN(DEV_PRIV)
...>
}@dev_priv_local@
idexpression struct drm_device *DEV;
identifier DEV_PRIV;
expression E;
@@
{
...
(
struct drm_i915_private *DEV_PRIV;
|
struct drm_i915_private *DEV_PRIV = E;
)
<...
- INTEL_INFO(DEV)->gen
+ INTEL_GEN(DEV_PRIV)
...>
}--- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 14 +++++++------- drivers/gpu/drm/i915/i915_irq.c | 12 ++++++------ drivers/gpu/drm/i915/intel_color.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 6 +++--- drivers/gpu/drm/i915/intel_ddi.c | 4 ++-- drivers/gpu/drm/i915/intel_dp.c | 14 +++++++------- drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 4 ++-- drivers/gpu/drm/i915/intel_pm.c | 18 +++++++++--------- drivers/gpu/drm/i915/intel_psr.c | 4 ++-- drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++---- drivers/gpu/drm/i915/intel_tv.c | 2 +- 15 files changed, 52 insertions(+), 52 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -2
@@ -4288,7 +4288,7 @@ void i915_gem_init_swizzling(struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -if (INTEL_INFO (dev)->gen <5 || +if (INTEL_GEN (dev_priv) <5 || dev_priv->mm.bit_6_swizzle_x ==I915_BIT_6_SWIZZLE_NONE )return ;
@@ -4358,7 +4358,7 @@ static void init_unused_rings(struct drm_device *dev)u32 temp =I915_READ (GEN7_MSG_CTL ); temp &= ~(WAIT_FOR_PCH_FLR_ACK |WAIT_FOR_PCH_RESET_ACK );I915_WRITE (GEN7_MSG_CTL , temp); - }else if (INTEL_INFO (dev)->gen >=7 ) { + }else if (INTEL_GEN (dev_priv) >=7 ) {u32 temp =I915_READ (HSW_NDE_RSTWRN_OPT ); temp &= ~RESET_PCH_HANDSHAKE_ENABLE ;I915_WRITE (HSW_NDE_RSTWRN_OPT , temp);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +3 -3
@@ -1472,19 +1472,19 @@ static void eb_export_fence(struct drm_i915_gem_object *obj, }if (instp_mode != dev_priv->relative_constants_mode) { -if (INTEL_INFO (dev_priv)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) {DRM_DEBUG ("no rel constants on pre-gen4\n" );return -EINVAL ; } -if (INTEL_INFO (dev_priv)->gen >5 && +if (INTEL_GEN (dev_priv) >5 && instp_mode ==I915_EXEC_CONSTANTS_REL_SURFACE ) {DRM_DEBUG ("rel surface constants mode invalid on gen5+\n" );return -EINVAL ; }/* The HW changed the meaning on this bit on gen6 */ -if (INTEL_INFO (dev_priv)->gen >=6 ) +if (INTEL_GEN (dev_priv) >=6 ) instp_mask &= ~I915_EXEC_CONSTANTS_REL_SURFACE ; }break ;
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -2
@@ -2281,7 +2281,7 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev)/* Don't bother messing with faults pre GEN6 as we have little * documentation supporting that it's a good idea. */ -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return ;i915_check_and_clear_faults (dev_priv);
@@ -3266,7 +3266,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev) ggtt->base.closed = false; -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) {if (IS_CHERRYVIEW (dev) ||IS_BROXTON (dev))chv_setup_private_ppat (dev_priv);else
drivers/gpu/drm/i915/i915_gpu_error.c +7 -7
@@ -387,7 +387,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) {for (i =0 ; i <4 ; i++)err_printf (m,"GTIER gt %d: 0x%08x\n" , i, error->gtier[i]);
@@ -406,10 +406,10 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m," INSTDONE_%d: 0x%08x\n" , i, error->extra_instdone[i]); -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) {err_printf (m,"ERROR: 0x%08x\n" , error->error); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )err_printf (m,"FAULT_TLB_DATA: 0x%08x 0x%08x\n" , error->fault_data1, error->fault_data0);
@@ -1327,7 +1327,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (IS_GEN7 (dev)) error->err_int =I915_READ (GEN7_ERR_INT ); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) { error->fault_data0 =I915_READ (GEN8_FAULT_TLB_DATA0 ); error->fault_data1 =I915_READ (GEN8_FAULT_TLB_DATA1 ); }
@@ -1339,10 +1339,10 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, }/* 2: Registers which belong to multiple generations */ -if (INTEL_INFO (dev)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 ) error->forcewake =I915_READ_FW (FORCEWAKE_MT ); -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) { error->derrmr =I915_READ (DERRMR ); error->error =I915_READ (ERROR_GEN6 ); error->done_reg =I915_READ (DONE_REG );
@@ -1358,7 +1358,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) { error->ier =I915_READ (GEN8_DE_MISC_IER );for (i =0 ; i <4 ; i++) error->gtier[i] =I915_READ (GEN8_GT_IER (i));
drivers/gpu/drm/i915/i915_irq.c +6 -6
@@ -2694,7 +2694,7 @@ static int i915_enable_vblank(struct drm_device *dev, unsigned int pipe)unsigned long irqflags;spin_lock_irqsave (&dev_priv->irq_lock, irqflags); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )i915_enable_pipestat (dev_priv, pipe,PIPE_START_VBLANK_INTERRUPT_STATUS );else
@@ -2709,7 +2709,7 @@ static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe) {struct drm_i915_private *dev_priv =to_i915 (dev);unsigned long irqflags; -uint32_t bit = (INTEL_INFO (dev)->gen >=7 ) ?DE_PIPE_VBLANK_IVB (pipe) : +uint32_t bit = (INTEL_GEN (dev_priv) >=7 ) ?DE_PIPE_VBLANK_IVB (pipe) :DE_PIPE_VBLANK (pipe);spin_lock_irqsave (&dev_priv->irq_lock, irqflags);
@@ -2763,7 +2763,7 @@ static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe) {struct drm_i915_private *dev_priv =to_i915 (dev);unsigned long irqflags; -uint32_t bit = (INTEL_INFO (dev)->gen >=7 ) ?DE_PIPE_VBLANK_IVB (pipe) : +uint32_t bit = (INTEL_GEN (dev_priv) >=7 ) ?DE_PIPE_VBLANK_IVB (pipe) :DE_PIPE_VBLANK (pipe);spin_lock_irqsave (&dev_priv->irq_lock, irqflags);
@@ -3225,7 +3225,7 @@ static void gen5_gt_irq_reset(struct drm_device *dev)struct drm_i915_private *dev_priv =to_i915 (dev);GEN5_IRQ_RESET (GT ); -if (INTEL_INFO (dev)->gen >=6 ) +if (INTEL_GEN (dev_priv) >=6 )GEN5_IRQ_RESET (GEN6_PM ); }
@@ -3561,7 +3561,7 @@ static void gen5_gt_irq_postinstall(struct drm_device *dev)GEN5_IRQ_INIT (GT , dev_priv->gt_irq_mask, gt_irqs); -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) {/* * RPS interrupts will get enabled/disabled on demand when RPS * itself is enabled/disabled.
@@ -3579,7 +3579,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev)struct drm_i915_private *dev_priv =to_i915 (dev);u32 display_mask, extra_mask; -if (INTEL_INFO (dev)->gen >=7 ) { +if (INTEL_GEN (dev_priv) >=7 ) { display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE_IVB | DE_PCH_EVENT_IVB | DE_PLANEC_FLIP_DONE_IVB | DE_PLANEB_FLIP_DONE_IVB |
drivers/gpu/drm/i915/intel_color.c +1 -1
@@ -180,7 +180,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)I915_WRITE (PIPE_CSC_PREOFF_ME (pipe),0 );I915_WRITE (PIPE_CSC_PREOFF_LO (pipe),0 ); -if (INTEL_INFO (dev)->gen >6 ) { +if (INTEL_GEN (dev_priv) >6 ) {uint16_t postoff =0 ;if (intel_crtc_state->limited_color_range)
drivers/gpu/drm/i915/intel_crt.c +3 -3
@@ -154,7 +154,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder,const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;u32 adpa; -if (INTEL_INFO (dev)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 ) adpa =ADPA_HOTPLUG_BITS ;else adpa =0 ;
@@ -700,7 +700,7 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)if (intel_get_load_detect_pipe (connector,NULL , &tmp, &ctx)) {if (intel_crt_detect_ddc (connector)) status = connector_status_connected; -else if (INTEL_INFO (dev)->gen <4 ) +else if (INTEL_GEN (dev_priv) <4 ) status =intel_crt_load_detect (crt,to_intel_crtc (connector->state->crtc)->pipe);else if (i915.load_detect_test)
@@ -766,7 +766,7 @@ void intel_crt_reset(struct drm_encoder *encoder)struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crt *crt =intel_encoder_to_crt (to_intel_encoder (encoder)); -if (INTEL_INFO (dev)->gen >=5 ) { +if (INTEL_GEN (dev_priv) >=5 ) {u32 adpa; adpa =I915_READ (crt->adpa_reg);
drivers/gpu/drm/i915/intel_ddi.c +2 -2
@@ -1748,7 +1748,7 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev))I915_WRITE (DPLL_CTRL2 , (I915_READ (DPLL_CTRL2 ) |DPLL_CTRL2_DDI_CLK_OFF (port))); -else if (INTEL_INFO (dev)->gen <9 ) +else if (INTEL_GEN (dev_priv) <9 )I915_WRITE (PORT_CLK_SEL (port),PORT_CLK_SEL_NONE );if (type ==INTEL_OUTPUT_HDMI ) {
@@ -1817,7 +1817,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder, }else if (type ==INTEL_OUTPUT_EDP ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder); -if (port ==PORT_A &&INTEL_INFO (dev)->gen <9 ) +if (port ==PORT_A &&INTEL_GEN (dev_priv) <9 )intel_dp_stop_link_train (intel_dp);intel_edp_backlight_on (intel_dp);
drivers/gpu/drm/i915/intel_dp.c +7 -7
@@ -1502,7 +1502,7 @@ void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock,intel_fixed_panel_mode (intel_connector->panel.fixed_mode, adjusted_mode); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {int ret; ret =skl_update_scaler_crtc (pipe_config);if (ret)
@@ -2908,7 +2908,7 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder,if (IS_BROXTON (dev))return DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ; -else if (INTEL_INFO (dev)->gen >=9 ) { +else if (INTEL_GEN (dev_priv) >=9 ) {if (dev_priv->vbt.edp.low_vswing && port ==PORT_A )return DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ;return DP_TRAIN_VOLTAGE_SWING_LEVEL_2 ;
@@ -4801,7 +4801,7 @@ bool intel_dp_is_edp(struct drm_device *dev, enum port port)* eDP not supported on g4x. so bail out early just * for a bit extra safety in case the VBT is bonkers. */ -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 )return false;if (port ==PORT_A )
@@ -5401,7 +5401,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,INIT_DELAYED_WORK (&dev_priv->drrs.work, intel_edp_drrs_downclock_work);mutex_init (&dev_priv->drrs.mutex); -if (INTEL_INFO (dev)->gen <=6 ) { +if (INTEL_GEN (dev_priv) <=6 ) {DRM_DEBUG_KMS ("DRRS supported for Gen7 and above\n" );return NULL ; }
@@ -5575,7 +5575,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, intel_dp->pps_pipe =INVALID_PIPE ;/* intel_dp vfuncs */ -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) intel_dp->get_aux_clock_divider = skl_get_aux_clock_divider;else if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) intel_dp->get_aux_clock_divider = hsw_get_aux_clock_divider;
@@ -5584,7 +5584,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,else intel_dp->get_aux_clock_divider = g4x_get_aux_clock_divider; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) intel_dp->get_aux_send_ctl = skl_get_aux_send_ctl;else intel_dp->get_aux_send_ctl = g4x_get_aux_send_ctl;
@@ -5734,7 +5734,7 @@ bool intel_dp_init(struct drm_device *dev, }else { intel_encoder->pre_enable = g4x_pre_enable_dp; intel_encoder->enable = g4x_enable_dp; -if (INTEL_INFO (dev)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 ) intel_encoder->post_disable = ilk_post_disable_dp; }
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
@@ -194,7 +194,7 @@ void intel_disable_shared_dpll(struct intel_crtc *crtc)unsigned crtc_mask =1 <<drm_crtc_index (&crtc->base);/* PCH only available on ILK+ */ -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 )return ;if (pll ==NULL )
drivers/gpu/drm/i915/intel_lvds.c +2 -2
@@ -139,12 +139,12 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, pipe_config->base.adjusted_mode.flags |= flags; -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 ) pipe_config->gmch_pfit.lvds_border_bits = tmp &LVDS_BORDER_ENABLE ;/* gen2/3 store dither state in pfit control, needs to match */ -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) { tmp =I915_READ (PFIT_CONTROL ); pipe_config->gmch_pfit.control |= tmp &PANEL_8TO6_DITHER_ENABLE ;
drivers/gpu/drm/i915/intel_pm.c +9 -9
@@ -2163,14 +2163,14 @@ static void intel_read_wm_latency(struct drm_device *dev, uint16_t wm[8]) wm[2 ] = (sskpd >>12 ) &0xFF ; wm[3 ] = (sskpd >>20 ) &0x1FF ; wm[4 ] = (sskpd >>32 ) &0x1FF ; - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {uint32_t sskpd =I915_READ (MCH_SSKPD ); wm[0 ] = (sskpd >>SSKPD_WM0_SHIFT ) &SSKPD_WM_MASK ; wm[1 ] = (sskpd >>SSKPD_WM1_SHIFT ) &SSKPD_WM_MASK ; wm[2 ] = (sskpd >>SSKPD_WM2_SHIFT ) &SSKPD_WM_MASK ; wm[3 ] = (sskpd >>SSKPD_WM3_SHIFT ) &SSKPD_WM_MASK ; - }else if (INTEL_INFO (dev)->gen >=5 ) { + }else if (INTEL_GEN (dev_priv) >=5 ) {uint32_t mltr =I915_READ (MLTR_ILK );/* ILK primary LP0 latency is 700 ns */
@@ -2375,7 +2375,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate) usable_level = max_level;/* ILK/SNB: LP2+ watermarks only w/o sprites */ -if (INTEL_INFO (dev)->gen <=6 && pipe_wm->sprites_enabled) +if (INTEL_GEN (dev_priv) <=6 && pipe_wm->sprites_enabled) usable_level =1 ;/* ILK/SNB/IVB: LP1+ watermarks only w/o scaling */
@@ -2518,12 +2518,12 @@ static void ilk_wm_merge(struct drm_device *dev,int last_enabled_level = max_level;/* ILK/SNB/IVB: LP1+ watermarks only w/ single pipe */ -if ((INTEL_INFO (dev)->gen <=6 ||IS_IVYBRIDGE (dev)) && +if ((INTEL_GEN (dev_priv) <=6 ||IS_IVYBRIDGE (dev)) && config->num_pipes_active >1 ) last_enabled_level =0 ;/* ILK: FBC WM must be disabled always */ - merged->fbc_wm_enabled =INTEL_INFO (dev)->gen >=6 ; + merged->fbc_wm_enabled =INTEL_GEN (dev_priv) >=6 ;/* merge each WM1+ level */ for (level =1 ; level <= max_level; level++) {
@@ -2829,7 +2829,7 @@ static void ilk_write_wm_values(struct drm_i915_private *dev_priv, previous->wm_lp_spr[0] != results->wm_lp_spr[0])I915_WRITE (WM1S_LP_ILK , results->wm_lp_spr[0 ]); -if (INTEL_INFO (dev)->gen >=7 ) { +if (INTEL_GEN (dev_priv) >=7 ) {if (dirty &WM_DIRTY_LP (2 ) && previous->wm_lp_spr[1 ] != results->wm_lp_spr[1 ])I915_WRITE (WM2S_LP_IVB , results->wm_lp_spr[1 ]);if (dirty &WM_DIRTY_LP (3 ) && previous->wm_lp_spr[2 ] != results->wm_lp_spr[2 ])
@@ -4175,7 +4175,7 @@ static void ilk_program_watermarks(struct drm_i915_private *dev_priv)ilk_wm_merge (dev, &config, &max, &lp_wm_1_2);/* 5/6 split only in single pipe config on IVB+ */ -if (INTEL_INFO (dev)->gen >=7 && +if (INTEL_GEN (dev_priv) >=7 && config.num_pipes_active ==1 && config.sprites_enabled) {ilk_compute_wm_maximums (dev,1 , &config,INTEL_DDB_PART_5_6 , &max);ilk_wm_merge (dev, &config, &max, &lp_wm_5_6);
@@ -4554,7 +4554,7 @@ void ilk_wm_get_hw_state(struct drm_device *dev) hw->wm_lp[2 ] =I915_READ (WM3_LP_ILK ); hw->wm_lp_spr[0 ] =I915_READ (WM1S_LP_ILK ); -if (INTEL_INFO (dev)->gen >=7 ) { +if (INTEL_GEN (dev_priv) >=7 ) { hw->wm_lp_spr[1 ] =I915_READ (WM2S_LP_IVB ); hw->wm_lp_spr[2 ] =I915_READ (WM3S_LP_IVB ); }
@@ -7676,7 +7676,7 @@ void intel_init_pm(struct drm_device *dev)i915_ironlake_get_mem_freq (dev);/* For FIFO watermark updates */ -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {skl_setup_wm_latency (dev); dev_priv->display.update_wm = skl_update_wm; dev_priv->display.compute_global_watermarks = skl_compute_wm;
drivers/gpu/drm/i915/intel_psr.c +2 -2
@@ -472,7 +472,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)/* Enable PSR on the panel */ hsw_psr_enable_sink (intel_dp); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )intel_psr_activate (intel_dp); }else {vlv_psr_setup_vsc (intel_dp);
@@ -498,7 +498,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)* - On HSW/BDW we get a recoverable frozen screen until next * exit-activate sequence. */ -if (INTEL_INFO (dev)->gen <9 ) +if (INTEL_GEN (dev_priv) <9 )schedule_delayed_work (&dev_priv->psr.work,msecs_to_jiffies (intel_dp->panel_power_cycle_delay *5 ));
drivers/gpu/drm/i915/intel_sdvo.c +4 -4
@@ -1269,13 +1269,13 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,return ;/* Set the SDVO control regs. */ -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {/* The real mode polarity is set by the SDVO commands, using * struct intel_sdvo_dtd. */ sdvox =SDVO_VSYNC_ACTIVE_HIGH |SDVO_HSYNC_ACTIVE_HIGH ;if (!HAS_PCH_SPLIT (dev) && crtc_state->limited_color_range) sdvox |=HDMI_COLOR_RANGE_16_235 ; -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 ) sdvox |=SDVO_BORDER_ENABLE ; }else { sdvox =I915_READ (intel_sdvo->sdvo_reg);
@@ -1294,7 +1294,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,if (intel_sdvo->has_hdmi_audio) sdvox |=SDVO_AUDIO_ENABLE ; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {/* done in crtc_mode_set as the dpll_md reg must be written early */ }else if (IS_I945G (dev) ||IS_I945GM (dev) ||IS_G33 (dev)) {/* done in crtc_mode_set as it lives inside the dpll register */
@@ -1304,7 +1304,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder, }if (input_dtd.part2.sdvo_flags &SDVO_NEED_TO_STALL && -INTEL_INFO (dev)->gen <5 ) +INTEL_GEN (dev_priv) <5 ) sdvox |=SDVO_STALL_SELECT ;intel_sdvo_write_sdvox (intel_sdvo, sdvox); }
drivers/gpu/drm/i915/intel_tv.c +1 -1
@@ -1106,7 +1106,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,set_color_conversion (dev_priv, color_conversion); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 )I915_WRITE (TV_CLR_KNOBS ,0x00404000 );else I915_WRITE (TV_CLR_KNOBS ,0x00606000 );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen (part 2)
In reply to Dave GordonMore Coccinellery, as described in part 1 of this series
Wherever we find "INTEL_INFO(dev)->gen", and have a suitable "dev_priv" in scope, replace it with "INTEL_GEN(dev_priv)", which is the preferred wasy to access this device property.
This patch covers the files that required a little manual fixup after the Cocci script, for example where the auto-replacement had left some other nearby macro call still using (dev), as in
"if (INTEL_INFO(dev)->gen < 7 || IS_CHERRYVIEW(dev))" autotransformed to
"if (INTEL_GEN(dev_priv) < 7 || IS_CHERRYVIEW(dev))" and then manually to
"if (INTEL_GEN(dev_priv) < 7 || IS_CHERRYVIEW(dev_priv))"
Also in a few cases we can remove or move a local variable.
--- drivers/gpu/drm/i915/i915_gem_fence.c | 9 ++++----- drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +++--- drivers/gpu/drm/i915/i915_suspend.c | 12 ++++++------ 3 files changed, 13 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_gem_fence.c +4 -5
@@ -60,11 +60,12 @@static void i965_write_fence_reg (struct drm_i915_fence_reg *fence,struct i915_vma *vma) { +struct drm_i915_private *dev_priv = fence->i915;i915_reg_t fence_reg_lo, fence_reg_hi;int fence_pitch_shift;u64 val; -if (INTEL_INFO (fence->i915)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) { fence_reg_lo =FENCE_REG_GEN6_LO (fence->id); fence_reg_hi =FENCE_REG_GEN6_HI (fence->id); fence_pitch_shift =GEN6_FENCE_PITCH_SHIFT ;
@@ -92,8 +93,6 @@ static void i965_write_fence_reg(struct drm_i915_fence_reg *fence, }if (!pipelined) { -struct drm_i915_private *dev_priv = fence->i915; -/* To w/a incoherency with non-atomic 64-bit register updates, * we split the 64-bit update into two 32-bit writes. In order * for a partial fence not to be evaluated between writes, we
@@ -448,7 +447,7 @@ void i915_gem_restore_fences(struct drm_device *dev)uint32_t swizzle_x =I915_BIT_6_SWIZZLE_UNKNOWN ;uint32_t swizzle_y =I915_BIT_6_SWIZZLE_UNKNOWN ; -if (INTEL_INFO (dev)->gen >=8 ||IS_VALLEYVIEW (dev)) { +if (INTEL_GEN (dev_priv) >=8 ||IS_VALLEYVIEW (dev_priv)) {/* * On BDW+, swizzling is not used. We leave the CPU memory * controller in charge of optimizing memory accesses without
@@ -458,7 +457,7 @@ void i915_gem_restore_fences(struct drm_device *dev)*/ swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {if (dev_priv->preserve_bios_swizzle) {if (I915_READ (DISP_ARB_CTL ) &DISP_TILE_SURFACE_SWIZZLING ) {
drivers/gpu/drm/i915/i915_gem_stolen.c +3 -3
@@ -109,7 +109,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)* */ base =0 ; -if (INTEL_INFO (dev)->gen >=3 ) { +if (INTEL_GEN (dev_priv) >=3 ) {u32 bsm;pci_read_config_dword (pdev,INTEL_BSM , &bsm);
@@ -204,7 +204,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)return 0 ;/* make sure we don't clobber the GTT if it's within stolen memory */ -if (INTEL_INFO (dev)->gen <=4 && !IS_G33 (dev) && !IS_G4X (dev)) { +if (INTEL_GEN (dev_priv) <=4 && !IS_G33 (dev_priv) && !IS_G4X (dev_priv)) {struct {u32 start, end; } stolen[2 ] = {
@@ -417,7 +417,7 @@ int i915_gem_init_stolen(struct drm_device *dev)mutex_init (&dev_priv->mm.stolen_lock);#ifdef CONFIG_INTEL_IOMMU -if (intel_iommu_gfx_mapped &&INTEL_INFO (dev)->gen <8 ) { +if (intel_iommu_gfx_mapped &&INTEL_GEN (dev_priv) <8 ) {DRM_INFO ("DMAR active, disabling use of stolen memory\n" );return 0 ; }
drivers/gpu/drm/i915/i915_suspend.c +6 -6
@@ -34,11 +34,11 @@ static void i915_save_display(struct drm_device *dev)struct drm_i915_private *dev_priv =to_i915 (dev);/* Display arbitration control */ -if (INTEL_INFO (dev)->gen <=4 ) +if (INTEL_GEN (dev_priv) <=4 ) dev_priv->regfile.saveDSPARB =I915_READ (DSPARB );/* save FBC interval */ -if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev)) +if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <=4 && !IS_G4X (dev_priv)) dev_priv->regfile.saveFBC_CONTROL =I915_READ (FBC_CONTROL ); }
@@ -47,14 +47,14 @@ static void i915_restore_display(struct drm_device *dev)struct drm_i915_private *dev_priv =to_i915 (dev);/* Display arbitration */ -if (INTEL_INFO (dev)->gen <=4 ) +if (INTEL_GEN (dev_priv) <=4 )I915_WRITE (DSPARB , dev_priv->regfile.saveDSPARB);/* only restore FBC info on the platform that supports FBC*/ intel_fbc_global_disable (dev_priv);/* restore FBC interval */ -if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev)) +if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <=4 && !IS_G4X (dev_priv))I915_WRITE (FBC_CONTROL , dev_priv->regfile.saveFBC_CONTROL);i915_redisable_vga (dev);
@@ -75,7 +75,7 @@ int i915_save_state(struct drm_device *dev) &dev_priv->regfile.saveGCDGMBUS);/* Cache mode state */ -if (INTEL_INFO (dev)->gen <7 ) +if (INTEL_GEN (dev_priv) <7 ) dev_priv->regfile.saveCACHE_MODE_0 =I915_READ (CACHE_MODE_0 );/* Memory Arbitration state */
@@ -122,7 +122,7 @@ int i915_restore_state(struct drm_device *dev)i915_restore_display (dev);/* Cache mode state */ -if (INTEL_INFO (dev)->gen <7 ) +if (INTEL_GEN (dev_priv) <7 )I915_WRITE (CACHE_MODE_0 , dev_priv->regfile.saveCACHE_MODE_0 |0xffff0000 );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen (part 3)
In reply to Dave GordonMore Coccinellery, as described in part 1 of this series
Wherever we find "INTEL_INFO(dev)->gen", and have a suitable "dev_priv" in scope, replace it with "INTEL_GEN(dev_priv)", which is the preferred wasy to access this device property. Occasionally this change also lets us remove a local variable.
This patch covers just intel_display.c, which gets its own patch because it's large, and is also a particularly heavy user of "INTEL_INFO()->gen"; about as many uses as the whole of the rest of the driver put together.
--- drivers/gpu/drm/i915/intel_display.c | 107 +++++++++++++++++------------------ 1 file changed, 53 insertions(+), 54 deletions(-)
drivers/gpu/drm/i915/intel_display.c +53 -54
@@ -1075,7 +1075,7 @@ static void intel_wait_for_pipe_off(struct intel_crtc *crtc)enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;enum pipe pipe = crtc->pipe; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {i915_reg_t reg =PIPECONF (cpu_transcoder);/* Wait for the Pipe State to go off */
@@ -1294,11 +1294,10 @@ static void assert_plane(struct drm_i915_private *dev_priv,static void assert_planes_disabled (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_device *dev = &dev_priv->drm;int i;/* Primary planes are fixed to pipes on gen4+ */ -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {u32 val =I915_READ (DSPCNTR (pipe)); I915_STATE_WARN(val & DISPLAY_PLANE_ENABLE, "plane %c assertion failure, should be disabled but not\n",
@@ -1323,7 +1322,7 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,struct drm_device *dev = &dev_priv->drm;int sprite; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {for_each_sprite (dev_priv, pipe, sprite) {u32 val =I915_READ (PLANE_CTL (pipe, sprite)); I915_STATE_WARN(val & PLANE_CTL_ENABLE,
@@ -1337,12 +1336,12 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,"sprite %c assertion failure, should be off on pipe %c but is still active\n" , sprite_name(pipe, sprite), pipe_name(pipe)); } - }else if (INTEL_INFO (dev)->gen >=7 ) { + }else if (INTEL_GEN (dev_priv) >=7 ) {u32 val =I915_READ (SPRCTL (pipe));I915_STATE_WARN (val &SPRITE_ENABLE ,"sprite %c assertion failure, should be off on pipe %c but is still active\n" ,plane_name (pipe),pipe_name (pipe)); - }else if (INTEL_INFO (dev)->gen >=5 ) { + }else if (INTEL_GEN (dev_priv) >=5 ) {u32 val =I915_READ (DVSCNTR (pipe)); I915_STATE_WARN(val & DVS_ENABLE, "sprite %c assertion failure, should be off on pipe %c but is still active\n",
@@ -1648,7 +1647,7 @@ static void i9xx_enable_pll(struct intel_crtc *crtc)POSTING_READ (reg);udelay (150 ); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {I915_WRITE (DPLL_MD (crtc->pipe), crtc->config->dpll_hw_state.dpll_md); }else {
@@ -3022,7 +3021,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, dspcntr |=DISPLAY_PLANE_ENABLE ; -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) {if (intel_crtc->pipe ==PIPE_B ) dspcntr |=DISPPLANE_SEL_PIPE_B ;
@@ -3076,7 +3075,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,intel_add_fb_offsets (&x, &y, plane_state,0 ); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) intel_crtc->dspaddr_offset =intel_compute_tile_offset (&x, &y, plane_state,0 );
@@ -3098,7 +3097,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,I915_WRITE (reg, dspcntr);I915_WRITE (DSPSTRIDE (plane), fb->pitches[0 ]); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {I915_WRITE (DSPSURF (plane),intel_fb_gtt_offset (fb, rotation) + intel_crtc->dspaddr_offset);
@@ -3704,7 +3703,7 @@ static void intel_update_pipe_config(struct intel_crtc *crtc, (pipe_config->pipe_src_h - 1));/* on skylake this is done by detaching scalers */ -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {skl_detach_scalers (crtc);if (pipe_config->pch_pfit.enabled)
@@ -5456,7 +5455,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_enable_pipe_clock (intel_crtc); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )skylake_pfit_enable (intel_crtc);else ironlake_pfit_enable (intel_crtc);
@@ -5612,7 +5611,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,if (!transcoder_is_dsi (cpu_transcoder))intel_ddi_disable_transcoder_func (dev_priv, cpu_transcoder); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )skylake_scaler_disable (intel_crtc);else ironlake_pfit_disable (intel_crtc, false);
@@ -7185,7 +7184,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;int clock_limit = dev_priv->max_dotclk_freq; -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) { clock_limit = dev_priv->max_cdclk_freq *9 /10 ;/*
@@ -7219,7 +7218,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,/* Cantiga+ cannot handle modes with a hsync front porch of 0. * WaPruneModeWithIncorrectHsyncOffset:ctg,elk,ilk,snb,ivb,vlv,hsw. */ -if ((INTEL_INFO (dev)->gen >4 ||IS_G4X (dev)) && +if ((INTEL_GEN (dev_priv) >4 ||IS_G4X (dev_priv)) && adjusted_mode->crtc_hsync_start == adjusted_mode->crtc_hdisplay)return -EINVAL ;
@@ -7789,7 +7788,7 @@ static void intel_cpu_transcoder_set_m_n(struct intel_crtc *crtc,int pipe = crtc->pipe;enum transcoder transcoder = crtc->config->cpu_transcoder; -if (INTEL_INFO (dev)->gen >=5 ) { +if (INTEL_GEN (dev_priv) >=5 ) {I915_WRITE (PIPE_DATA_M1 (transcoder),TU_SIZE (m_n->tu) | m_n->gmch_m);I915_WRITE (PIPE_DATA_N1 (transcoder), m_n->gmch_n);I915_WRITE (PIPE_LINK_M1 (transcoder), m_n->link_m);
@@ -7798,7 +7797,7 @@ static void intel_cpu_transcoder_set_m_n(struct intel_crtc *crtc,* for gen < 8) and if DRRS is supported (to make sure the * registers are not unnecessarily accessed). */ -if (m2_n2 && (IS_CHERRYVIEW (dev) ||INTEL_INFO (dev)->gen <8 ) && +if (m2_n2 && (IS_CHERRYVIEW (dev_priv) ||INTEL_GEN (dev_priv) <8 ) && crtc->config->has_drrs) {I915_WRITE (PIPE_DATA_M2 (transcoder),TU_SIZE (m2_n2->tu) | m2_n2->gmch_m);
@@ -8184,7 +8183,7 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc, dpll |=DPLLB_LVDS_P2_CLOCK_DIV_14 ;break ; } -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) dpll |= (6 <<PLL_LOAD_PULSE_PHASE_SHIFT );if (crtc_state->sdvo_tv_clock)
@@ -8198,7 +8197,7 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc, dpll |=DPLL_VCO_ENABLE ; crtc_state->dpll_hw_state.dpll = dpll; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {u32 dpll_md = (crtc_state->pixel_multiplier -1 ) <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; crtc_state->dpll_hw_state.dpll_md = dpll_md;
@@ -8271,7 +8270,7 @@ static void intel_set_pipe_timings(struct intel_crtc *intel_crtc) vsyncshift += adjusted_mode->crtc_htotal; } -if (INTEL_INFO (dev)->gen >3 ) +if (INTEL_GEN (dev_priv) >3 )I915_WRITE (VSYNCSHIFT (cpu_transcoder), vsyncshift); I915_WRITE(HTOTAL(cpu_transcoder),
@@ -8440,7 +8439,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) }if (intel_crtc->config->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) { -if (INTEL_INFO (dev)->gen <4 || +if (INTEL_GEN (dev_priv) <4 ||intel_crtc_has_type (intel_crtc->config,INTEL_OUTPUT_SDVO )) pipeconf |=PIPECONF_INTERLACE_W_FIELD_INDICATION ;else
@@ -8652,7 +8651,7 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t tmp; -if (INTEL_INFO (dev)->gen <=3 && (IS_I830 (dev) || !IS_MOBILE (dev))) +if (INTEL_GEN (dev_priv) <=3 && (IS_I830 (dev_priv) || !IS_MOBILE (dev_priv)))return ; tmp =I915_READ (PFIT_CONTROL );
@@ -8660,7 +8659,7 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc,return ;/* Check whether the pfit is attached to our pipe. */ -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) {if (crtc->pipe !=PIPE_B )return ; }else {
@@ -8724,7 +8723,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc, fb = &intel_fb->base; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {if (val &DISPPLANE_TILED ) { plane_config->tiling =I915_TILING_X ; fb->modifier[0 ] =I915_FORMAT_MOD_X_TILED ;
@@ -8736,7 +8735,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc, fb->pixel_format = fourcc; fb->bits_per_pixel =drm_format_plane_cpp (fourcc,0 ) *8 ; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {if (plane_config->tiling) offset =I915_READ (DSPTILEOFF (plane));else
@@ -8844,7 +8843,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc, (tmp & PIPECONF_COLOR_RANGE_SELECT)) pipe_config->limited_color_range = true; -if (INTEL_INFO (dev)->gen <4 ) +if (INTEL_GEN (dev_priv) <4 ) pipe_config->double_wide = tmp &PIPECONF_DOUBLE_WIDE ;intel_get_pipe_timings (crtc, pipe_config);
@@ -8852,7 +8851,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,i9xx_get_pfit_config (crtc, pipe_config); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {/* No way to read it out on pipes B and C */ if (IS_CHERRYVIEW (dev) && crtc->pipe !=PIPE_A ) tmp = dev_priv->chv_dpll_md[crtc->pipe];
@@ -9631,7 +9630,7 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe = crtc->pipe; -if (INTEL_INFO (dev)->gen >=5 ) { +if (INTEL_GEN (dev_priv) >=5 ) { m_n->link_m =I915_READ (PIPE_LINK_M1 (transcoder)); m_n->link_n =I915_READ (PIPE_LINK_N1 (transcoder)); m_n->gmch_m =I915_READ (PIPE_DATA_M1 (transcoder))
@@ -9643,7 +9642,7 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,* gen < 8) and if DRRS is supported (to make sure the * registers are not unnecessarily read). */ -if (m2_n2 &&INTEL_INFO (dev)->gen <8 && +if (m2_n2 &&INTEL_GEN (dev_priv) <8 && crtc->config->has_drrs) { m2_n2->link_m =I915_READ (PIPE_LINK_M2 (transcoder)); m2_n2->link_n =I915_READ (PIPE_LINK_N2 (transcoder));
@@ -9845,7 +9844,7 @@ static void ironlake_get_pfit_config(struct intel_crtc *crtc, fb = &intel_fb->base; -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {if (val &DISPPLANE_TILED ) { plane_config->tiling =I915_TILING_X ; fb->modifier[0 ] =I915_FORMAT_MOD_X_TILED ;
@@ -10644,7 +10643,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,* DDI E. So just check whether this pipe is wired to DDI E and whether * the PCH transcoder is on. */ -if (INTEL_INFO (dev)->gen <9 && +if (INTEL_GEN (dev_priv) <9 && (port ==PORT_E ) &&I915_READ (LPT_TRANSCONF ) &TRANS_ENABLE ) { pipe_config->has_pch_encoder = true;
@@ -10693,11 +10692,11 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, pipe_config->gamma_mode =I915_READ (GAMMA_MODE (crtc->pipe)) &GAMMA_MODE_MODE_MASK ; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {skl_init_scalers (dev, crtc, pipe_config); } -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { pipe_config->scaler_state.scaler_id =-1 ; pipe_config->scaler_state.scaler_users &= ~(1 <<SKL_CRTC_INDEX ); }
@@ -10705,7 +10704,7 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, power_domain =POWER_DOMAIN_PIPE_PANEL_FITTER (crtc->pipe);if (intel_display_power_get_if_enabled (dev_priv, power_domain)) { power_domain_mask |=BIT (power_domain); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )skylake_get_pfit_config (crtc, pipe_config);else ironlake_get_pfit_config (crtc, pipe_config);
@@ -11555,7 +11554,7 @@ static bool __pageflip_finished_cs(struct intel_crtc *crtc,* really needed there. But since ctg has the registers, * include it in the check anyway. */ -if (INTEL_INFO (dev)->gen <5 && !IS_G4X (dev)) +if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv))return true;/*
@@ -12153,7 +12152,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,* TILEOFF/LINOFF registers can't be changed via MI display flips. * Note that pitch changes could also affect these register. */ -if (INTEL_INFO (dev)->gen >3 && +if (INTEL_GEN (dev_priv) >3 && (fb->offsets[0 ] != crtc->primary->fb->offsets[0 ] || fb->pitches[0 ] != crtc->primary->fb->pitches[0 ]))return -EINVAL ;
@@ -12218,7 +12217,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,atomic_inc (&intel_crtc->unpin_work_count); -if (INTEL_INFO (dev)->gen >=5 ||IS_G4X (dev)) +if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) work->flip_count =I915_READ (PIPE_FLIPCOUNT_G4X (pipe)) +1 ;if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) {
@@ -12228,7 +12227,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, engine =NULL ; }else if (IS_IVYBRIDGE (dev) ||IS_HASWELL (dev)) { engine = &dev_priv->engine[BCS ]; - }else if (INTEL_INFO (dev)->gen >=7 ) { + }else if (INTEL_GEN (dev_priv) >=7 ) { engine =i915_gem_active_get_engine (&obj->last_write, &obj->base.dev->struct_mutex);if (engine ==NULL || engine->id !=RCS )
@@ -12490,7 +12489,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,/* Pre-gen9 platforms need two-step watermark updates */ if ((pipe_config->update_wm_pre || pipe_config->update_wm_post) && -INTEL_INFO (dev)->gen <9 && dev_priv->display.optimize_watermarks) +INTEL_GEN (dev_priv) <9 && dev_priv->display.optimize_watermarks)to_intel_crtc_state (crtc_state)->wm.need_postvbl_update = true;if (visible || was_visible)
@@ -12607,7 +12606,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc, pipe_config->wm.ilk.intermediate = pipe_config->wm.ilk.optimal; } -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {if (mode_changed) ret =skl_update_scaler_crtc (pipe_config);
@@ -13421,7 +13420,7 @@ static void verify_wm_state(struct drm_crtc *crtc,const enum pipe pipe = intel_crtc->pipe;int plane; -if (INTEL_INFO (dev)->gen <9 || !new_state->active) +if (INTEL_GEN (dev_priv) <9 || !new_state->active)return ;skl_ddb_get_hw_state (dev_priv, &hw_ddb);
@@ -15172,7 +15171,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) crtc_state->base.crtc = &intel_crtc->base;/* initialize shared scalers */ -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {if (pipe ==PIPE_C ) intel_crtc->num_scalers =1 ;else
@@ -15201,7 +15200,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)*/ intel_crtc->pipe = pipe; intel_crtc->plane = pipe; -if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <4 ) { +if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <4 ) {DRM_DEBUG_KMS ("swapping pipes & planes for FBC\n" ); intel_crtc->plane = !pipe; }
@@ -15298,7 +15297,7 @@ static bool intel_crt_present(struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return false;if (IS_HSW_ULT (dev) ||IS_BDW_ULT (dev))
@@ -15661,7 +15660,7 @@ static int intel_framebuffer_init(struct drm_device *dev,switch (mode_cmd->modifier[0 ]) {case I915_FORMAT_MOD_Y_TILED :case I915_FORMAT_MOD_Yf_TILED: -if (INTEL_INFO (dev)->gen <9 ) { +if (INTEL_GEN (dev_priv) <9 ) {DRM_DEBUG ("Unsupported tiling 0x%llx!\n" , mode_cmd->modifier[0 ]);return -EINVAL ;
@@ -15724,7 +15723,7 @@ static int intel_framebuffer_init(struct drm_device *dev,case DRM_FORMAT_ARGB8888 :break ;case DRM_FORMAT_XRGB1555 : -if (INTEL_INFO (dev)->gen >3 ) { +if (INTEL_GEN (dev_priv) >3 ) { format_name =drm_get_format_name (mode_cmd->pixel_format);DRM_DEBUG ("unsupported pixel format: %s\n" , format_name);kfree (format_name);
@@ -15733,7 +15732,7 @@ static int intel_framebuffer_init(struct drm_device *dev,break ;case DRM_FORMAT_ABGR8888 :if (!IS_VALLEYVIEW (dev) && !IS_CHERRYVIEW (dev) && -INTEL_INFO (dev)->gen <9 ) { +INTEL_GEN (dev_priv) <9 ) { format_name =drm_get_format_name (mode_cmd->pixel_format);DRM_DEBUG ("unsupported pixel format: %s\n" , format_name);kfree (format_name);
@@ -15743,7 +15742,7 @@ static int intel_framebuffer_init(struct drm_device *dev,case DRM_FORMAT_XBGR8888 :case DRM_FORMAT_XRGB2101010 :case DRM_FORMAT_XBGR2101010 : -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev_priv) <4 ) { format_name =drm_get_format_name (mode_cmd->pixel_format);DRM_DEBUG ("unsupported pixel format: %s\n" , format_name);kfree (format_name);
@@ -15762,7 +15761,7 @@ static int intel_framebuffer_init(struct drm_device *dev,case DRM_FORMAT_UYVY :case DRM_FORMAT_YVYU :case DRM_FORMAT_VYUY : -if (INTEL_INFO (dev)->gen <5 ) { +if (INTEL_GEN (dev_priv) <5 ) { format_name =drm_get_format_name (mode_cmd->pixel_format);DRM_DEBUG ("unsupported pixel format: %s\n" , format_name);kfree (format_name);
@@ -16544,7 +16543,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)/* We need to sanitize the plane -> pipe mapping first because this will * disable the crtc (and hence change the state) if it is wrong. Note * that gen4+ has a fixed plane -> pipe mapping. */ -if (INTEL_INFO (dev)->gen <4 && !intel_check_plane_mapping (crtc)) { +if (INTEL_GEN (dev_priv) <4 && !intel_check_plane_mapping (crtc)) {bool plane; DRM_DEBUG_KMS("[CRTC:%d:%s] wrong plane connection detected!\n",
@@ -17059,7 +17058,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,int intel_modeset_vga_set_state (struct drm_device *dev,bool state) {struct drm_i915_private *dev_priv =to_i915 (dev); -unsigned reg =INTEL_INFO (dev)->gen >=6 ?SNB_GMCH_CTRL :INTEL_GMCH_CTRL ; +unsigned reg =INTEL_GEN (dev_priv) >=6 ?SNB_GMCH_CTRL :INTEL_GMCH_CTRL ;u16 gmch_ctrl;if (pci_read_config_word (dev_priv->bridge_dev, reg, &gmch_ctrl)) {
@@ -17234,13 +17233,13 @@ struct intel_display_error_state *err_printf (m,"Plane [%d]:\n" , i);err_printf (m," CNTR: %08x\n" , error->plane[i].control);err_printf (m," STRIDE: %08x\n" , error->plane[i].stride); -if (INTEL_INFO (dev)->gen <=3 ) { +if (INTEL_GEN (dev_priv) <=3 ) {err_printf (m," SIZE: %08x\n" , error->plane[i].size);err_printf (m," POS: %08x\n" , error->plane[i].pos); } -if (INTEL_INFO (dev)->gen <=7 && !IS_HASWELL (dev)) +if (INTEL_GEN (dev_priv) <=7 && !IS_HASWELL (dev_priv))err_printf (m," ADDR: %08x\n" , error->plane[i].addr); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) {err_printf (m," SURF: %08x\n" , error->plane[i].surface);err_printf (m," TILEOFF: %08x\n" , error->plane[i].tile_offset); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: use INTEL_GEN(dev_priv) wherever possible
In reply to Dave Gordon== Series Details ==
== Series Details ==
Series: drm/i915: use INTEL_GEN(dev_priv) wherever possible
URL : https://patchwork.freedesktop.org/series/12355/
State : success
== Summary ==
Series 12355v1 drm/i915: use INTEL_GEN(dev_priv) wherever possible
https://patchwork.freedesktop.org/api/1.0/series/12355/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-cursor-vs-flip-legacy:
fail -> PASS (fi-bsw-n3050)fi-bdw-5557u total:254 pass:239 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:254 pass:208 dwarn:0 dfail:0 fail:0 skip:46 fi-byt-n2820 total:254 pass:212 dwarn:0 dfail:0 fail:1 skip:41 fi-hsw-4770k total:254 pass:232 dwarn:0 dfail:0 fail:0 skip:22 fi-hsw-4770r total:254 pass:228 dwarn:0 dfail:0 fail:0 skip:26 fi-ilk-650 total:254 pass:184 dwarn:0 dfail:0 fail:2 skip:68 fi-ivb-3520m total:254 pass:223 dwarn:0 dfail:0 fail:0 skip:31 fi-ivb-3770 total:254 pass:223 dwarn:0 dfail:0 fail:0 skip:31 fi-skl-6260u total:254 pass:240 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:254 pass:227 dwarn:0 dfail:0 fail:1 skip:26 fi-skl-6700k total:254 pass:225 dwarn:1 dfail:0 fail:0 skip:28 fi-snb-2520m total:254 pass:209 dwarn:0 dfail:0 fail:0 skip:45 fi-snb-2600 total:254 pass:209 dwarn:0 dfail:0 fail:0 skip:45
Results at /archive/results/CI_IGT_test/Patchwork_2513/
93d9d9dd030c6eb360b500bf9872663b30b5ebe5 drm-intel-nightly: 2016y-09m-12d-14h-34m-11s UTC integration manifest 364d97b drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen (part 3)
8fcaa0a drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen (part 2)
4d4bba5 drm/i915: prefer INTEL_GEN(dev_priv) to INTEL_INFO(dev)->gen
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx