drm/i915: add INTEL_GEN() helper shorthand for INTEL_INFO()->gen
Subsystems (2)
PATCH 1/1 drm/i915: add INTEL_GEN() helper shorthand for INTEL_INFO()->gen
Sudden realization:
$ grep -ho "INTEL_INFO([^)]*)->[a-zA-Z0-9_]*" *.[ch] | sed 's/.*->//' |\
sort | uniq -c | sort -rn | head -5
446 gen
24 num_pipes
10 ring_mask
9 color
4 subslice_per_slice--- drivers/gpu/drm/i915/i915_drv.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2489,6 +2489,7 @@ struct drm_i915_cmd_table { __p; \ })#define INTEL_INFO (p) (&__I915__(p)->info) +#define INTEL_GEN (p) (INTEL_INFO(p)->gen)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id)#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision)
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Jani Nikula
Sudden realization:
$ grep -ho "INTEL_INFO([^)]*)->[a-zA-Z0-9_]*" *.[ch] | sed 's/.*->//' |\ sort | uniq -c | sort -rn | head -5 446 gen 24 num_pipes 10 ring_mask 9 color 4 subslice_per_slice
Yes, we did get a bit carried away over the years. In the beginning, it was IS_G4X this, IS_IGDNG that and only rarely IS_GEN()!
-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
Quoted 11 lines · Chris Wilson
Quoted 9 lines · Jani Nikula
Sudden realization:
$ grep -ho "INTEL_INFO([^)]*)->[a-zA-Z0-9_]*" *.[ch] | sed 's/.*->//' |\ sort | uniq -c | sort -rn | head -5 446 gen 24 num_pipes 10 ring_mask 9 color 4 subslice_per_slice
Quoted 4 lines
Yes, we did get a bit carried away over the years. In the beginning, it was
IS_G4Xthis,IS_IGDNGthat and only rarelyIS_GEN()!Acked-by Chris Wilson <[email protected]>
Thanks, pushed to drm-intel-next-queued, everybody go wild and start using it.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 1/1 Convert INTEL_INFO(...)->gen to INTEL_GEN(...)
Since Jani has given us this macro, I thought I'd make use of it by converting all existing instances of this construct with a really simple little Coccinelle script:
@intel_gen@
expression E;
@@
<...
- INTEL_INFO(E)->gen
+ INTEL_GEN(E)
...>This should have found and converted every instance in all the C files; as it turned out, it missed the three instances inside intel_get_gpu_reset() - I suspect coccinelle was confused by this declaration:
static int (*intel_get_gpu_reset(struct drm_device *dev))(struct drm_device *, unsigned engine_mask)
{
...
}
Temporarily changing that to use a typedef allowed cocci to find the extra three instances; then I just had to convert i915_drv.h by hand.
--- drivers/gpu/drm/i915/i915_debugfs.c | 68 +++++----- drivers/gpu/drm/i915/i915_dma.c | 20 +-- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 42 +++--- drivers/gpu/drm/i915/i915_gem.c | 18 +-- drivers/gpu/drm/i915/i915_gem_context.c | 14 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 18 +-- drivers/gpu/drm/i915/i915_gem_fence.c | 8 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 36 ++--- drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 10 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 10 +- drivers/gpu/drm/i915/i915_gpu_error.c | 38 +++--- drivers/gpu/drm/i915/i915_irq.c | 72 +++++----- drivers/gpu/drm/i915/i915_suspend.c | 20 +-- drivers/gpu/drm/i915/i915_sysfs.c | 2 +- drivers/gpu/drm/i915/intel_audio.c | 2 +- drivers/gpu/drm/i915/intel_bios.c | 2 +- drivers/gpu/drm/i915/intel_color.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 6 +- drivers/gpu/drm/i915/intel_ddi.c | 10 +- drivers/gpu/drm/i915/intel_display.c | 188 +++++++++++++-------------- drivers/gpu/drm/i915/intel_dp.c | 30 ++--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/intel_fbc.c | 30 ++--- drivers/gpu/drm/i915/intel_guc_loader.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 22 ++-- drivers/gpu/drm/i915/intel_lvds.c | 12 +- drivers/gpu/drm/i915/intel_mocs.c | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 4 +- drivers/gpu/drm/i915/intel_panel.c | 10 +- drivers/gpu/drm/i915/intel_pm.c | 68 +++++----- drivers/gpu/drm/i915/intel_psr.c | 10 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 50 +++---- drivers/gpu/drm/i915/intel_sdvo.c | 10 +- drivers/gpu/drm/i915/intel_sprite.c | 12 +- drivers/gpu/drm/i915/intel_tv.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 14 +- 39 files changed, 439 insertions(+), 439 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +34 -34
@@ -612,7 +612,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)seq_puts (m,"Stall check waiting for page flip ioctl, " );seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev) >=4 ) addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane)));else addr =I915_READ (DSPADDR (crtc->plane));
@@ -809,7 +809,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (INTEL_INFO (dev)->gen >=8 ) { + }else if (INTEL_GEN (dev) >=8 ) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -935,7 +935,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GTIMR)); }for_each_engine (engine, dev_priv) { -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev) >=6 ) {seq_printf (m,"Graphics Interrupt mask (%s): %08x\n" , engine->name,I915_READ_IMR (engine));
@@ -1172,7 +1172,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)"efficient (RPe) frequency: %d MHz\n" , intel_gpu_freq(dev_priv, dev_priv->rps.efficient_freq));mutex_unlock (&dev_priv->rps.hw_lock); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev) >=6 ) {u32 rp_state_limits;u32 gt_perf_status;u32 rp_state_cap;
@@ -1623,7 +1623,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev))return vlv_drpc_info (m); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev) >=6 )return gen6_drpc_info (m);else return ironlake_drpc_info (m);
@@ -1664,7 +1664,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)seq_printf (m,"FBC disabled: %s\n" , dev_priv->fbc.no_fbc_reason); -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 )seq_printf (m,"Compressing: %s\n" ,yesno (I915_READ (FBC_STATUS2 ) &FBC_COMPRESSION_MASK ));
@@ -1680,7 +1680,7 @@ static int i915_fbc_fc_get(void *data, u64 *val)struct drm_device *dev = data;struct drm_i915_private *dev_priv = dev->dev_private; -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev) <7 || !HAS_FBC (dev))return -ENODEV ; *val = dev_priv->fbc.false_color;
@@ -1694,7 +1694,7 @@ static int i915_fbc_fc_set(void *data, u64 val)struct drm_i915_private *dev_priv = dev->dev_private;u32 reg; -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev) <7 || !HAS_FBC (dev))return -ENODEV ;mutex_lock (&dev_priv->fbc.lock);
@@ -1730,7 +1730,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)seq_printf (m,"Enabled by kernel parameter: %s\n" ,yesno (i915.enable_ips)); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev) >=8 ) {seq_puts (m,"Currently: unknown\n" ); }else {if (I915_READ (IPS_CTL ) &IPS_ENABLE )
@@ -2201,7 +2201,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ16(C0DRB3));seq_printf (m,"C1DRB3 = 0x%04x\n" ,I915_READ16 (C1DRB3 )); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev) >=6 ) {seq_printf (m,"MAD_DIMM_C0 = 0x%08x\n" ,I915_READ (MAD_DIMM_C0 )); seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n",
@@ -2210,7 +2210,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ(MAD_DIMM_C2));seq_printf (m,"TILECTL = 0x%08x\n" ,I915_READ (TILECTL )); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev) >=8 )seq_printf (m,"GAMTARBMODE = 0x%08x\n" ,I915_READ (GAMTARBMODE ));else
@@ -2276,12 +2276,12 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_engine_cs *engine; -if (INTEL_INFO (dev)->gen ==6 ) +if (INTEL_GEN (dev) ==6 )seq_printf (m,"GFX_MODE: 0x%08x\n" ,I915_READ (GFX_MODE ));for_each_engine (engine, dev_priv) {seq_printf (m,"%s\n" , engine->name); -if (INTEL_INFO (dev)->gen ==7 ) +if (INTEL_GEN (dev) ==7 )seq_printf (m,"GFX_MODE: 0x%08x\n" ,I915_READ (RING_MODE_GEN7 (engine))); seq_printf(m, "PP_DIR_BASE: 0x%08x\n",
@@ -2315,9 +2315,9 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev) >=8 )gen8_ppgtt_info (m, dev); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev) >=6 )gen6_ppgtt_info (m, dev);list_for_each_entry_reverse (file, &dev->filelist, lhead) {
@@ -2669,7 +2669,7 @@ static int i915_energy_uJ(struct seq_file *m, void *data)u64 power;u32 units; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return -ENODEV ;intel_runtime_pm_get (dev_priv);
@@ -3282,7 +3282,7 @@ static int i915_ddb_info(struct seq_file *m, void *unused)enum pipe pipe;int plane; -if (INTEL_INFO (dev)->gen <9 ) +if (INTEL_GEN (dev) <9 )return 0 ;drm_modeset_lock_all (dev);
@@ -4034,7 +4034,7 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,if (IS_GEN2 (dev)) ret =i8xx_pipe_crc_ctl_reg (&source, &val); -else if (INTEL_INFO (dev)->gen <5 ) +else if (INTEL_GEN (dev) <5 ) ret =i9xx_pipe_crc_ctl_reg (dev, pipe, &source, &val);else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) ret =vlv_pipe_crc_ctl_reg (dev, pipe, &source, &val);
@@ -4502,7 +4502,7 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])* - WM1+ latency values in 0.5us units * - latencies are in us on gen9/vlv/chv */ -if (INTEL_INFO (dev)->gen >=9 ||IS_VALLEYVIEW (dev) || +if (INTEL_GEN (dev) >=9 ||IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) latency *=10 ;else if (level >0 )
@@ -4521,7 +4521,7 @@ static int pri_wm_latency_show(struct seq_file *m, void *data)struct drm_i915_private *dev_priv = dev->dev_private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev) >=9 ) latencies = dev_priv->wm.skl_latency;else latencies =to_i915 (dev)->wm.pri_latency;
@@ -4537,7 +4537,7 @@ static int spr_wm_latency_show(struct seq_file *m, void *data)struct drm_i915_private *dev_priv = dev->dev_private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev) >=9 ) latencies = dev_priv->wm.skl_latency;else latencies =to_i915 (dev)->wm.spr_latency;
@@ -4553,7 +4553,7 @@ static int cur_wm_latency_show(struct seq_file *m, void *data)struct drm_i915_private *dev_priv = dev->dev_private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev) >=9 ) latencies = dev_priv->wm.skl_latency;else latencies =to_i915 (dev)->wm.cur_latency;
@@ -4567,7 +4567,7 @@ static int pri_wm_latency_open(struct inode *inode, struct file *file) {struct drm_device *dev = inode->i_private; -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev) <5 )return -ENODEV ;return single_open (file, pri_wm_latency_show, dev);
@@ -4644,7 +4644,7 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf,struct drm_i915_private *dev_priv = dev->dev_private;uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev) >=9 ) latencies = dev_priv->wm.skl_latency;else latencies =to_i915 (dev)->wm.pri_latency;
@@ -4660,7 +4660,7 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf,struct drm_i915_private *dev_priv = dev->dev_private;uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev) >=9 ) latencies = dev_priv->wm.skl_latency;else latencies =to_i915 (dev)->wm.spr_latency;
@@ -4676,7 +4676,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,struct drm_i915_private *dev_priv = dev->dev_private;uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev) >=9 ) latencies = dev_priv->wm.skl_latency;else latencies =to_i915 (dev)->wm.cur_latency;
@@ -4916,7 +4916,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,struct drm_i915_private *dev_priv = dev->dev_private;int ret; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return -ENODEV ;flush_delayed_work (&dev_priv->rps.delayed_resume_work);
@@ -4939,7 +4939,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,u32 hw_max, hw_min;int ret; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return -ENODEV ;flush_delayed_work (&dev_priv->rps.delayed_resume_work);
@@ -4983,7 +4983,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,struct drm_i915_private *dev_priv = dev->dev_private;int ret; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return -ENODEV ;flush_delayed_work (&dev_priv->rps.delayed_resume_work);
@@ -5006,7 +5006,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,u32 hw_max, hw_min;int ret; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return -ENODEV ;flush_delayed_work (&dev_priv->rps.delayed_resume_work);
@@ -5235,7 +5235,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused)struct drm_device *dev = node->minor->dev;struct sseu_dev_status stat; -if (INTEL_INFO (dev)->gen <8 ) +if (INTEL_GEN (dev) <8 )return -ENODEV ;seq_puts (m,"SSEU Device Info\n" );
@@ -5262,7 +5262,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused)cherryview_sseu_device_status (dev, &stat); }else if (IS_BROADWELL (dev)) {broadwell_sseu_device_status (dev, &stat); - }else if (INTEL_INFO (dev)->gen >=9 ) { + }else if (INTEL_GEN (dev) >=9 ) {gen9_sseu_device_status (dev, &stat); } seq_printf(m, " Enabled Slice Total: %u\n",
@@ -5284,7 +5284,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)struct drm_device *dev = inode->i_private;struct drm_i915_private *dev_priv = dev->dev_private; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return 0 ;intel_runtime_pm_get (dev_priv);
@@ -5298,7 +5298,7 @@ static int i915_forcewake_release(struct inode *inode, struct file *file)struct drm_device *dev = inode->i_private;struct drm_i915_private *dev_priv = dev->dev_private; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return 0 ;intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );
drivers/gpu/drm/i915/i915_dma.c +10 -10
@@ -165,7 +165,7 @@ static int i915_getparam(struct drm_device *dev, void *data, value =1 ;break ;case I915_PARAM_HAS_EXEC_CONSTANTS : - value =INTEL_INFO (dev)->gen >=4 ; + value =INTEL_GEN (dev) >=4 ;break ;case I915_PARAM_HAS_RELAXED_DELTA : value =1 ;
@@ -269,12 +269,12 @@ static int i915_get_bridge_dev(struct drm_device *dev) intel_alloc_mchbar_resource(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -int reg =INTEL_INFO (dev)->gen >=4 ?MCHBAR_I965 :MCHBAR_I915 ; +int reg =INTEL_GEN (dev) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp_lo, temp_hi =0 ;u64 mchbar_addr;int ret; -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev) >=4 )pci_read_config_dword (dev_priv->bridge_dev, reg +4 , &temp_hi);pci_read_config_dword (dev_priv->bridge_dev, reg, &temp_lo); mchbar_addr = ((u64 )temp_hi <<32 ) | temp_lo;
@@ -301,7 +301,7 @@ static int i915_get_bridge_dev(struct drm_device *dev)return ret; } -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev) >=4 )pci_write_config_dword (dev_priv->bridge_dev, reg +4 ,upper_32_bits (dev_priv->mch_res.start));
@@ -315,7 +315,7 @@ static int i915_get_bridge_dev(struct drm_device *dev) intel_setup_mchbar(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -int mchbar_reg =INTEL_INFO (dev)->gen >=4 ?MCHBAR_I965 :MCHBAR_I915 ; +int mchbar_reg =INTEL_GEN (dev) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp;bool enabled;
@@ -355,7 +355,7 @@ static int i915_get_bridge_dev(struct drm_device *dev) intel_teardown_mchbar(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -int mchbar_reg =INTEL_INFO (dev)->gen >=4 ?MCHBAR_I965 :MCHBAR_I915 ; +int mchbar_reg =INTEL_GEN (dev) >=4 ?MCHBAR_I965 :MCHBAR_I915 ;u32 temp;if (dev_priv->mchbar_need_disable) {
@@ -853,7 +853,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev)DRM_INFO ("Display disabled (module parameter)\n" ); info->num_pipes =0 ; }else if (info->num_pipes >0 && - (INTEL_INFO (dev)->gen ==7 ||INTEL_INFO (dev)->gen ==8 ) && + (INTEL_GEN (dev) ==7 ||INTEL_GEN (dev) ==8 ) &&HAS_PCH_SPLIT (dev)) {u32 fuse_strap =I915_READ (FUSE_STRAP );u32 sfuse_strap =I915_READ (SFUSE_STRAP );
@@ -877,7 +877,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev)DRM_INFO ("PipeC fused off\n" ); info->num_pipes -=1 ; } - }else if (info->num_pipes >0 &&INTEL_INFO (dev)->gen ==9 ) { + }else if (info->num_pipes >0 &&INTEL_GEN (dev) ==9 ) {u32 dfsm =I915_READ (SKL_DFSM );u8 disabled_mask =0 ;bool invalid;
@@ -915,7 +915,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev)cherryview_sseu_info_init (dev); else if (IS_BROADWELL(dev)) broadwell_sseu_info_init(dev); - else if (INTEL_INFO(dev)->gen >= 9) + else if (INTEL_GEN(dev) >= 9) gen9_sseu_info_init(dev);/* Snooping is broken on BXT A stepping. */
@@ -1091,7 +1091,7 @@ static int i915_mmio_setup(struct drm_device *dev)* the register BAR remains the same size for all the earlier * generations up to Ironlake. */ -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev) <5 ) mmio_size =512 *1024 ;else mmio_size =2 *1024 *1024 ;
drivers/gpu/drm/i915/i915_drv.c +4 -4
@@ -532,7 +532,7 @@ void intel_detect_pch(struct drm_device *dev)bool i915_semaphore_is_enabled (struct drm_device *dev) { -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return false;if (i915.semaphores >=0 )
@@ -548,7 +548,7 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)#ifdef CONFIG_INTEL_IOMMU /* Enable semaphores on SNB when IO remapping is off */ -if (INTEL_INFO (dev)->gen ==6 && intel_iommu_gfx_mapped) +if (INTEL_GEN (dev) ==6 && intel_iommu_gfx_mapped)return false;#endif
@@ -691,7 +691,7 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation)* Fujitsu FSC S7110 * Acer Aspire 1830T */ -if (!(hibernation &&INTEL_INFO (dev_priv)->gen <6 )) +if (!(hibernation &&INTEL_GEN (dev_priv) <6 ))pci_set_power_state (drm_dev->pdev, PCI_D3hot); dev_priv->suspended_to_idle =suspend_to_idle (dev_priv);
@@ -949,7 +949,7 @@ int i915_reset(struct drm_device *dev)* previous concerns that it doesn't respond well to some forms * of re-init after reset. */ -if (INTEL_INFO (dev)->gen >5 ) +if (INTEL_GEN (dev) >5 )intel_enable_gt_powersave (dev);return 0 ;
drivers/gpu/drm/i915/i915_drv.h +21 -21
103 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem.c +9 -9
@@ -1279,7 +1279,7 @@ int __i915_wait_request(struct drm_i915_gem_request *req, before =ktime_get_raw_ns (); } -if (INTEL_INFO (dev_priv)->gen >=6 ) +if (INTEL_GEN (dev_priv) >=6 )gen6_rps_boost (dev_priv, rps, req->emitted_jiffies);trace_i915_gem_request_wait_begin (req);
@@ -1986,12 +1986,12 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) {uint32_t gtt_size; -if (INTEL_INFO (dev)->gen >=4 || +if (INTEL_GEN (dev) >=4 || tiling_mode ==I915_TILING_NONE )return size;/* Previous chips need a power-of-two fence region when tiling */ -if (INTEL_INFO (dev)->gen ==3 ) +if (INTEL_GEN (dev) ==3 ) gtt_size =1024 *1024 ;else gtt_size =512 *1024 ;
@@ -2017,7 +2017,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)* Minimum alignment is 4k (GTT page size), but might be greater * if a fence register is needed for the object. */ -if (INTEL_INFO (dev)->gen >=4 || (!fenced &&IS_G33 (dev)) || +if (INTEL_GEN (dev) >=4 || (!fenced &&IS_G33 (dev)) || tiling_mode ==I915_TILING_NONE )return 4096 ;
@@ -4730,7 +4730,7 @@ void i915_gem_init_swizzling(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -if (INTEL_INFO (dev)->gen <5 || +if (INTEL_GEN (dev) <5 || dev_priv->mm.bit_6_swizzle_x ==I915_BIT_6_SWIZZLE_NONE )return ;
@@ -4832,7 +4832,7 @@ int i915_gem_init_engines(struct drm_device *dev)struct intel_engine_cs *engine;int ret, j; -if (INTEL_INFO (dev)->gen <6 && !intel_enable_gtt ()) +if (INTEL_GEN (dev) <6 && !intel_enable_gtt ())return -EIO ;/* Double layer security blanket, see i915_gem_init() */
@@ -4850,7 +4850,7 @@ int i915_gem_init_engines(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) >=7 ) {u32 temp =I915_READ (HSW_NDE_RSTWRN_OPT ); temp &= ~RESET_PCH_HANDSHAKE_ENABLE ;I915_WRITE (HSW_NDE_RSTWRN_OPT , temp);
@@ -5034,10 +5034,10 @@ int i915_gem_init(struct drm_device *dev) {struct drm_device *dev = dev_priv->dev; -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)) dev_priv->num_fence_regs =32 ; -else if (INTEL_INFO (dev_priv)->gen >=4 ||IS_I945G (dev_priv) || +else if (INTEL_GEN (dev_priv) >=4 ||IS_I945G (dev_priv) ||IS_I945GM (dev_priv) ||IS_G33 (dev_priv)) dev_priv->num_fence_regs =16 ;else
drivers/gpu/drm/i915/i915_gem_context.c +7 -7
@@ -111,7 +111,7 @@ static int get_context_size(struct drm_device *dev)int ret;u32 reg; -switch (INTEL_INFO (dev)->gen) { +switch (INTEL_GEN (dev)) {case 6 : reg =I915_READ (CXT_SIZE ); ret =GEN6_CXT_TOTAL_SIZE (reg) *64 ;
@@ -531,14 +531,14 @@ struct intel_context * }/* These flags are for resource streamer on HSW+ */ -if (IS_HASWELL (engine->dev) ||INTEL_INFO (engine->dev)->gen >=8 ) +if (IS_HASWELL (engine->dev) ||INTEL_GEN (engine->dev) >=8 ) flags |= (HSW_MI_RS_SAVE_STATE_EN |HSW_MI_RS_RESTORE_STATE_EN ); -else if (INTEL_INFO (engine->dev)->gen <8 ) +else if (INTEL_GEN (engine->dev) <8 ) flags |= (MI_SAVE_EXT_STATE_EN |MI_RESTORE_EXT_STATE_EN ); len =4 ; -if (INTEL_INFO (engine->dev)->gen >=7 ) +if (INTEL_GEN (engine->dev) >=7 ) len +=2 + (num_rings ?4 *num_rings +2 :0 ); ret =intel_ring_begin (req, len);
@@ -546,7 +546,7 @@ struct intel_context *return ret;/* WaProgramMiArbOnOffAroundMiSetContext:ivb,vlv,hsw,bdw,chv */ -if (INTEL_INFO (engine->dev)->gen >=7 ) { +if (INTEL_GEN (engine->dev) >=7 ) {intel_ring_emit (engine,MI_ARB_ON_OFF |MI_ARB_DISABLE );if (num_rings) {struct intel_engine_cs *signaller;
@@ -576,7 +576,7 @@ struct intel_context **/ intel_ring_emit (engine,MI_NOOP ); -if (INTEL_INFO (engine->dev)->gen >=7 ) { +if (INTEL_GEN (engine->dev) >=7 ) {if (num_rings) {struct intel_engine_cs *signaller;
@@ -622,7 +622,7 @@ static inline bool should_skip_switch(struct intel_engine_cs *engine,if (!to->ppgtt)return false; -if (INTEL_INFO (engine->dev)->gen <8 ) +if (INTEL_GEN (engine->dev) <8 )return true;if (engine != &dev_priv->engine[RCS ])
drivers/gpu/drm/i915/i915_gem_execbuffer.c +9 -9
@@ -290,7 +290,7 @@ static inline uint64_t gen8_noncanonical_addr(uint64_t address) reloc->offset >> PAGE_SHIFT)); *(uint32_t *)(vaddr + page_offset) =lower_32_bits (delta); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev) >=8 ) { page_offset =offset_in_page (page_offset +sizeof (uint32_t ));if (page_offset ==0 ) {
@@ -335,7 +335,7 @@ static inline uint64_t gen8_noncanonical_addr(uint64_t address) offset & PAGE_MASK);iowrite32 (lower_32_bits (delta), reloc_page +offset_in_page (offset)); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev) >=8 ) { offset +=sizeof (uint32_t );if (offset_in_page (offset) ==0 ) {
@@ -382,7 +382,7 @@ static inline uint64_t gen8_noncanonical_addr(uint64_t address) reloc->offset >> PAGE_SHIFT));clflush_write32 (vaddr + page_offset,lower_32_bits (delta)); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev) >=8 ) { page_offset =offset_in_page (page_offset +sizeof (uint32_t ));if (page_offset ==0 ) {
@@ -465,7 +465,7 @@ static inline uint64_t gen8_noncanonical_addr(uint64_t address)/* Check that the relocation address is valid... */ if (unlikely (reloc->offset > - obj->base.size - (INTEL_INFO (dev)->gen >=8 ?8 :4 ))) { + obj->base.size - (INTEL_GEN (dev) >=8 ?8 :4 ))) { DRM_DEBUG("Relocation beyond object bounds: " "obj %p target %d offset %d size %d.\n", obj, reloc->target_handle,
@@ -724,7 +724,7 @@ static bool only_mappable_for_reloc(unsigned int flags)struct i915_address_space *vm;struct list_head ordered_vmas;struct list_head pinned_vmas; -bool has_fenced_gpu_access =INTEL_INFO (engine->dev)->gen <4 ; +bool has_fenced_gpu_access =INTEL_GEN (engine->dev) <4 ;int retry;i915_gem_retire_requests_ring (engine);
@@ -1264,19 +1264,19 @@ static bool only_mappable_for_reloc(unsigned int flags) }if (instp_mode != dev_priv->relative_constants_mode) { -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev) <4 ) {DRM_DEBUG ("no rel constants on pre-gen4\n" );return -EINVAL ; } -if (INTEL_INFO (dev)->gen >5 && +if (INTEL_GEN (dev) >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)->gen >=6 ) +if (INTEL_GEN (dev) >=6 ) instp_mask &= ~I915_EXEC_CONSTANTS_REL_SURFACE ; }break ;
@@ -1720,7 +1720,7 @@ static bool only_mappable_for_reloc(unsigned int flags) exec2_list[i].relocs_ptr = exec_list[i].relocs_ptr; exec2_list[i].alignment = exec_list[i].alignment; exec2_list[i].offset = exec_list[i].offset; -if (INTEL_INFO (dev)->gen <4 ) +if (INTEL_GEN (dev) <4 ) exec2_list[i].flags =EXEC_OBJECT_NEEDS_FENCE ;else exec2_list[i].flags =0 ;
drivers/gpu/drm/i915/i915_gem_fence.c +4 -4
@@ -62,7 +62,7 @@ static void i965_write_fence_reg(struct drm_device *dev, int reg,i915_reg_t fence_reg_lo, fence_reg_hi;int fence_pitch_shift; -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev) >=6 ) { fence_reg_lo =FENCE_REG_GEN6_LO (reg); fence_reg_hi =FENCE_REG_GEN6_HI (reg); fence_pitch_shift =GEN6_FENCE_PITCH_SHIFT ;
@@ -209,7 +209,7 @@ static void i915_gem_write_fence(struct drm_device *dev, int reg,i830_write_fence_reg (dev, reg, obj); else if (IS_GEN3(dev)) i915_write_fence_reg(dev, reg, obj); - else if (INTEL_INFO(dev)->gen >= 4) + else if (INTEL_GEN(dev) >= 4) i965_write_fence_reg(dev, reg, obj);/* And similarly be paranoid that no direct access to this region
@@ -553,7 +553,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) >=8 ||IS_VALLEYVIEW (dev)) {/* * On BDW+, swizzling is not used. We leave the CPU memory * controller in charge of optimizing memory accesses without
@@ -563,7 +563,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) >=6 ) {if (dev_priv->preserve_bios_swizzle) {if (I915_READ (DISP_ARB_CTL ) &DISP_TILE_SURFACE_SWIZZLING ) {
drivers/gpu/drm/i915/i915_gem_gtt.c +18 -18
@@ -109,9 +109,9 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)bool has_full_ppgtt;bool has_full_48bit_ppgtt; - has_aliasing_ppgtt =INTEL_INFO (dev)->gen >=6 ; - has_full_ppgtt =INTEL_INFO (dev)->gen >=7 ; - has_full_48bit_ppgtt =IS_BROADWELL (dev) ||INTEL_INFO (dev)->gen >=9 ; + has_aliasing_ppgtt =INTEL_GEN (dev) >=6 ; + has_full_ppgtt =INTEL_GEN (dev) >=7 ; + has_full_48bit_ppgtt =IS_BROADWELL (dev) ||INTEL_GEN (dev) >=9 ;if (intel_vgpu_active (dev)) has_full_ppgtt = false;/* emulation is too hard */
@@ -120,7 +120,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)* We don't allow disabling PPGTT for gen9+ as it's a requirement for * execlists, the sole mechanism available to submit work. */ -if (INTEL_INFO (dev)->gen <9 && +if (INTEL_GEN (dev) <9 && (enable_ppgtt ==0 || !has_aliasing_ppgtt))return 0 ;
@@ -135,7 +135,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)#ifdef CONFIG_INTEL_IOMMU /* Disable ppgtt on SNB if VT-d is on. */ -if (INTEL_INFO (dev)->gen ==6 && intel_iommu_gfx_mapped) { +if (INTEL_GEN (dev) ==6 && intel_iommu_gfx_mapped) {DRM_INFO ("Disabling PPGTT because VT-d is on\n" );return 0 ; }
@@ -147,7 +147,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)return 0 ; } -if (INTEL_INFO (dev)->gen >=8 && i915.enable_execlists) +if (INTEL_GEN (dev) >=8 && i915.enable_execlists)return has_full_48bit_ppgtt ?3 :2 ;else return has_aliasing_ppgtt ?1 :0 ;
@@ -426,7 +426,7 @@ static void free_scratch_page(struct drm_device *dev,static struct i915_page_table *alloc_pt (struct drm_device *dev) {struct i915_page_table *pt; -const size_t count =INTEL_INFO (dev)->gen >=8 ? +const size_t count =INTEL_GEN (dev) >=8 ?GEN8_PTES :GEN6_PTES ;int ret = -ENOMEM ;
@@ -2106,7 +2106,7 @@ static int __hw_ppgtt_init(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt) { ppgtt->base.dev = dev; -if (INTEL_INFO (dev)->gen <8 ) +if (INTEL_GEN (dev) <8 )return gen6_ppgtt_init (ppgtt);else return gen8_ppgtt_init (ppgtt);
@@ -2172,10 +2172,10 @@ int i915_ppgtt_init_hw(struct drm_device *dev)gen6_ppgtt_enable (dev); else if (IS_GEN7(dev)) gen7_ppgtt_enable(dev); - else if (INTEL_INFO(dev)->gen >= 8) + else if (INTEL_GEN(dev) >= 8) gen8_ppgtt_enable(dev); else - MISSING_CASE(INTEL_INFO(dev)->gen); +MISSING_CASE (INTEL_GEN (dev ));return 0 ; }
@@ -2281,7 +2281,7 @@ void i915_check_and_clear_faults(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_engine_cs *engine; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev) <6 )return ;for_each_engine (engine, dev_priv) {
@@ -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)->gen <6 ) { +if (INTEL_GEN (dev_priv) <6 ) {intel_gtt_chipset_flush (); }else {I915_WRITE (GFX_FLSH_CNTL_GEN6 ,GFX_FLSH_CNTL_EN );
@@ -2322,7 +2322,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) <6 )return ;i915_check_and_clear_faults (dev);
@@ -3050,7 +3050,7 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)pci_read_config_word (dev->pdev,SNB_GMCH_CTRL , &snb_gmch_ctl); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev) >=9 ) { ggtt->stolen_size =gen9_get_stolen_size (snb_gmch_ctl); ggtt->size =gen8_get_total_gtt_size (snb_gmch_ctl); }else if (IS_CHERRYVIEW (dev)) {
@@ -3166,10 +3166,10 @@ int i915_ggtt_init_hw(struct drm_device *dev)struct i915_ggtt *ggtt = &dev_priv->ggtt;int ret; -if (INTEL_INFO (dev)->gen <=5 ) { +if (INTEL_GEN (dev) <=5 ) { ggtt->probe = i915_gmch_probe; ggtt->base.cleanup = i915_gmch_remove; - }else if (INTEL_INFO (dev)->gen <8 ) { + }else if (INTEL_GEN (dev) <8 ) { ggtt->probe = gen6_gmch_probe; ggtt->base.cleanup = gen6_gmch_remove;if (IS_HASWELL (dev) && dev_priv->ellc_size)
@@ -3178,7 +3178,7 @@ int i915_ggtt_init_hw(struct drm_device *dev) ggtt->base.pte_encode = hsw_pte_encode; else if (IS_VALLEYVIEW(dev)) ggtt->base.pte_encode = byt_pte_encode; - else if (INTEL_INFO(dev)->gen >= 7) + else if (INTEL_GEN(dev) >= 7) ggtt->base.pte_encode = ivb_pte_encode; else ggtt->base.pte_encode = snb_pte_encode;
@@ -3267,7 +3267,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)i915_gem_clflush_object (obj, obj->pin_display); } -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev) >=8 ) {if (IS_CHERRYVIEW (dev) ||IS_BROXTON (dev))chv_setup_private_ppat (dev_priv);else
drivers/gpu/drm/i915/i915_gem_render_state.c +1 -1
@@ -49,7 +49,7 @@ static int render_state_init(struct render_state *so, struct drm_device *dev) {int ret; - so->gen =INTEL_INFO (dev)->gen; + so->gen =INTEL_GEN (dev); so->rodata =render_state_get_rodata (dev, so->gen);if (so->rodata ==NULL )return 0 ;
drivers/gpu/drm/i915/i915_gem_stolen.c +5 -5
@@ -56,7 +56,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,/* See the comment at the drm_mm_init() call for more about this check. * WaSkipStolenMemoryFirstPage:bdw,chv (incomplete) */ -if (INTEL_INFO (dev_priv)->gen ==8 && start <4096 ) +if (INTEL_GEN (dev_priv) ==8 && start <4096 ) start =4096 ;mutex_lock (&dev_priv->mm.stolen_lock);
@@ -106,7 +106,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)* */ base =0 ; -if (INTEL_INFO (dev)->gen >=3 ) { +if (INTEL_GEN (dev) >=3 ) {/* Read Graphics Base of Stolen Memory directly */ pci_read_config_dword (dev->pdev,0x5c , &base); base &= ~((1 <<20 ) -1 );
@@ -188,7 +188,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) <=4 && !IS_G33 (dev) && !IS_G4X (dev)) {struct {u32 start, end; } stolen[2 ] = {
@@ -401,7 +401,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) <8 ) {DRM_INFO ("DMAR active, disabling use of stolen memory\n" );return 0 ; }
@@ -416,7 +416,7 @@ int i915_gem_init_stolen(struct drm_device *dev) stolen_top = dev_priv->mm.stolen_base + ggtt->stolen_size; -switch (INTEL_INFO (dev_priv)->gen) { +switch (INTEL_GEN (dev_priv)) {case 2 :case 3 :break ;
drivers/gpu/drm/i915/i915_gem_tiling.c +5 -5
@@ -77,10 +77,10 @@/* check maximum stride & object size */ /* i965+ stores the end address of the gtt mapping in the fence * reg, so dont bother to check the size */ -if (INTEL_INFO (dev)->gen >=7 ) { +if (INTEL_GEN (dev) >=7 ) {if (stride /128 >GEN7_FENCE_MAX_PITCH_VAL )return false; - }else if (INTEL_INFO (dev)->gen >=4 ) { + }else if (INTEL_GEN (dev) >=4 ) {if (stride /128 >I965_FENCE_MAX_PITCH_VAL )return false; }else {
@@ -100,7 +100,7 @@return false;/* 965+ just needs multiples of tile width */ -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev) >=4 ) {if (stride & (tile_width -1 ))return false;return true;
@@ -122,10 +122,10 @@if (tiling_mode ==I915_TILING_NONE )return true; -if (INTEL_INFO (obj->base.dev)->gen >=4 ) +if (INTEL_GEN (obj->base.dev) >=4 )return true; -if (INTEL_INFO (obj->base.dev)->gen ==3 ) { +if (INTEL_GEN (obj->base.dev) ==3 ) {if (i915_gem_obj_ggtt_offset (obj) & ~I915_FENCE_START_MASK )return false; }else {
drivers/gpu/drm/i915/i915_gpu_error.c +19 -19
@@ -259,7 +259,7 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m,err_printf (m," IPEIR: 0x%08x\n" , ring->ipeir);err_printf (m," IPEHR: 0x%08x\n" , ring->ipehr);err_printf (m," INSTDONE: 0x%08x\n" , ring->instdone); -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev) >=4 ) {err_printf (m," BBADDR: 0x%08x %08x\n" , (u32)(ring->bbaddr>>32 ), (u32 )ring->bbaddr);err_printf (m," BB_STATE: 0x%08x\n" , ring->bbstate);err_printf (m," INSTPS: 0x%08x\n" , ring->instps);
@@ -267,7 +267,7 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m,err_printf (m," INSTPM: 0x%08x\n" , ring->instpm);err_printf (m," FADDR: 0x%08x %08x\n" ,upper_32_bits (ring->faddr),lower_32_bits (ring->faddr)); -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev) >=6 ) {err_printf (m," RC PSMI: 0x%08x\n" , ring->rc_psmi);err_printf (m," FAULT_REG: 0x%08x\n" , ring->fault_reg); err_printf(m, " SYNC_0: 0x%08x [last synced 0x%08x]\n",
@@ -285,7 +285,7 @@ static void i915_ring_error_state(struct drm_i915_error_state_buf *m,if (USES_PPGTT (dev)) {err_printf (m," GFX_MODE: 0x%08x\n" , ring->vm_info.gfx_mode); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev) >=8 ) {int i;for (i =0 ; i <4 ; i++) err_printf(m, " PDP%d: 0x%016llx\n",
@@ -381,7 +381,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) >=8 ) {for (i =0 ; i <4 ; i++)err_printf (m,"GTIER gt %d: 0x%08x\n" , i, error->gtier[i]);
@@ -400,17 +400,17 @@ 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) >=6 ) {err_printf (m,"ERROR: 0x%08x\n" , error->error); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev) >=8 )err_printf (m,"FAULT_TLB_DATA: 0x%08x 0x%08x\n" , error->fault_data1, error->fault_data0);err_printf (m,"DONE_REG: 0x%08x\n" , error->done_reg); } -if (INTEL_INFO (dev)->gen ==7 ) +if (INTEL_GEN (dev) ==7 )err_printf (m,"ERR_INT: 0x%08x\n" , error->err_int);for (i =0 ; i <ARRAY_SIZE (error->ring); i++)
@@ -835,7 +835,7 @@ static void i915_gem_record_fences(struct drm_device *dev, }else if (IS_GEN5 (dev) ||IS_GEN4 (dev)) {for (i =0 ; i < dev_priv->num_fence_regs; i++) error->fence[i] =I915_READ64 (FENCE_REG_965_LO (i)); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev) >=6 ) {for (i =0 ; i < dev_priv->num_fence_regs; i++) error->fence[i] =I915_READ64 (FENCE_REG_GEN6_LO (i)); }
@@ -899,24 +899,24 @@ static void i915_record_ring_state(struct drm_device *dev, {struct drm_i915_private *dev_priv = dev->dev_private; -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev) >=6 ) { ering->rc_psmi =I915_READ (RING_PSMI_CTL (engine->mmio_base)); ering->fault_reg =I915_READ (RING_FAULT_REG (engine)); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev) >=8 )gen8_record_semaphore_state (dev_priv, error, engine, ering);else gen6_record_semaphore_state (dev_priv, engine, ering); } -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev) >=4 ) { ering->faddr =I915_READ (RING_DMA_FADD (engine->mmio_base)); ering->ipeir =I915_READ (RING_IPEIR (engine->mmio_base)); ering->ipehr =I915_READ (RING_IPEHR (engine->mmio_base)); ering->instdone =I915_READ (RING_INSTDONE (engine->mmio_base)); ering->instps =I915_READ (RING_INSTPS (engine->mmio_base)); ering->bbaddr =I915_READ (RING_BBADDR (engine->mmio_base)); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev) >=8 ) { ering->faddr |= (u64 )I915_READ (RING_DMA_FADD_UDW (engine->mmio_base)) <<32 ; ering->bbaddr |= (u64 )I915_READ (RING_BBADDR_UDW (engine->mmio_base)) <<32 ; }
@@ -980,7 +980,7 @@ static void i915_record_ring_state(struct drm_device *dev,else if (IS_GEN7 (dev)) ering->vm_info.pp_dir_base =I915_READ (RING_PP_DIR_BASE (engine)); -else if (INTEL_INFO (dev)->gen >=8 ) +else if (INTEL_GEN (dev) >=8 )for (i =0 ; i <4 ; i++) { ering->vm_info.pdp[i] =I915_READ (GEN8_RING_PDP_UDW (engine, i));
@@ -1253,7 +1253,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) >=8 ) { error->fault_data0 =I915_READ (GEN8_FAULT_TLB_DATA0 ); error->fault_data1 =I915_READ (GEN8_FAULT_TLB_DATA1 ); }
@@ -1265,10 +1265,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) >=7 ) error->forcewake =I915_READ_FW (FORCEWAKE_MT ); -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev) >=6 ) { error->derrmr =I915_READ (DERRMR ); error->error =I915_READ (ERROR_GEN6 ); error->done_reg =I915_READ (DONE_REG );
@@ -1284,7 +1284,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) >=8 ) { error->ier =I915_READ (GEN8_DE_MISC_IER );for (i =0 ; i <4 ; i++) error->gtier[i] =I915_READ (GEN8_GT_IER (i));
@@ -1315,7 +1315,7 @@ static void i915_error_capture_msg(struct drm_device *dev, len =scnprintf (error->error_msg,sizeof (error->error_msg),"GPU HANG: ecode %d:%d:0x%08x" , -INTEL_INFO (dev)->gen, ring_id, ecode); +INTEL_GEN (dev), ring_id, ecode);if (ring_id !=-1 && error->ring[ring_id].pid !=-1 ) len += scnprintf(error->error_msg + len,
@@ -1458,7 +1458,7 @@ void i915_get_extra_instdone(struct drm_device *dev, uint32_t *instdone)else if (IS_GEN4 (dev) ||IS_GEN5 (dev) ||IS_GEN6 (dev)) { instdone[0 ] =I915_READ (RING_INSTDONE (RENDER_RING_BASE )); instdone[1 ] =I915_READ (GEN4_INSTDONE1 ); - }else if (INTEL_INFO (dev)->gen >=7 ) { + }else if (INTEL_GEN (dev) >=7 ) { instdone[0 ] =I915_READ (RING_INSTDONE (RENDER_RING_BASE )); instdone[1 ] =I915_READ (GEN7_SC_INSTDONE ); instdone[2 ] =I915_READ (GEN7_SAMPLER_INSTDONE );
drivers/gpu/drm/i915/i915_irq.c +36 -36
273 lines not on this page · raw message
drivers/gpu/drm/i915/i915_suspend.c +10 -10
@@ -34,13 +34,13 @@ static void i915_save_display(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;/* Display arbitration control */ -if (INTEL_INFO (dev)->gen <=4 ) +if (INTEL_GEN (dev) <=4 ) dev_priv->regfile.saveDSPARB =I915_READ (DSPARB );/* LVDS state */ if (HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev)) dev_priv->regfile.saveLVDS =I915_READ (PCH_LVDS ); -else if (INTEL_INFO (dev)->gen <=4 &&IS_MOBILE (dev) && !IS_I830 (dev)) +else if (INTEL_GEN (dev) <=4 &&IS_MOBILE (dev) && !IS_I830 (dev)) dev_priv->regfile.saveLVDS =I915_READ (LVDS );/* Panel power sequencer */
@@ -49,7 +49,7 @@ static void i915_save_display(struct drm_device *dev) dev_priv->regfile.savePP_ON_DELAYS =I915_READ (PCH_PP_ON_DELAYS ); dev_priv->regfile.savePP_OFF_DELAYS =I915_READ (PCH_PP_OFF_DELAYS ); dev_priv->regfile.savePP_DIVISOR =I915_READ (PCH_PP_DIVISOR ); - }else if (INTEL_INFO (dev)->gen <=4 ) { + }else if (INTEL_GEN (dev) <=4 ) { dev_priv->regfile.savePP_CONTROL =I915_READ (PP_CONTROL ); dev_priv->regfile.savePP_ON_DELAYS =I915_READ (PP_ON_DELAYS ); dev_priv->regfile.savePP_OFF_DELAYS =I915_READ (PP_OFF_DELAYS );
@@ -57,7 +57,7 @@ static void i915_save_display(struct drm_device *dev) }/* save FBC interval */ -if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev)) +if (HAS_FBC (dev) &&INTEL_GEN (dev) <=4 && !IS_G4X (dev)) dev_priv->regfile.saveFBC_CONTROL =I915_READ (FBC_CONTROL ); }
@@ -67,7 +67,7 @@ static void i915_restore_display(struct drm_device *dev)u32 mask =0xffffffff ;/* Display arbitration */ -if (INTEL_INFO (dev)->gen <=4 ) +if (INTEL_GEN (dev) <=4 )I915_WRITE (DSPARB , dev_priv->regfile.saveDSPARB); mask = ~LVDS_PORT_EN ;
@@ -75,7 +75,7 @@ static void i915_restore_display(struct drm_device *dev)/* LVDS state */ if (HAS_PCH_IBX (dev) ||HAS_PCH_CPT (dev))I915_WRITE (PCH_LVDS , dev_priv->regfile.saveLVDS & mask); -else if (INTEL_INFO (dev)->gen <=4 &&IS_MOBILE (dev) && !IS_I830 (dev)) +else if (INTEL_GEN (dev) <=4 &&IS_MOBILE (dev) && !IS_I830 (dev))I915_WRITE (LVDS , dev_priv->regfile.saveLVDS & mask);/* Panel power sequencer */
@@ -84,7 +84,7 @@ static void i915_restore_display(struct drm_device *dev)I915_WRITE (PCH_PP_OFF_DELAYS , dev_priv->regfile.savePP_OFF_DELAYS);I915_WRITE (PCH_PP_DIVISOR , dev_priv->regfile.savePP_DIVISOR);I915_WRITE (PCH_PP_CONTROL , dev_priv->regfile.savePP_CONTROL); - }else if (INTEL_INFO (dev)->gen <=4 ) { + }else if (INTEL_GEN (dev) <=4 ) {I915_WRITE (PP_ON_DELAYS , dev_priv->regfile.savePP_ON_DELAYS);I915_WRITE (PP_OFF_DELAYS , dev_priv->regfile.savePP_OFF_DELAYS);I915_WRITE (PP_DIVISOR , dev_priv->regfile.savePP_DIVISOR);
@@ -95,7 +95,7 @@ static void i915_restore_display(struct drm_device *dev)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) &&INTEL_GEN (dev) <=4 && !IS_G4X (dev))I915_WRITE (FBC_CONTROL , dev_priv->regfile.saveFBC_CONTROL);i915_redisable_vga (dev);
@@ -115,7 +115,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) <7 ) dev_priv->regfile.saveCACHE_MODE_0 =I915_READ (CACHE_MODE_0 );/* Memory Arbitration state */
@@ -161,7 +161,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) <7 )I915_WRITE (CACHE_MODE_0 , dev_priv->regfile.saveCACHE_MODE_0 |0xffff0000 );
drivers/gpu/drm/i915/i915_sysfs.c +1 -1
@@ -631,7 +631,7 @@ void i915_setup_sysfs(struct drm_device *dev) ret =0 ;if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) ret =sysfs_create_files (&dev->primary->kdev->kobj, vlv_attrs); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev) >=6 ) ret =sysfs_create_files (&dev->primary->kdev->kobj, gen6_attrs);if (ret)DRM_ERROR ("RPS sysfs setup failed\n" );
drivers/gpu/drm/i915/intel_audio.c +1 -1
@@ -575,7 +575,7 @@ void intel_init_audio_hooks(struct drm_i915_private *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_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_disable = hsw_audio_codec_disable; }else if (HAS_PCH_SPLIT (dev_priv)) {
drivers/gpu/drm/i915/intel_bios.c +1 -1
@@ -359,7 +359,7 @@ static u32 get_blocksize(const void *block_data)static int intel_bios_ssc_frequency (struct drm_i915_private *dev_priv,bool alternate) { -switch (INTEL_INFO (dev_priv)->gen) { +switch (INTEL_GEN (dev_priv)) {case 2 :return alternate ?66667 :48000 ;case 3 :
drivers/gpu/drm/i915/intel_color.c +1 -1
@@ -179,7 +179,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) >6 ) {uint16_t postoff =0 ;if (intel_crtc->config->limited_color_range)
drivers/gpu/drm/i915/intel_crt.c +3 -3
@@ -152,7 +152,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;u32 adpa; -if (INTEL_INFO (dev)->gen >=5 ) +if (INTEL_GEN (dev) >=5 ) adpa =ADPA_HOTPLUG_BITS ;else adpa =0 ;
@@ -647,7 +647,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) <4 ) status =intel_crt_load_detect (crt,to_intel_crtc (connector->state->crtc)->pipe);else if (i915.load_detect_test)
@@ -713,7 +713,7 @@ static void intel_crt_reset(struct drm_connector *connector)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crt *crt =intel_attached_crt (connector); -if (INTEL_INFO (dev)->gen >=5 ) { +if (INTEL_GEN (dev) >=5 ) {u32 adpa; adpa =I915_READ (crt->adpa_reg);
drivers/gpu/drm/i915/intel_ddi.c +5 -5
@@ -977,7 +977,7 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, {struct drm_device *dev = encoder->base.dev; -if (INTEL_INFO (dev)->gen <=8 ) +if (INTEL_GEN (dev) <=8 )hsw_ddi_clock_get (encoder, pipe_config);else if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev))skl_ddi_clock_get (encoder, pipe_config);
@@ -1579,7 +1579,7 @@ void intel_ddi_clk_select(struct intel_encoder *encoder,I915_WRITE (DPLL_CTRL2 , val); - }else if (INTEL_INFO (dev_priv)->gen <9 ) { + }else if (INTEL_GEN (dev_priv) <9 ) {WARN_ON (pipe_config->ddi_pll_sel ==PORT_CLK_SEL_NONE );I915_WRITE (PORT_CLK_SEL (port), pipe_config->ddi_pll_sel); }
@@ -1611,7 +1611,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON );intel_dp_start_link_train (intel_dp); -if (port !=PORT_A ||INTEL_INFO (dev_priv)->gen >=9 ) +if (port !=PORT_A ||INTEL_GEN (dev_priv) >=9 )intel_dp_stop_link_train (intel_dp); }else if (type ==INTEL_OUTPUT_HDMI ) {struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);
@@ -1657,7 +1657,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) <9 )I915_WRITE (PORT_CLK_SEL (port),PORT_CLK_SEL_NONE ); }
@@ -1685,7 +1685,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) <9 )intel_dp_stop_link_train (intel_dp);intel_edp_backlight_on (intel_dp);
drivers/gpu/drm/i915/intel_display.c +94 -94
723 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +15 -15
@@ -1148,7 +1148,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,enum port port) { -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return skl_aux_ctl_reg (dev_priv, port);else if (HAS_PCH_SPLIT (dev_priv))return ilk_aux_ctl_reg (dev_priv, port);
@@ -1159,7 +1159,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,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);else if (HAS_PCH_SPLIT (dev_priv))return ilk_aux_data_reg (dev_priv, port, index);
@@ -1248,7 +1248,7 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp)return false;if ((IS_HASWELL (dev) && !IS_HSW_ULX (dev)) ||IS_BROADWELL (dev) || - (INTEL_INFO (dev)->gen >=9 )) + (INTEL_GEN (dev) >=9 ))return true;else return false;
@@ -1471,7 +1471,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) >=9 ) {int ret; ret =skl_update_scaler_crtc (pipe_config);if (ret)
@@ -2428,7 +2428,7 @@ static void intel_disable_dp(struct intel_encoder *encoder)intel_edp_panel_off (intel_dp);/* disable the port before the pipe on g4x */ -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev) <5 )intel_dp_link_down (intel_dp); }
@@ -3157,7 +3157,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) >=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 ;
@@ -3177,7 +3177,7 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder)struct drm_device *dev =intel_dp_to_dev (intel_dp);enum port port =dp_to_dig_port (intel_dp)->port; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev) >=9 ) {switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) {case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 :return DP_TRAIN_PRE_EMPH_LEVEL_3 ;
@@ -3820,7 +3820,7 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp)DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } -if (INTEL_INFO (dev)->gen >=9 && +if (INTEL_GEN (dev) >=9 && (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) {uint8_t frame_sync_cap;
@@ -5085,7 +5085,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) <5 )return false;if (port ==PORT_A )
@@ -5399,7 +5399,7 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate)return ; } -if (INTEL_INFO (dev)->gen >=8 && !IS_CHERRYVIEW (dev)) { +if (INTEL_GEN (dev) >=8 && !IS_CHERRYVIEW (dev)) {switch (index) {case DRRS_HIGH_RR :intel_dp_set_m_n (intel_crtc,M1_N1 );
@@ -5411,7 +5411,7 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate)default :DRM_ERROR ("Unsupported refreshrate type\n" ); } - }else if (INTEL_INFO (dev)->gen >6 ) { + }else if (INTEL_GEN (dev) >6 ) {i915_reg_t reg =PIPECONF (intel_crtc->config->cpu_transcoder);u32 val;
@@ -5688,7 +5688,7 @@ void intel_edp_drrs_flush(struct drm_device *dev,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) <=6 ) {DRM_DEBUG_KMS ("DRRS supported for Gen7 and above\n" );return NULL ; }
@@ -5840,7 +5840,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) >=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;
@@ -5849,7 +5849,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) >=9 ) intel_dp->get_aux_send_ctl = skl_get_aux_send_ctl;else intel_dp->get_aux_send_ctl = g4x_get_aux_send_ctl;
@@ -6026,7 +6026,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, }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) >=5 ) intel_encoder->post_disable = ilk_post_disable_dp; }
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
@@ -156,7 +156,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) <5 )return ;if (pll ==NULL )
drivers/gpu/drm/i915/intel_fbc.c +15 -15
@@ -48,17 +48,17 @@ static inline bool fbc_supported(struct drm_i915_private *dev_priv)static inline bool fbc_on_pipe_a_only (struct drm_i915_private *dev_priv) { -return IS_HASWELL (dev_priv) ||INTEL_INFO (dev_priv)->gen >=8 ; +return IS_HASWELL (dev_priv) ||INTEL_GEN (dev_priv) >=8 ; }static inline bool fbc_on_plane_a_only (struct drm_i915_private *dev_priv) { -return INTEL_INFO (dev_priv)->gen <4 ; +return INTEL_GEN (dev_priv) <4 ; }static inline bool no_fbc_on_multiple_pipes (struct drm_i915_private *dev_priv) { -return INTEL_INFO (dev_priv)->gen <=3 ; +return INTEL_GEN (dev_priv) <=3 ; }/*
@@ -104,7 +104,7 @@ static int intel_fbc_calculate_cfb_size(struct drm_i915_private *dev_priv,int lines;intel_fbc_get_plane_source_size (cache,NULL , &lines); -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 ) lines =min (lines,2048 );/* Hardware needs the full buffer stride, not just the active area. */
@@ -331,7 +331,7 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)static bool intel_fbc_hw_is_active (struct drm_i915_private *dev_priv) { -if (INTEL_INFO (dev_priv)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 )return ilk_fbc_is_active (dev_priv);else if (IS_GM45 (dev_priv))return g4x_fbc_is_active (dev_priv);
@@ -345,9 +345,9 @@ static void intel_fbc_hw_activate(struct drm_i915_private *dev_priv) fbc->active = true; -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 )gen7_fbc_activate (dev_priv); -else if (INTEL_INFO (dev_priv)->gen >=5 ) +else if (INTEL_GEN (dev_priv) >=5 )ilk_fbc_activate (dev_priv);else if (IS_GM45 (dev_priv))g4x_fbc_activate (dev_priv);
@@ -361,7 +361,7 @@ static void intel_fbc_hw_deactivate(struct drm_i915_private *dev_priv) fbc->active = false; -if (INTEL_INFO (dev_priv)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 )ilk_fbc_deactivate (dev_priv);else if (IS_GM45 (dev_priv))g4x_fbc_deactivate (dev_priv);
@@ -542,7 +542,7 @@ static int find_compression_threshold(struct drm_i915_private *dev_priv, ret =i915_gem_stolen_insert_node_in_range (dev_priv, node, size >>=1 ,4096 ,0 , end); -if (ret &&INTEL_INFO (dev_priv)->gen <=4 ) { +if (ret &&INTEL_GEN (dev_priv) <=4 ) {return 0 ; }else if (ret) { compression_threshold <<=1 ;
@@ -575,7 +575,7 @@ static int intel_fbc_alloc_cfb(struct intel_crtc *crtc) fbc->threshold = ret; -if (INTEL_INFO (dev_priv)->gen >=5 ) +if (INTEL_GEN (dev_priv) >=5 )I915_WRITE (ILK_DPFC_CB_BASE , fbc->compressed_fb.start);else if (IS_GM45 (dev_priv)) {I915_WRITE (DPFC_CB_BASE , fbc->compressed_fb.start);
@@ -689,10 +689,10 @@ static bool intel_fbc_hw_tracking_covers_screen(struct intel_crtc *crtc)struct intel_fbc *fbc = &dev_priv->fbc;unsigned int effective_w, effective_h, max_w, max_h; -if (INTEL_INFO (dev_priv)->gen >=8 ||IS_HASWELL (dev_priv)) { +if (INTEL_GEN (dev_priv) >=8 ||IS_HASWELL (dev_priv)) { max_w =4096 ; max_h =4096 ; - }else if (IS_G4X (dev_priv) ||INTEL_INFO (dev_priv)->gen >=5 ) { + }else if (IS_G4X (dev_priv) ||INTEL_GEN (dev_priv) >=5 ) { max_w =4096 ; max_h =2048 ; }else {
@@ -740,7 +740,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc)/* FIXME: We lack the proper locking here, so only run this on the * platforms that need. */ -if (INTEL_INFO (dev_priv)->gen >=5 &&INTEL_INFO (dev_priv)->gen <7 ) +if (INTEL_GEN (dev_priv) >=5 &&INTEL_GEN (dev_priv) <7 ) cache->fb.ilk_ggtt_offset =i915_gem_obj_ggtt_offset (obj); cache->fb.pixel_format = fb->pixel_format; cache->fb.stride = fb->pitches[0 ];
@@ -778,7 +778,7 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc) fbc->no_fbc_reason ="framebuffer not tiled or fenced" ;return false; } -if (INTEL_INFO (dev_priv)->gen <=4 && !IS_G4X (dev_priv) && +if (INTEL_GEN (dev_priv) <=4 && !IS_G4X (dev_priv) && cache->plane.rotation !=BIT (DRM_ROTATE_0 )) { fbc->no_fbc_reason ="rotation unsupported" ;return false;
@@ -1253,7 +1253,7 @@ void intel_fbc_init(struct drm_i915_private *dev_priv) }/* This value was pulled out of someone's hat */ -if (INTEL_INFO (dev_priv)->gen <=4 && !IS_GM45 (dev_priv)) +if (INTEL_GEN (dev_priv) <=4 && !IS_GM45 (dev_priv))I915_WRITE (FBC_CONTROL ,500 <<FBC_CTL_INTERVAL_SHIFT );/* We still don't have any sort of hardware state readout for FBC, so
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
@@ -124,7 +124,7 @@ static u32 get_gttype(struct drm_i915_private *dev_priv)static u32 get_core_family (struct drm_i915_private *dev_priv) { -switch (INTEL_INFO (dev_priv)->gen) { +switch (INTEL_GEN (dev_priv)) {case 9 :return GFXCORE_FAMILY_GEN9 ;
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -1171,7 +1171,7 @@ static int hdmi_port_clock_limit(struct intel_hdmi *hdmi, bool respect_dvi_limitif ((respect_dvi_limit && !hdmi->has_hdmi_sink) ||IS_G4X (dev))return 165000 ; -else if (IS_HASWELL (dev) ||INTEL_INFO (dev)->gen >=8 ) +else if (IS_HASWELL (dev) ||INTEL_GEN (dev) >=8 )return 300000 ;else return 225000 ;
drivers/gpu/drm/i915/intel_lrc.c +11 -11
@@ -253,7 +253,7 @@ int intel_sanitize_enable_execlists(struct drm_device *dev, int enable_execlistsif (HAS_LOGICAL_RING_CONTEXTS (dev) &&intel_vgpu_active (dev))return 1 ; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev) >=9 )return 1 ;if (enable_execlists ==0 )
@@ -1500,9 +1500,9 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)WARN_ON (engine->id !=RCS );/* update this when WA for higher Gen are added */ -if (INTEL_INFO (engine->dev)->gen >9 ) { +if (INTEL_GEN (engine->dev) >9 ) {DRM_ERROR ("WA batch buffer is not initialized for Gen%d\n" , -INTEL_INFO (engine->dev)->gen); +INTEL_GEN (engine->dev));return 0 ; }
@@ -1522,7 +1522,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine) batch =kmap_atomic (page); offset =0 ; -if (INTEL_INFO (engine->dev)->gen ==8 ) { +if (INTEL_GEN (engine->dev) ==8 ) { ret = gen8_init_indirectctx_bb(engine, &wa_ctx->indirect_ctx, batch,
@@ -1536,7 +1536,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine) &offset);if (ret) goto out; - }else if (INTEL_INFO (engine->dev)->gen ==9 ) { + }else if (INTEL_GEN (engine->dev) ==9 ) { ret = gen9_init_indirectctx_bb(engine, &wa_ctx->indirect_ctx, batch,
@@ -2142,7 +2142,7 @@ static int logical_render_ring_init(struct drm_device *dev)logical_ring_default_vfuncs (dev, engine);/* Override some for render ring. */ -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev) >=9 ) engine->init_hw = gen9_init_render_ring;else engine->init_hw = gen8_init_render_ring;
@@ -2310,7 +2310,7 @@ int intel_logical_rings_init(struct drm_device *dev)* No explicit RPCS request is needed to ensure full * slice/subslice/EU enablement prior to Gen9. */ -if (INTEL_INFO (dev)->gen <9 ) +if (INTEL_GEN (dev) <9 )return 0 ;/*
@@ -2348,9 +2348,9 @@ static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine) {u32 indirect_ctx_offset; -switch (INTEL_INFO (engine->dev)->gen) { +switch (INTEL_GEN (engine->dev)) {default : -MISSING_CASE (INTEL_INFO (engine->dev)->gen); +MISSING_CASE (INTEL_GEN (engine->dev));/* fall through */ case 9 : indirect_ctx_offset =
@@ -2556,11 +2556,11 @@ uint32_t intel_lr_context_size(struct intel_engine_cs *engine) {int ret =0 ; -WARN_ON (INTEL_INFO (engine->dev)->gen <8 ); +WARN_ON (INTEL_GEN (engine->dev) <8 );switch (engine->id) {case RCS : -if (INTEL_INFO (engine->dev)->gen >=9 ) +if (INTEL_GEN (engine->dev) >=9 ) ret =GEN9_LR_CONTEXT_RENDER_SIZE ;else ret =GEN8_LR_CONTEXT_RENDER_SIZE ;
drivers/gpu/drm/i915/intel_lvds.c +6 -6
@@ -123,7 +123,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, pipe_config->base.adjusted_mode.flags |= flags;/* gen2/3 store dither state in pfit control, needs to match */ -if (INTEL_INFO (dev)->gen <4 ) { +if (INTEL_GEN (dev) <4 ) { tmp =I915_READ (PFIT_CONTROL ); pipe_config->gmch_pfit.control |= tmp &PANEL_8TO6_DITHER_ENABLE ;
@@ -186,7 +186,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)/* Set the dithering flag on LVDS as needed, note that there is no * special lvds dither control bit on pch-split platforms, dithering is * only controlled through the PIPECONF reg. */ -if (INTEL_INFO (dev)->gen ==4 ) { +if (INTEL_GEN (dev) ==4 ) {/* Bspec wording suggests that LVDS port dithering only exists * for 18bpp panels. */ if (crtc->config->dither && crtc->config->pipe_bpp ==18 )
@@ -312,7 +312,7 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,unsigned int lvds_bpp;/* Should never happen!! */ -if (INTEL_INFO (dev)->gen <4 && intel_crtc->pipe ==0 ) { +if (INTEL_GEN (dev) <4 && intel_crtc->pipe ==0 ) {DRM_ERROR ("Can't support LVDS on pipe A\n" );return false; }
@@ -861,7 +861,7 @@ static bool intel_lvds_supported(struct drm_device *dev)/* Otherwise LVDS was only attached to mobile products, * except for the inglorious 830gm */ -if (INTEL_INFO (dev)->gen <=4 &&IS_MOBILE (dev) && !IS_I830 (dev)) +if (INTEL_GEN (dev) <=4 &&IS_MOBILE (dev) && !IS_I830 (dev))return true;return false;
@@ -900,7 +900,7 @@ void intel_lvds_init(struct drm_device *dev)if (HAS_PCH_SPLIT (dev)) {I915_WRITE (PCH_PP_CONTROL ,I915_READ (PCH_PP_CONTROL ) |PANEL_UNLOCK_REGS ); - }else if (INTEL_INFO (dev_priv)->gen <5 ) { + }else if (INTEL_GEN (dev_priv) <5 ) {I915_WRITE (PP_CONTROL ,I915_READ (PP_CONTROL ) |PANEL_UNLOCK_REGS ); }
@@ -937,7 +937,7 @@ void intel_lvds_init(struct drm_device *dev) }/* Set the Panel Power On/Off timings if uninitialized. */ -if (INTEL_INFO (dev_priv)->gen <5 && +if (INTEL_GEN (dev_priv) <5 &&I915_READ (PP_ON_DELAYS ) ==0 &&I915_READ (PP_OFF_DELAYS ) ==0 ) {/* Set T2 to 40ms and T5 to 200ms */ I915_WRITE (PP_ON_DELAYS ,0x019007d0 );
drivers/gpu/drm/i915/intel_mocs.c +1 -1
@@ -152,7 +152,7 @@ static bool get_mocs_settings(struct drm_device *dev, table->table = broxton_mocs_table; result = true; }else { -WARN_ONCE (INTEL_INFO (dev)->gen >=9 , +WARN_ONCE (INTEL_GEN (dev) >=9 ,"Platform that should have a MOCS table does not.\n" ); }
drivers/gpu/drm/i915/intel_overlay.c +2 -2
@@ -905,7 +905,7 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay)/* XXX: This is not the same logic as in the xorg driver, but more in * line with the intel documentation for the i965 */ -if (INTEL_INFO (dev)->gen >=4 ) { +if (INTEL_GEN (dev) >=4 ) {/* on i965 use the PGM reg to read out the autoscaler values */ ratio =I915_READ (PFIT_PGM_RATIOS ) >>PFIT_VERT_SCALE_SHIFT_965 ; }else {
@@ -1069,7 +1069,7 @@ static int intel_panel_fitter_pipe(struct drm_device *dev)u32 pfit_control;/* i830 doesn't have a panel fitter */ -if (INTEL_INFO (dev)->gen <=3 && (IS_I830 (dev) || !IS_MOBILE (dev))) +if (INTEL_GEN (dev) <=3 && (IS_I830 (dev) || !IS_MOBILE (dev)))return -1 ; pfit_control =I915_READ (PFIT_CONTROL );
drivers/gpu/drm/i915/intel_panel.c +5 -5
@@ -325,7 +325,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,break ;case DRM_MODE_SCALE_ASPECT :/* Scale but preserve the aspect ratio */ -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev) >=4 )i965_scale_aspect (pipe_config, &pfit_control);else i9xx_scale_aspect(pipe_config, &pfit_control,
@@ -339,7 +339,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,if (pipe_config->pipe_src_h != adjusted_mode->crtc_vdisplay || pipe_config->pipe_src_w != adjusted_mode->crtc_hdisplay) { pfit_control |=PFIT_ENABLE ; -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev) >=4 ) pfit_control |=PFIT_SCALING_AUTO ;else pfit_control |= (VERT_AUTO_SCALE |
@@ -355,7 +355,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,/* 965+ wants fuzzy fitting */ /* FIXME: handle multiple panels by failing gracefully */ -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev) >=4 ) pfit_control |= ((intel_crtc->pipe <<PFIT_PIPE_SHIFT ) |PFIT_FILTER_FUZZY );
@@ -366,7 +366,7 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, }/* Make sure pre-965 set dither correctly for 18bpp panels. */ -if (INTEL_INFO (dev)->gen <4 && pipe_config->pipe_bpp ==18 ) +if (INTEL_GEN (dev) <4 && pipe_config->pipe_bpp ==18 ) pfit_control |=PANEL_8TO6_DITHER_ENABLE ; pipe_config->gmch_pfit.control = pfit_control;
@@ -498,7 +498,7 @@ static u32 i9xx_get_backlight(struct intel_connector *connector)u32 val; 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 ;if (panel->backlight.combination_mode) {
drivers/gpu/drm/i915/intel_pm.c +34 -34
255 lines not on this page · raw message
drivers/gpu/drm/i915/intel_psr.c +5 -5
@@ -154,7 +154,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,enum port port) { -if (INTEL_INFO (dev_priv)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 )return DP_AUX_CH_CTL (port);else return EDP_PSR_AUX_CTL ;
@@ -163,7 +163,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,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);else return EDP_PSR_AUX_DATA (index);
@@ -204,7 +204,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)I915_WRITE (psr_aux_data_reg (dev_priv, port, i >>2 ),intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev) >=9 ) {uint32_t val; val =I915_READ (aux_ctl_reg);
@@ -433,7 +433,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) >=9 )intel_psr_activate (intel_dp); }else {vlv_psr_setup_vsc (intel_dp);
@@ -459,7 +459,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) <9 )schedule_delayed_work (&dev_priv->psr.work,msecs_to_jiffies (intel_dp->panel_power_cycle_delay *5 ));
drivers/gpu/drm/i915/intel_ringbuffer.c +25 -25
57 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
Re: [RFC] Convert INTEL_INFO(...)->gen to INTEL_GEN(...)
Review
Quoted 11 lines · Dave Gordon
Since Jani has given us this macro, I thought I'd make use of it by converting all existing instances of this construct with a really simple little Coccinelle script:
@intel_gen@
expression E; @@ <...(quoted diff) +1
-1- INTEL_INFO(E)->gen + INTEL_GEN(E) ...>
I intentionally did not do this because I think it causes more trouble than it's worth. Basically this will conflict with roughly all patches currently in flight. Yes, I admit I did tell people to go wild, but please let's do this piecemeal.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC] Convert INTEL_INFO(...)->gen to INTEL_GEN(...)
Quoted 13 lines · Jani Nikula
Review
Quoted 11 lines · Dave Gordon
Since Jani has given us this macro, I thought I'd make use of it by converting all existing instances of this construct with a really simple little Coccinelle script:
@intel_gen@
expression E; @@ <...(quoted diff) +1
-1- INTEL_INFO(E)->gen + INTEL_GEN(E) ...>
Quoted 7 lines
I intentionally did not do this because I think it causes more trouble than it's worth. Basically this will conflict with roughly all patches currently in flight. Yes, I admit I did tell people to go wild, but please let's do this piecemeal.
BR,
Jani.
The point of including the actual Cocci code in the commit message is that then anyone who has a set of not-yet-submitted changes can apply the Cocci script to their own codebase before attempting to rebase onto the new version of nightly, thus eliminating from the conflicts all those which are simply due to the patch applied to upstream.
For this reason, I'd like to recommend that anyone doing this sort of bulk transformation with Cocci or awk or just sed should /always/ include the transformation script.
As for doing it piecemeal, what are the chances that there will ever be a time when there are no changes in flight in, say, intel_display.c?
$ git churn drivers/gpu/drm/i915/*.c | tail -6
918 drivers/gpu/drm/i915/intel_ringbuffer.c
1027 drivers/gpu/drm/i915/intel_dp.c
1108 drivers/gpu/drm/i915/i915_irq.c
1448 drivers/gpu/drm/i915/intel_pm.c
1583 drivers/gpu/drm/i915/i915_gem.c
3290 drivers/gpu/drm/i915/intel_display.c
Perhaps the maintainers could target one file at a time, any time it looks like we're having a quiet period?
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Jani Nikula
Quoted 11 lines · Chris Wilson
Quoted 9 lines · Jani Nikula
Sudden realization:
$ grep -ho "INTEL_INFO([^)]*)->[a-zA-Z0-9_]*" *.[ch] | sed 's/.*->//' |\ sort | uniq -c | sort -rn | head -5 446 gen 24 num_pipes 10 ring_mask 9 color 4 subslice_per_slice
Quoted 7 lines
Quoted 4 lines
Yes, we did get a bit carried away over the years. In the beginning, it was
IS_G4Xthis,IS_IGDNGthat and only rarelyIS_GEN()!Acked-by Chris Wilson <[email protected]>Thanks, pushed to drm-intel-next-queued, everybody go wild and start using it.
Actually pushed now. I don't know what happened the last time.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: add INTEL_GEN() helper shorthand for INTEL_INFO()->gen
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add INTEL_GEN() helper shorthand for INTEL_INFO()->gen
URL : https://patchwork.freedesktop.org/series/5407/
State : failure
== Summary ==
Series 5407v1 drm/i915: add INTEL_GEN() helper shorthand for INTEL_INFO()->gen
http://patchwork.freedesktop.org/api/1.0/series/5407/revisions/1/mbox/
Test gem_exec_basic:
Subgroup basic-vebox:
pass -> SKIP (bsw-nuc-2)
Subgroup gtt-bsd:
pass -> INCOMPLETE (bdw-nuci7)
Subgroup gtt-render:
pass -> SKIP (bsw-nuc-2)
Subgroup gtt-vebox:
pass -> SKIP (bsw-nuc-2)
Subgroup readonly-vebox:
pass -> SKIP (bsw-nuc-2)
Test gem_exec_store:
Subgroup basic-bsd1:
pass -> INCOMPLETE (bdw-nuci7)
Subgroup basic-default:
pass -> SKIP (bsw-nuc-2)
Test gem_exec_whisper:
Subgroup basic:
pass -> INCOMPLETE (bsw-nuc-2)
Test gem_mmap:
Subgroup basic:
pass -> DMESG-WARN (bsw-nuc-2)
Subgroup basic-small-bo:
pass -> DMESG-WARN (bsw-nuc-2)
Test gem_mmap_gtt:
Subgroup basic-read-write:
pass -> INCOMPLETE (bdw-nuci7)
Subgroup basic-write-no-prefault:
pass -> DMESG-WARN (bsw-nuc-2)
Subgroup basic-write-read-distinct:
pass -> DMESG-WARN (bsw-nuc-2)
Test gem_render_tiled_blits:
Subgroup basic:
pass -> DMESG-FAIL (bsw-nuc-2)
Test gem_storedw_loop:
Subgroup basic-render:
pass -> SKIP (bsw-nuc-2)
Test gem_sync:
Subgroup basic-blt:
pass -> DMESG-FAIL (bsw-nuc-2)
Subgroup basic-bsd:
pass -> INCOMPLETE (bdw-nuci7)
Subgroup basic-each:
dmesg-fail -> PASS (bsw-nuc-2)
Test kms_addfb_basic:
Subgroup addfb25-framebuffer-vs-set-tiling:
pass -> INCOMPLETE (bdw-nuci7)
Subgroup bad-pitch-63:
pass -> DMESG-WARN (bsw-nuc-2)
Subgroup basic-x-tiled:
pass -> DMESG-WARN (bsw-nuc-2)
Subgroup size-max:
pass -> DMESG-WARN (bsw-nuc-2)
Subgroup unused-modifier:
pass -> INCOMPLETE (bdw-nuci7)
Subgroup unused-pitches:
pass -> DMESG-WARN (bsw-nuc-2)
Test kms_force_connector_basic:
Subgroup force-edid:
skip -> PASS (ilk-hp8440p)
Subgroup force-load-detect:
pass -> SKIP (ilk-hp8440p)
Subgroup prune-stale-modes:
skip -> PASS (ilk-hp8440p)
Test kms_frontbuffer_tracking:
Subgroup basic:
dmesg-fail -> PASS (bsw-nuc-2)
Test kms_pipe_crc_basic:
Subgroup bad-nb-words-3:
pass -> DMESG-WARN (bsw-nuc-2)
Subgroup nonblocking-crc-pipe-c:
pass -> INCOMPLETE (bdw-nuci7)
Subgroup read-crc-pipe-c:
pass -> DMESG-FAIL (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-rte:
pass -> INCOMPLETE (bdw-nuci7)bdw-nuci7 total:196 pass:176 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:196 pass:175 dwarn:0 dfail:0 fail:0 skip:21 bsw-nuc-2 total:177 pass:123 dwarn:9 dfail:3 fail:0 skip:41 byt-nuc total:196 pass:161 dwarn:0 dfail:0 fail:0 skip:35 hsw-brixbox total:196 pass:174 dwarn:0 dfail:0 fail:0 skip:22 hsw-gt2 total:196 pass:179 dwarn:0 dfail:0 fail:0 skip:17 ilk-hp8440p total:196 pass:131 dwarn:0 dfail:0 fail:0 skip:65 ivb-t430s total:196 pass:171 dwarn:0 dfail:0 fail:0 skip:25 skl-i7k-2 total:196 pass:173 dwarn:0 dfail:0 fail:0 skip:23 skl-nuci5 total:196 pass:185 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:196 pass:162 dwarn:0 dfail:0 fail:0 skip:34 snb-x220t total:196 pass:162 dwarn:0 dfail:0 fail:1 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1827/
72a18a7b81a4d12966eaf1c362c89a88ce6e5f54 drm-intel-nightly: 2016y-04m-07d-11h-51m-13s UTC integration manifest 19ca5230006e83cc438e4ec18a038061d9db583b drm/i915: add INTEL_GEN() helper shorthand for INTEL_INFO()->gen
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: add INTEL_GEN() helper shorthand for INTEL_INFO()->gen (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add INTEL_GEN() helper shorthand for INTEL_INFO()->gen (rev2)
URL : https://patchwork.freedesktop.org/series/5407/
State : failure
== Summary ==
CC [M] drivers/net/usb/cdc_ncm.o CC [M] drivers/net/ethernet/intel/igb/e1000_i210.o CC [M] drivers/net/ethernet/intel/igb/igb_ptp.o LD drivers/usb/storage/usb-storage.o LD drivers/usb/storage/built-in.o CC drivers/usb/host/uhci-hcd.o LD drivers/tty/vt/built-in.o LD drivers/tty/built-in.o CC drivers/usb/host/xhci.o LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o CC drivers/usb/host/xhci-mem.o CC drivers/usb/host/xhci-ring.o CC [M] drivers/net/ethernet/intel/igb/igb_hwmon.o CC drivers/usb/host/xhci-hub.o CC drivers/usb/host/xhci-dbg.o LD drivers/pci/pcie/aer/aerdriver.o CC drivers/usb/host/xhci-trace.o LD drivers/pci/pcie/aer/built-in.o CC drivers/usb/host/xhci-pci.o LD drivers/pci/pcie/built-in.o LD drivers/pci/built-in.o LD [M] drivers/net/ethernet/intel/igb/igb.o LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o LD drivers/usb/host/xhci-hcd.o LD drivers/usb/host/built-in.o LD drivers/usb/built-in.o LD drivers/net/ethernet/built-in.o LD drivers/net/built-in.o
Makefile:962: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx