drm/i915: Use i915_vm_to_ppgtt instead of manual container_of
Subsystems (2)
Joonas Lahtinen
maintainerPATCH v3 1/3 drm/i915: Use i915_vm_to_ppgtt instead of manual container_of
Looks much better without container_of everywhere.
v2:
- In i915_gem_restore_gtt_mappings too (Chris)
v3:
- Do not cause WARN by calling on non PPGTT object (Chris)
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 44 ++++++++++++++----------------------- 1 file changed, 16 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +16 -28
@@ -706,8 +706,7 @@ static void gen8_ppgtt_clear_pte_range(struct i915_address_space *vm, uint64_t length, gen8_pte_t scratch_pte) { -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);gen8_pte_t *pt_vaddr;unsigned pdpe =gen8_pdpe_index (start);unsigned pde =gen8_pde_index (start);
@@ -762,8 +761,7 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm, uint64_t length, bool use_scratch) { -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);gen8_pte_t scratch_pte =gen8_pte_encode (px_dma (vm->scratch_page),I915_CACHE_LLC , use_scratch);
@@ -788,8 +786,7 @@ gen8_ppgtt_insert_pte_entries(struct i915_address_space *vm,uint64_t start, enum i915_cache_level cache_level) { - struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); + struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);gen8_pte_t *pt_vaddr;unsigned pdpe =gen8_pdpe_index (start);unsigned pde =gen8_pde_index (start);
@@ -829,8 +826,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm, enum i915_cache_level cache_level, u32 unused) { -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);struct sg_page_iter sg_iter;__sg_page_iter_start (&sg_iter, pages->sgl,sg_nents (pages->sgl),0 );
@@ -981,8 +977,7 @@ static void gen8_ppgtt_cleanup_4lvl(struct i915_hw_ppgtt *ppgtt)static void gen8_ppgtt_cleanup (struct i915_address_space *vm) { -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);if (intel_vgpu_active (vm->dev))gen8_ppgtt_notify_vgt (ppgtt, false);
@@ -1216,8 +1211,7 @@ static int gen8_alloc_va_range_3lvl(struct i915_address_space *vm, uint64_t start, uint64_t length) { -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);unsigned long *new_page_dirs, *new_page_tables;struct drm_device *dev = vm->dev;struct i915_page_directory *pd;
@@ -1329,8 +1323,7 @@ static int gen8_alloc_va_range_4lvl(struct i915_address_space *vm, uint64_t length) {DECLARE_BITMAP (new_pdps,GEN8_PML4ES_PER_PML4 ); -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);struct i915_page_directory_pointer *pdp;uint64_t pml4e;int ret =0 ;
@@ -1376,8 +1369,7 @@ err_out:static int gen8_alloc_va_range (struct i915_address_space *vm,uint64_t start,uint64_t length) { -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);if (USES_FULL_48BIT_PPGTT (vm->dev))return gen8_alloc_va_range_4lvl (vm, &ppgtt->pml4, start, length);
@@ -1795,8 +1787,7 @@ static void gen6_ppgtt_clear_range(struct i915_address_space *vm, uint64_t length, bool use_scratch) { -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);gen6_pte_t *pt_vaddr, scratch_pte;unsigned first_entry = start >>PAGE_SHIFT ;unsigned num_entries = length >>PAGE_SHIFT ;
@@ -1830,8 +1821,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,uint64_t start, enum i915_cache_level cache_level, u32 flags) { - struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); + struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);gen6_pte_t *pt_vaddr;unsigned first_entry = start >>PAGE_SHIFT ;unsigned act_pt = first_entry /GEN6_PTES ;
@@ -1865,8 +1855,7 @@ static int gen6_alloc_va_range(struct i915_address_space *vm,struct drm_device *dev = vm->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_ggtt *ggtt = &dev_priv->ggtt; -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);struct i915_page_table *pt;uint32_t start, length, start_save, length_save;uint32_t pde, temp;
@@ -1978,8 +1967,7 @@ static void gen6_free_scratch(struct i915_address_space *vm)static void gen6_ppgtt_cleanup (struct i915_address_space *vm) { -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, base); +struct i915_hw_ppgtt *ppgtt =i915_vm_to_ppgtt (vm);struct i915_page_table *pt;uint32_t pde;
@@ -3294,12 +3282,12 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)list_for_each_entry (vm, &dev_priv->vm_list, global_link) {/* TODO: Perhaps it shouldn't be gen6 specific */ -struct i915_hw_ppgtt *ppgtt = - container_of(vm, struct i915_hw_ppgtt, - base); +struct i915_hw_ppgtt *ppgtt; -if (i915_is_ggtt (vm)) +if (vm->is_ggtt) ppgtt = dev_priv->mm.aliasing_ppgtt; +else + ppgtt =i915_vm_to_ppgtt (vm);gen6_write_page_range (dev_priv, &ppgtt->pd,0 , ppgtt->base.total);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerPATCH v3 2/3 drm/i915: Do not WARN_ON in i915_vm_to_ppgtt
According to Chris, use of i915_vm_to_ppgtt is visible in benchmark unless WARN_ON is removed, so lets get rid of it.
--- drivers/gpu/drm/i915/i915_drv.h | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -3157,7 +3157,6 @@ bool i915_gem_obj_is_pinned(struct drm_i915_gem_object *obj);static inline struct i915_hw_ppgtt *i915_vm_to_ppgtt (struct i915_address_space *vm) { -WARN_ON (i915_is_ggtt (vm)); return container_of(vm, struct i915_hw_ppgtt, base); }
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 2/3] drm/i915: Do not WARN_ON in i915_vm_to_ppgtt
Quoted 16 lines · Joonas Lahtinen
According to Chris, use of
i915_vm_to_ppgttis visible in benchmark unlessWARN_ONis removed, so lets get rid of it.Cc Chris Wilson <[email protected]>Reported-by Chris Wilson <[email protected]>Reviewed-by Chris Wilson <[email protected]>Signed-off-by Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h bool i915_gem_obj_is_pinned(struct drm_i915_gem_object *obj); · line 3161
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -3157,7 +3157,6 @@ bool i915_gem_obj_is_pinned(struct drm_i915_gem_object *obj);static inline struct i915_hw_ppgtt *i915_vm_to_ppgtt (struct i915_address_space *vm) { -WARN_ON (i915_is_ggtt (vm)); return container_of(vm, struct i915_hw_ppgtt, base); }
I shouldn't think the actual check (i915_is_ggtt()) is slowing things down, so it must be the overhead of an unactivated WARN_ON(), which probably generates quite a bit of code and may disable optimisations, even when the code block isn't entered. As an alternative (if you *want* things to break if this is used incorrectly) you could have it return NULL for that case:
static inline struct i915_hw_ppgtt *
i915_vm_to_ppgtt(struct i915_address_space *vm)
{
return i915_is_ggtt(vm) ? NULL :
container_of(vm, struct i915_hw_ppgtt, base);
}Caller will then very likely get an OOPS!
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerPATCH v3 3/3 drm/i915: Do not use {HAS_*, IS_*, INTEL_INFO}(dev_priv->dev)
In reply to Joonas Lahtinendev_priv is what the macro works hard to extract, pass it directly.
v2:
- Include all wrapper macros too (Chris)
v3:
- Include sed cmdline (Chris)
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 +-- drivers/gpu/drm/i915/i915_drv.c | 4 +-- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +-- drivers/gpu/drm/i915/i915_gpu_error.c | 6 ++--- drivers/gpu/drm/i915/i915_irq.c | 8 +++--- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 40 +++++++++++++++--------------- drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/intel_fifo_underrun.c | 4 +-- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 6 ++--- drivers/gpu/drm/i915/intel_pm.c | 14 +++++------ drivers/gpu/drm/i915/intel_psr.c | 2 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 12 ++++----- drivers/gpu/drm/i915/intel_uncore.c | 4 +-- 15 files changed, 57 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -2408,7 +2408,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;u32 tmp, i; -if (!HAS_GUC_UCODE (dev_priv->dev)) +if (!HAS_GUC_UCODE (dev_priv))return 0 ;seq_printf (m,"GuC firmware status:\n" );
@@ -2482,7 +2482,7 @@ static int i915_guc_info(struct seq_file *m, void *data)struct intel_engine_cs *engine;u64 total =0 ; -if (!HAS_GUC_SCHED (dev_priv->dev)) +if (!HAS_GUC_SCHED (dev_priv))return 0 ;if (mutex_lock_interruptible (&dev->struct_mutex))
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -1400,7 +1400,7 @@ static int vlv_suspend_complete(struct drm_i915_private *dev_priv)if (err) goto err2; -if (!IS_CHERRYVIEW (dev_priv->dev)) +if (!IS_CHERRYVIEW (dev_priv))vlv_save_gunit_s0ix_state (dev_priv); err =vlv_force_gfx_clock (dev_priv, false);
@@ -1432,7 +1432,7 @@ static int vlv_resume_prepare(struct drm_i915_private *dev_priv,*/ ret =vlv_force_gfx_clock (dev_priv, true); -if (!IS_CHERRYVIEW (dev_priv->dev)) +if (!IS_CHERRYVIEW (dev_priv))vlv_restore_gunit_s0ix_state (dev_priv); err =vlv_allow_gt_wake (dev_priv, true);
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -2
@@ -2306,7 +2306,7 @@ void i915_check_and_clear_faults(struct drm_device *dev)static void i915_ggtt_flush (struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev_priv->dev)->gen <6 ) { +if (INTEL_INFO (dev_priv)->gen <6 ) {intel_gtt_chipset_flush (); }else {I915_WRITE (GFX_FLSH_CNTL_GEN6 ,GFX_FLSH_CNTL_EN );
@@ -2977,7 +2977,7 @@ static void bdw_setup_private_ppat(struct drm_i915_private *dev_priv)GEN8_PPAT (6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )) |GEN8_PPAT (7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); -if (!USES_PPGTT (dev_priv->dev)) +if (!USES_PPGTT (dev_priv))/* Spec: "For GGTT, there is NO pat_sel[2:0] from the entry, * so RTL will always use the value corresponding to * pat_sel = 000".
drivers/gpu/drm/i915/i915_gpu_error.c +3 -3
@@ -669,7 +669,7 @@ i915_error_object_create(struct drm_i915_private *dev_priv, }/* Cannot access snooped pages through the aperture */ -if (use_ggtt && src->cache_level !=I915_CACHE_NONE && !HAS_LLC (dev_priv->dev)) +if (use_ggtt && src->cache_level !=I915_CACHE_NONE && !HAS_LLC (dev_priv)) goto unwind; dst->page_count = num_pages;
@@ -884,7 +884,7 @@ static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv, ering->semaphore_seqno[0 ] = engine->semaphore.sync_seqno[0 ]; ering->semaphore_seqno[1 ] = engine->semaphore.sync_seqno[1 ]; -if (HAS_VEBOX (dev_priv->dev)) { +if (HAS_VEBOX (dev_priv)) { ering->semaphore_mboxes[2 ] =I915_READ (RING_SYNC_2 (engine->mmio_base)); ering->semaphore_seqno[2 ] = engine->semaphore.sync_seqno[2 ];
@@ -1051,7 +1051,7 @@ static void i915_gem_record_rings(struct drm_device *dev, request->batch_obj, vm); -if (HAS_BROKEN_CS_TLB (dev_priv->dev)) +if (HAS_BROKEN_CS_TLB (dev_priv)) error->ring[i].wa_batchbuffer =i915_error_ggtt_object_create (dev_priv, engine->scratch.obj);
drivers/gpu/drm/i915/i915_irq.c +4 -4
@@ -1218,7 +1218,7 @@ static void ivybridge_parity_work(struct work_struct *work)i915_reg_t reg; slice--; -if (WARN_ON_ONCE (slice >=NUM_L3_SLICES (dev_priv->dev))) +if (WARN_ON_ONCE (slice >=NUM_L3_SLICES (dev_priv)))break ; dev_priv->l3_parity.which_slice &= ~(1 <<slice);
@@ -1257,7 +1257,7 @@ static void ivybridge_parity_work(struct work_struct *work) out:WARN_ON (dev_priv->l3_parity.which_slice);spin_lock_irq (&dev_priv->irq_lock); -gen5_enable_gt_irq (dev_priv,GT_PARITY_ERROR (dev_priv->dev)); +gen5_enable_gt_irq (dev_priv,GT_PARITY_ERROR (dev_priv));spin_unlock_irq (&dev_priv->irq_lock);mutex_unlock (&dev_priv->dev->struct_mutex);
@@ -1626,7 +1626,7 @@ static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)if (INTEL_INFO (dev_priv)->gen >=8 )return ; -if (HAS_VEBOX (dev_priv->dev)) { +if (HAS_VEBOX (dev_priv)) {if (pm_iir &PM_VEBOX_USER_INTERRUPT )notify_ring (&dev_priv->engine[VECS ]);
@@ -2828,7 +2828,7 @@ semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr,struct drm_i915_private *dev_priv = engine->dev->dev_private;struct intel_engine_cs *signaller; -if (INTEL_INFO (dev_priv->dev)->gen >=8 ) { +if (INTEL_INFO (dev_priv)->gen >=8 ) {for_each_engine (signaller, dev_priv) {if (engine == signaller)continue ;
drivers/gpu/drm/i915/intel_audio.c +1 -1
@@ -373,7 +373,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder)if (WARN_ON (port ==PORT_A ))return ; -if (HAS_PCH_IBX (dev_priv->dev)) { +if (HAS_PCH_IBX (dev_priv)) { aud_config =IBX_AUD_CFG (pipe); aud_cntrl_st2 =IBX_AUD_CNTL_ST2 ; }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {
drivers/gpu/drm/i915/intel_display.c +20 -20
@@ -1160,7 +1160,7 @@ static void assert_fdi_tx(struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe); -if (HAS_DDI (dev_priv->dev)) { +if (HAS_DDI (dev_priv)) {/* DDI does not have a specific FDI_TX register */ u32 val =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); cur_state = !!(val &TRANS_DDI_FUNC_ENABLE );
@@ -1196,11 +1196,11 @@ static void assert_fdi_tx_pll_enabled(struct drm_i915_private *dev_priv,u32 val;/* ILK FDI PLL is always enabled */ -if (INTEL_INFO (dev_priv->dev)->gen ==5 ) +if (INTEL_INFO (dev_priv)->gen ==5 )return ;/* On Haswell, DDI ports are responsible for the FDI PLL setup */ -if (HAS_DDI (dev_priv->dev)) +if (HAS_DDI (dev_priv))return ; val =I915_READ (FDI_TX_CTL (pipe));
@@ -1408,11 +1408,11 @@ static bool dp_pipe_enabled(struct drm_i915_private *dev_priv,if ((val &DP_PORT_EN ) ==0 )return false; -if (HAS_PCH_CPT (dev_priv->dev)) { +if (HAS_PCH_CPT (dev_priv)) {u32 trans_dp_ctl =I915_READ (TRANS_DP_CTL (pipe));if ((trans_dp_ctl &TRANS_DP_PORT_SEL_MASK ) != port_sel)return false; - }else if (IS_CHERRYVIEW (dev_priv->dev)) { + }else if (IS_CHERRYVIEW (dev_priv)) {if ((val &DP_PIPE_MASK_CHV ) !=DP_PIPE_SELECT_CHV (pipe))return false; }else {
@@ -1428,10 +1428,10 @@ static bool hdmi_pipe_enabled(struct drm_i915_private *dev_priv,if ((val &SDVO_ENABLE ) ==0 )return false; -if (HAS_PCH_CPT (dev_priv->dev)) { +if (HAS_PCH_CPT (dev_priv)) {if ((val &SDVO_PIPE_SEL_MASK_CPT ) !=SDVO_PIPE_SEL_CPT (pipe))return false; - }else if (IS_CHERRYVIEW (dev_priv->dev)) { + }else if (IS_CHERRYVIEW (dev_priv)) {if ((val &SDVO_PIPE_SEL_MASK_CHV ) !=SDVO_PIPE_SEL_CHV (pipe))return false; }else {
@@ -1447,7 +1447,7 @@ static bool lvds_pipe_enabled(struct drm_i915_private *dev_priv,if ((val &LVDS_PORT_EN ) ==0 )return false; -if (HAS_PCH_CPT (dev_priv->dev)) { +if (HAS_PCH_CPT (dev_priv)) {if ((val &PORT_TRANS_SEL_MASK ) !=PORT_TRANS_SEL_CPT (pipe))return false; }else {
@@ -1462,7 +1462,7 @@ static bool adpa_pipe_enabled(struct drm_i915_private *dev_priv, {if ((val &ADPA_DAC_ENABLE ) ==0 )return false; -if (HAS_PCH_CPT (dev_priv->dev)) { +if (HAS_PCH_CPT (dev_priv)) {if ((val &PORT_TRANS_SEL_MASK ) !=PORT_TRANS_SEL_CPT (pipe))return false; }else {
@@ -1481,7 +1481,7 @@ static void assert_pch_dp_disabled(struct drm_i915_private *dev_priv,"PCH DP (0x%08x) enabled on transcoder %c, should be disabled\n" , i915_mmio_reg_offset(reg), pipe_name(pipe)); -I915_STATE_WARN (HAS_PCH_IBX (dev_priv->dev) && (val &DP_PORT_EN ) ==0 +I915_STATE_WARN (HAS_PCH_IBX (dev_priv) && (val &DP_PORT_EN ) ==0 && (val &DP_PIPEB_SELECT ),"IBX PCH dp port still using transcoder B\n" ); }
@@ -1494,7 +1494,7 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv,"PCH HDMI (0x%08x) enabled on transcoder %c, should be disabled\n" , i915_mmio_reg_offset(reg), pipe_name(pipe)); -I915_STATE_WARN (HAS_PCH_IBX (dev_priv->dev) && (val &SDVO_ENABLE ) ==0 +I915_STATE_WARN (HAS_PCH_IBX (dev_priv) && (val &SDVO_ENABLE ) ==0 && (val &SDVO_PIPE_B_SELECT ),"IBX PCH hdmi port still using transcoder B\n" ); }
@@ -1534,7 +1534,7 @@ static void vlv_enable_pll(struct intel_crtc *crtc,assert_pipe_disabled (dev_priv, crtc->pipe);/* PLL is protected by panel, make sure we can write it */ -if (IS_MOBILE (dev_priv->dev)) +if (IS_MOBILE (dev_priv))assert_panel_unlocked (dev_priv, crtc->pipe);I915_WRITE (reg, dpll);
@@ -1818,7 +1818,7 @@ static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv, val =I915_READ (reg); pipeconf_val =I915_READ (PIPECONF (pipe)); -if (HAS_PCH_IBX (dev_priv->dev)) { +if (HAS_PCH_IBX (dev_priv)) {/* * Make the BPC in transcoder be consistent with * that in pipeconf reg. For HDMI we must use 8bpc
@@ -1833,7 +1833,7 @@ static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv, val &= ~TRANS_INTERLACE_MASK ;if ((pipeconf_val &PIPECONF_INTERLACE_MASK ) ==PIPECONF_INTERLACED_ILK ) -if (HAS_PCH_IBX (dev_priv->dev) && +if (HAS_PCH_IBX (dev_priv) &&intel_pipe_has_type (intel_crtc,INTEL_OUTPUT_SDVO )) val |=TRANS_LEGACY_INTERLACED_ILK ;else
@@ -1852,7 +1852,7 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,u32 val, pipeconf_val;/* PCH only available on ILK+ */ -BUG_ON (!HAS_PCH_SPLIT (dev_priv->dev)); +BUG_ON (!HAS_PCH_SPLIT (dev_priv));/* FDI must be feeding us bits for PCH ports */ assert_fdi_tx_enabled (dev_priv, (enum pipe ) cpu_transcoder);
@@ -1948,7 +1948,7 @@ static void intel_enable_pipe(struct intel_crtc *crtc)assert_cursor_disabled (dev_priv, pipe);assert_sprites_disabled (dev_priv, pipe); -if (HAS_PCH_LPT (dev_priv->dev)) +if (HAS_PCH_LPT (dev_priv)) pch_transcoder =TRANSCODER_A ;else pch_transcoder = pipe;
@@ -1958,7 +1958,7 @@ static void intel_enable_pipe(struct intel_crtc *crtc)* a plane. On ILK+ the pipe PLLs are integrated, so we don't * need the check. */ -if (HAS_GMCH_DISPLAY (dev_priv->dev)) +if (HAS_GMCH_DISPLAY (dev_priv))if (crtc->config->has_dsi_encoder)assert_dsi_pll_enabled (dev_priv);else
@@ -6494,7 +6494,7 @@ static bool pipe_config_supports_ips(struct drm_i915_private *dev_priv,return false;/* HSW can handle pixel rate up to cdclk? */ -if (IS_HASWELL (dev_priv->dev)) +if (IS_HASWELL (dev_priv))return true;/*
@@ -9264,7 +9264,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,ironlake_get_fdi_m_n_config (crtc, pipe_config); -if (HAS_PCH_IBX (dev_priv->dev)) { +if (HAS_PCH_IBX (dev_priv)) { pll_id = (enum intel_dpll_id ) crtc->pipe; }else { tmp =I915_READ (PCH_DPLL_SEL );
@@ -16159,7 +16159,7 @@ intel_display_capture_error_state(struct drm_device *dev)/* Note: this does not include DSI transcoders. */ error->num_transcoders =INTEL_INFO (dev)->num_pipes; -if (HAS_DDI (dev_priv->dev)) +if (HAS_DDI (dev_priv)) error->num_transcoders++;/* Account for eDP. */ for (i =0 ; i < error->num_transcoders; i++) {
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
@@ -298,7 +298,7 @@ static void ibx_assert_pch_refclk_enabled(struct drm_i915_private *dev_priv)u32 val;bool enabled; -I915_STATE_WARN_ON (!(HAS_PCH_IBX (dev_priv->dev) ||HAS_PCH_CPT (dev_priv->dev))); +I915_STATE_WARN_ON (!(HAS_PCH_IBX (dev_priv->dev) ||HAS_PCH_CPT (dev_priv))); val =I915_READ (PCH_DREF_CONTROL ); enabled = !!(val & (DREF_SSC_SOURCE_MASK | DREF_NONSPREAD_SOURCE_MASK |
drivers/gpu/drm/i915/intel_fifo_underrun.c +2 -2
@@ -333,7 +333,7 @@ bool intel_set_pch_fifo_underrun_reporting(struct drm_i915_private *dev_priv, old = !intel_crtc->pch_fifo_underrun_disabled; intel_crtc->pch_fifo_underrun_disabled = !enable; -if (HAS_PCH_IBX (dev_priv->dev)) +if (HAS_PCH_IBX (dev_priv))ibx_set_fifo_underrun_reporting (dev_priv->dev, pch_transcoder, enable);else
@@ -363,7 +363,7 @@ void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,return ;/* GMCH can't disable fifo underruns, filter them. */ -if (HAS_GMCH_DISPLAY (dev_priv->dev) && +if (HAS_GMCH_DISPLAY (dev_priv) &&to_intel_crtc (crtc)->cpu_fifo_underrun_disabled)return ;
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -638,7 +638,7 @@ static bool intel_hdmi_set_gcp_infoframe(struct drm_encoder *encoder) reg =HSW_TVIDEO_DIP_GCP (crtc->config->cpu_transcoder); else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) reg =VLV_TVIDEO_DIP_GCP (crtc->pipe); - else if (HAS_PCH_SPLIT(dev_priv->dev)) + else if (HAS_PCH_SPLIT(dev_priv)) reg =TVIDEO_DIP_GCP (crtc->pipe); else return false;
drivers/gpu/drm/i915/intel_i2c.c +3 -3
@@ -124,7 +124,7 @@ static void intel_i2c_quirk_set(struct drm_i915_private *dev_priv, bool enable)u32 val;/* When using bit bashing for I2C, this bit needs to be set to 1 */ -if (!IS_PINEVIEW (dev_priv->dev)) +if (!IS_PINEVIEW (dev_priv))return ; val =I915_READ (DSPCLK_GATE_D );
@@ -264,7 +264,7 @@ gmbus_wait_hw_status(struct drm_i915_private *dev_priv,u32 gmbus2 =0 ;DEFINE_WAIT (wait); -if (!HAS_GMBUS_IRQ (dev_priv->dev)) +if (!HAS_GMBUS_IRQ (dev_priv)) gmbus4_irq_en =0 ;/* Important: The hw handles only the first bit, so set only one! Since
@@ -300,7 +300,7 @@ gmbus_wait_idle(struct drm_i915_private *dev_priv)#define C ((I915_READ_NOTRACE(GMBUS2) & GMBUS_ACTIVE) == 0) -if (!HAS_GMBUS_IRQ (dev_priv->dev)) +if (!HAS_GMBUS_IRQ (dev_priv))return wait_for (C ,10 );/* Important: The hw handles only the first bit, so set only one! */
drivers/gpu/drm/i915/intel_pm.c +7 -7
@@ -4288,7 +4288,7 @@ static u32 intel_rps_limits(struct drm_i915_private *dev_priv, u8 val)* the hw runs at the minimal clock before selecting the desired * frequency, if the down threshold expires in that window we will not * receive a down interrupt. */ -if (IS_GEN9 (dev_priv->dev)) { +if (IS_GEN9 (dev_priv)) { limits = (dev_priv->rps.max_freq_softlimit) <<23 ;if (val <= dev_priv->rps.min_freq_softlimit) limits |= (dev_priv->rps.min_freq_softlimit) <<14 ;
@@ -7346,12 +7346,12 @@ static int chv_freq_opcode(struct drm_i915_private *dev_priv, int val)int intel_gpu_freq (struct drm_i915_private *dev_priv,int val) { -if (IS_GEN9 (dev_priv->dev)) +if (IS_GEN9 (dev_priv))return DIV_ROUND_CLOSEST (val *GT_FREQUENCY_MULTIPLIER ,GEN9_FREQ_SCALER ); -else if (IS_CHERRYVIEW (dev_priv->dev)) +else if (IS_CHERRYVIEW (dev_priv))return chv_gpu_freq (dev_priv, val); -else if (IS_VALLEYVIEW (dev_priv->dev)) +else if (IS_VALLEYVIEW (dev_priv))return byt_gpu_freq (dev_priv, val);else return val *GT_FREQUENCY_MULTIPLIER ;
@@ -7359,12 +7359,12 @@ int intel_gpu_freq(struct drm_i915_private *dev_priv, int val)int intel_freq_opcode (struct drm_i915_private *dev_priv,int val) { -if (IS_GEN9 (dev_priv->dev)) +if (IS_GEN9 (dev_priv))return DIV_ROUND_CLOSEST (val *GEN9_FREQ_SCALER ,GT_FREQUENCY_MULTIPLIER ); -else if (IS_CHERRYVIEW (dev_priv->dev)) +else if (IS_CHERRYVIEW (dev_priv))return chv_freq_opcode (dev_priv, val); -else if (IS_VALLEYVIEW (dev_priv->dev)) +else if (IS_VALLEYVIEW (dev_priv))return byt_freq_opcode (dev_priv, val);else return DIV_ROUND_CLOSEST (val,GT_FREQUENCY_MULTIPLIER );
drivers/gpu/drm/i915/intel_psr.c +1 -1
@@ -563,7 +563,7 @@ static void intel_psr_work(struct work_struct *work)* PSR might take some time to get fully disabled * and be ready for re-enable. */ -if (HAS_DDI (dev_priv->dev)) { +if (HAS_DDI (dev_priv)) {if (wait_for ((I915_READ (EDP_PSR_STATUS_CTL ) &EDP_PSR_STATUS_STATE_MASK ) ==0 ,50 )) {DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" );
drivers/gpu/drm/i915/intel_runtime_pm.c +6 -6
@@ -2039,17 +2039,17 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)* The enabling order will be from lower to higher indexed wells, * the disabling order is reversed. */ -if (IS_HASWELL (dev_priv->dev)) { +if (IS_HASWELL (dev_priv)) {set_power_wells (power_domains, hsw_power_wells); - }else if (IS_BROADWELL (dev_priv->dev)) { + }else if (IS_BROADWELL (dev_priv)) {set_power_wells (power_domains, bdw_power_wells); - }else if (IS_SKYLAKE (dev_priv->dev) ||IS_KABYLAKE (dev_priv->dev)) { + }else if (IS_SKYLAKE (dev_priv->dev) ||IS_KABYLAKE (dev_priv)) {set_power_wells (power_domains, skl_power_wells); - }else if (IS_BROXTON (dev_priv->dev)) { + }else if (IS_BROXTON (dev_priv)) {set_power_wells (power_domains, bxt_power_wells); - }else if (IS_CHERRYVIEW (dev_priv->dev)) { + }else if (IS_CHERRYVIEW (dev_priv)) {set_power_wells (power_domains, chv_power_wells); - }else if (IS_VALLEYVIEW (dev_priv->dev)) { + }else if (IS_VALLEYVIEW (dev_priv)) {set_power_wells (power_domains, vlv_power_wells); }else {set_power_wells (power_domains, i9xx_always_on_power_well);
drivers/gpu/drm/i915/intel_uncore.c +2 -2
@@ -204,7 +204,7 @@ static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)/* On VLV, FIFO will be shared by both SW and HW. * So, we need to read the FREE_ENTRIES everytime */ -if (IS_VALLEYVIEW (dev_priv->dev)) +if (IS_VALLEYVIEW (dev_priv)) dev_priv->uncore.fifo_count =fifo_free_entries (dev_priv);if (dev_priv->uncore.fifo_count <GT_FIFO_NUM_RESERVED_ENTRIES ) {
@@ -1161,7 +1161,7 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -if (INTEL_INFO (dev_priv->dev)->gen <=5 ) +if (INTEL_INFO (dev_priv)->gen <=5 )return ;if (IS_GEN9 (dev)) {
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Joonas Lahtinen
Looks much better without
container_ofeverywhere.v2:
- Ini915_gem_restore_gtt_mappingstoo (Chris)v3:
- Do not cause WARN by calling on non PPGTT object (Chris)Cc Daniel Vetter <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Joonas Lahtinen <[email protected]>
Minor disgruntle at seeing an extra line I have to change (vm->is_ggtt!),
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx