drm/i915: Make IS_GENx macros work on a mask
Subsystems (2)
PATCH 1/5 drm/i915: Make IS_GENx macros work on a mask
From: Tvrtko Ursulin <[email protected]>
If instead of numerical comparison me make these test a bitmask, we enable the compiler to optimize all instances of IS_GENx || IS_GENy.
v2: Make bit zero of gen mask mean gen 1.
--- drivers/gpu/drm/i915/i915_dma.c | 3 +++ drivers/gpu/drm/i915/i915_drv.h | 17 +++++++++-------- drivers/gpu/drm/i915/intel_uncore.c | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +3 -0
@@ -1072,6 +1072,9 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,memcpy (device_info, info,sizeof (dev_priv->info)); device_info->device_id = dev->pdev->device; +BUG_ON (device_info->gen >sizeof (device_info->gen_mask) *BITS_PER_BYTE ); + device_info->gen_mask =BIT (device_info->gen -1 ); +spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);mutex_init (&dev_priv->backlight_lock);
drivers/gpu/drm/i915/i915_drv.h +9 -8
@@ -760,6 +760,7 @@ struct intel_device_info { u8 num_pipes:3;u8 num_sprites[I915_MAX_PIPES ];u8 gen; +u16 gen_mask;u8 ring_mask;/* Rings supported by the HW */ DEV_INFO_FOR_EACH_FLAG (DEFINE_FLAG ,SEP_SEMICOLON );/* Register offsets for the various display pipes and transcoders */
@@ -2620,14 +2621,14 @@ struct drm_i915_cmd_table {* have their own (e.g. HAS_PCH_SPLIT for ILK+ display, IS_foo for particular * chips, etc.). */ -#define IS_GEN2 (dev) (INTEL_INFO(dev)->gen == 2) -#define IS_GEN3 (dev) (INTEL_INFO(dev)->gen == 3) -#define IS_GEN4 (dev) (INTEL_INFO(dev)->gen == 4) -#define IS_GEN5 (dev) (INTEL_INFO(dev)->gen == 5) -#define IS_GEN6 (dev) (INTEL_INFO(dev)->gen == 6) -#define IS_GEN7 (dev) (INTEL_INFO(dev)->gen == 7) -#define IS_GEN8 (dev) (INTEL_INFO(dev)->gen == 8) -#define IS_GEN9 (dev) (INTEL_INFO(dev)->gen == 9) +#define IS_GEN2 (dev) (INTEL_INFO(dev)->gen_mask & BIT(1)) +#define IS_GEN3 (dev) (INTEL_INFO(dev)->gen_mask & BIT(2)) +#define IS_GEN4 (dev) (INTEL_INFO(dev)->gen_mask & BIT(3)) +#define IS_GEN5 (dev) (INTEL_INFO(dev)->gen_mask & BIT(4)) +#define IS_GEN6 (dev) (INTEL_INFO(dev)->gen_mask & BIT(5)) +#define IS_GEN7 (dev) (INTEL_INFO(dev)->gen_mask & BIT(6)) +#define IS_GEN8 (dev) (INTEL_INFO(dev)->gen_mask & BIT(7)) +#define IS_GEN9 (dev) (INTEL_INFO(dev)->gen_mask & BIT(8))#define RENDER_RING (1<<RCS)#define BSD_RING (1<<VCS)
drivers/gpu/drm/i915/intel_uncore.c +2 -2
@@ -1398,7 +1398,7 @@ void intel_uncore_fini(struct drm_device *dev)intel_uncore_forcewake_reset (dev, false); } -#define GEN_RANGE (l, h) GENMASK(h, l) +#define GEN_RANGE (l, h) GENMASK((h) - 1, (l) - 1) static const struct register_whitelist { i915_reg_t offset_ldw, offset_udw;
@@ -1423,7 +1423,7 @@ int i915_reg_read_ioctl(struct drm_device *dev,for (i =0 ; i <ARRAY_SIZE (whitelist); i++, entry++) {if (i915_mmio_reg_offset (entry->offset_ldw) == (reg->offset & -entry->size) && - (1 <<INTEL_INFO (dev)->gen & entry->gen_bitmask)) + (INTEL_INFO (dev)->gen_mask & entry->gen_bitmask))break ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 drm/i915: Promote IS_BROADWELL to a simple macro
From: Tvrtko Ursulin <[email protected]>
If we allow it a dedicated flag in dev_priv we enable the compiler to nicely optimize conditions like IS_HASSWELL || IS_BROADWELL.
--- drivers/gpu/drm/i915/i915_drv.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +4 -0
@@ -300,22 +300,26 @@ static const struct intel_device_info intel_haswell_m_info = {static const struct intel_device_info intel_broadwell_d_info = {BDW_FEATURES , .gen =8 , + .is_broadwell =1 , };static const struct intel_device_info intel_broadwell_m_info = {BDW_FEATURES , .gen =8 , .is_mobile =1 , + .is_broadwell =1 , };static const struct intel_device_info intel_broadwell_gt3d_info = {BDW_FEATURES , .gen =8 , + .is_broadwell =1 , .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING |BSD2_RING , };static const struct intel_device_info intel_broadwell_gt3m_info = {BDW_FEATURES , .gen =8 , .is_mobile =1 , + .is_broadwell =1 , .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING |BSD2_RING , };
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -735,6 +735,7 @@ struct intel_csr { func(is_valleyview) sep \ func(is_cherryview) sep \ func(is_haswell) sep \ + func(is_broadwell) sep \ func(is_skylake) sep \ func(is_broxton) sep \ func(is_kabylake) sep \
@@ -2553,7 +2554,7 @@ struct drm_i915_cmd_table {#define IS_VALLEYVIEW (dev) (INTEL_INFO(dev)->is_valleyview)#define IS_CHERRYVIEW (dev) (INTEL_INFO(dev)->is_cherryview)#define IS_HASWELL (dev) (INTEL_INFO(dev)->is_haswell) -#define IS_BROADWELL (dev) (!INTEL_INFO(dev)->is_cherryview && IS_GEN8(dev)) +#define IS_BROADWELL (dev) (INTEL_INFO(dev)->is_broadwell)#define IS_SKYLAKE (dev) (INTEL_INFO(dev)->is_skylake)#define IS_BROXTON (dev) (INTEL_INFO(dev)->is_broxton)#define IS_KABYLAKE (dev) (INTEL_INFO(dev)->is_kabylake)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915: Replace "INTEL_INFO->gen == x" checks with IS_GENx
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
This way optimization from a previous patch works even better.
v2: Rebase.
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- drivers/gpu/drm/i915/i915_dma.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 4 ++-- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -2310,12 +2310,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 (IS_GEN6 (dev_priv))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 (IS_GEN7 (dev_priv))seq_printf (m,"GFX_MODE: 0x%08x\n" ,I915_READ (RING_MODE_GEN7 (engine))); seq_printf(m, "PP_DIR_BASE: 0x%08x\n",
drivers/gpu/drm/i915/i915_dma.c +2 -2
@@ -888,7 +888,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 ) && + (IS_GEN7 (dev_priv) ||IS_GEN8 (dev_priv)) &&HAS_PCH_SPLIT (dev)) {u32 fuse_strap =I915_READ (FUSE_STRAP );u32 sfuse_strap =I915_READ (SFUSE_STRAP );
@@ -912,7 +912,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 &&IS_GEN9 (dev_priv)) {u32 dfsm =I915_READ (SKL_DFSM );u8 disabled_mask =0 ;bool invalid;
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2702,7 +2702,7 @@ struct drm_i915_cmd_table { IS_CHERRYVIEW(dev) || IS_SKYLAKE(dev) || \ IS_KABYLAKE(dev) || IS_BROXTON(dev))#define HAS_RC6 (dev) (INTEL_INFO(dev)->gen >= 6) -#define HAS_RC6p (dev) (INTEL_INFO(dev)->gen == 6 || IS_IVYBRIDGE(dev)) +#define HAS_RC6p (dev) (IS_GEN6(dev) || IS_IVYBRIDGE(dev))#define HAS_CSR (dev) (IS_GEN9(dev))
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -1981,7 +1981,7 @@ i915_gem_get_gtt_size(struct drm_device *dev, uint32_t size, int tiling_mode)return size;/* Previous chips need a power-of-two fence region when tiling */ -if (INTEL_INFO (dev)->gen ==3 ) +if (IS_GEN3 (dev)) gtt_size =1024 *1024 ;else gtt_size =512 *1024 ;
drivers/gpu/drm/i915/i915_gem_stolen.c +1 -1
@@ -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 (IS_GEN8 (dev_priv) && start <4096 ) start =4096 ;mutex_lock (&dev_priv->mm.stolen_lock);
drivers/gpu/drm/i915/i915_gem_tiling.c +1 -1
@@ -125,7 +125,7 @@ i915_gem_object_fence_ok(struct drm_i915_gem_object *obj, int tiling_mode)if (INTEL_INFO (obj->base.dev)->gen >=4 )return true; -if (INTEL_INFO (obj->base.dev)->gen ==3 ) { +if (IS_GEN3 (obj->base.dev)) {if (i915_gem_obj_ggtt_offset (obj) & ~I915_FENCE_START_MASK )return false; }else {
drivers/gpu/drm/i915/i915_gpu_error.c +1 -1
@@ -411,7 +411,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"DONE_REG: 0x%08x\n" , error->done_reg); } -if (INTEL_INFO (dev)->gen ==7 ) +if (IS_GEN7 (dev))err_printf (m,"ERR_INT: 0x%08x\n" , error->err_int);for (i =0 ; i <ARRAY_SIZE (error->ring); i++)
drivers/gpu/drm/i915/i915_irq.c +2 -2
@@ -4644,12 +4644,12 @@ void intel_irq_init(struct drm_i915_private *dev_priv) dev->driver->disable_vblank = ironlake_disable_vblank; dev_priv->display.hpd_irq_setup = ilk_hpd_irq_setup; }else { -if (INTEL_INFO (dev_priv)->gen ==2 ) { +if (IS_GEN2 (dev_priv)) { dev->driver->irq_preinstall = i8xx_irq_preinstall; dev->driver->irq_postinstall = i8xx_irq_postinstall; dev->driver->irq_handler = i8xx_irq_handler; dev->driver->irq_uninstall = i8xx_irq_uninstall; - }else if (INTEL_INFO (dev_priv)->gen ==3 ) { + }else if (IS_GEN3 (dev_priv)) { dev->driver->irq_preinstall = i915_irq_preinstall; dev->driver->irq_postinstall = i915_irq_postinstall; dev->driver->irq_uninstall = i915_irq_uninstall;
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -1204,7 +1204,7 @@ 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)->gen ==5 ) +if (IS_GEN5 (dev_priv))return ;/* On Haswell, DDI ports are responsible for the FDI PLL setup */
drivers/gpu/drm/i915/intel_lvds.c +1 -1
@@ -190,7 +190,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 (IS_GEN4 (dev_priv)) {/* Bspec wording suggests that LVDS port dithering only exists * for 18bpp panels. */ if (crtc->config->dither && crtc->config->pipe_bpp ==18 )
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -2146,14 +2146,14 @@ static void intel_read_wm_latency(struct drm_device *dev, uint16_t wm[8])static void intel_fixup_spr_wm_latency (struct drm_device *dev,uint16_t wm[5 ]) {/* ILK sprite LP0 latency is 1300 ns */ -if (INTEL_INFO (dev)->gen ==5 ) +if (IS_GEN5 (dev)) wm[0 ] =13 ; }static void intel_fixup_cur_wm_latency (struct drm_device *dev,uint16_t wm[5 ]) {/* ILK cursor LP0 latency is 1300 ns */ -if (INTEL_INFO (dev)->gen ==5 ) +if (IS_GEN5 (dev)) wm[0 ] =13 ;/* WaDoubleCursorLP3Latency:ivb */
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -2503,7 +2503,7 @@ void intel_ring_init_seqno(struct intel_engine_cs *engine, u32 seqno)* the semaphore value, then when the seqno moves backwards all * future waits will complete instantly (causing rendering corruption). */ -if (INTEL_INFO (dev_priv)->gen ==6 ||INTEL_INFO (dev_priv)->gen ==7 ) { +if (IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)) {I915_WRITE (RING_SYNC_0 (engine->mmio_base),0 );I915_WRITE (RING_SYNC_1 (engine->mmio_base),0 );if (HAS_VEBOX (dev_priv))
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: Do not use a bitfield for INTEL_INFO->num_pipes
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
It just makes more work for the compiler and generates more code.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -758,7 +758,7 @@ struct intel_csr {struct intel_device_info {u32 display_mmio_offset;u16 device_id; -u8 num_pipes:3 ; +u8 num_pipes;u8 num_sprites[I915_MAX_PIPES ];u8 gen;u16 gen_mask;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 drm/i915: Introduce IS_GEN macro
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
To be used for more efficient Gen range checking.
v2: Remove spurious chunk. (Chris Wilson)
v3: Rebase.
v4: Renamed from INTEL_GEN_RANGE and added GEN_FOREVER.
--- drivers/gpu/drm/i915/i915_drv.h | 22 +++++++++++++++++++++- drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++---- 3 files changed, 26 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +21 -1
@@ -2519,9 +2519,29 @@ struct drm_i915_cmd_table {#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)#define REVID_FOREVER 0xff +#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision) + +#define GEN_FOREVER (0) +/* +* Returns true if Gen is in inclusive range [Start, End]. +* +* Use GEN_FOREVER for unbound start and or end. +*/ +#define IS_GEN (p, s, e) ({ \ + unsigned int __s = (s), __e = (e); \ + BUILD_BUG_ON(!__builtin_constant_p(s)); \ + BUILD_BUG_ON(!__builtin_constant_p(e)); \ + if ((__s) != GEN_FOREVER) \ + __s = (s) - 1; \ + if ((__e) == GEN_FOREVER) \ + __e = BITS_PER_LONG - 1; \ + else \ + __e = (e) - 1; \ + !!(INTEL_INFO(p)->gen_mask & GENMASK((__e), (__s))); \ +}) +/* * Return true if revision is in range [since,until] inclusive. *
drivers/gpu/drm/i915/intel_fbc.c +1 -1
@@ -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 (IS_GEN (dev_priv,5 ,6 )) cache->fb.ilk_ggtt_offset =i915_gem_obj_ggtt_offset (obj); cache->fb.pixel_format = fb->pixel_format; cache->fb.stride = fb->pitches[0 ];
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -4
@@ -506,7 +506,7 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)* arises: do we still need this and if so how should we go about * invalidating the TLB? */ -if (INTEL_GEN (dev_priv) >=6 &&INTEL_GEN (dev_priv) <8 ) { +if (IS_GEN (dev_priv,6 ,7 )) {i915_reg_t reg =RING_INSTPM (engine->mmio_base);/* ring should be idle before issuing a sync flush*/
@@ -1206,7 +1206,7 @@ static int init_render_ring(struct intel_engine_cs *engine)return ret;/* WaTimedSingleVertexDispatch:cl,bw,ctg,elk,ilk,snb */ -if (INTEL_GEN (dev_priv) >=4 &&INTEL_GEN (dev_priv) <7 ) +if (IS_GEN (dev_priv,4 ,6 ))I915_WRITE (MI_MODE ,_MASKED_BIT_ENABLE (VS_TIMER_DISPATCH ));/* We need to disable the AsyncFlip performance optimisations in order
@@ -1215,7 +1215,7 @@ static int init_render_ring(struct intel_engine_cs *engine)* * WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv */ -if (INTEL_GEN (dev_priv) >=6 &&INTEL_GEN (dev_priv) <8 ) +if (IS_GEN (dev_priv,6 ,7 ))I915_WRITE (MI_MODE ,_MASKED_BIT_ENABLE (ASYNC_FLIP_PERF_DISABLE ));/* Required for the hardware to program scanline values for waiting */
@@ -1240,7 +1240,7 @@ static int init_render_ring(struct intel_engine_cs *engine) _MASKED_BIT_DISABLE(CM0_STC_EVICT_DISABLE_LRA_SNB)); } -if (INTEL_GEN (dev_priv) >=6 &&INTEL_GEN (dev_priv) <8 ) +if (IS_GEN (dev_priv,6 ,7 ))I915_WRITE (INSTPM ,_MASKED_BIT_ENABLE (INSTPM_FORCE_ORDERING ));if (HAS_L3_DPF (dev_priv))
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: Introduce IS_GEN macro
Quoted 10 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
To be used for more efficient Gen range checking.
v2: Remove spurious chunk. (Chris Wilson)
v3: Rebase.
v4: Renamed fromINTEL_GEN_RANGEand addedGEN_FOREVER.Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]> (v3)
Quoted 97 lines
Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>Cc Dave Gordon <[email protected]>---
drivers/gpu/drm/i915/i915_drv.h | 22 +++++++++++++++++++++- drivers/gpu/drm/i915/intel_fbc.c | 2 +-drivers/gpu/drm/i915/intel_ringbuffer.c| 8 ++++----3 files changed, 26 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -2519,9 +2519,29 @@ struct drm_i915_cmd_table { #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)
#defineREVID_FOREVER0xffdrivers/gpu/drm/i915/i915_drv.h +21
-0+#define INTEL_REVID (p) (__I915__(p)->dev->pdev->revision) + +#define GEN_FOREVER (0) +/* +* Returns true if Gen is in inclusive range [Start, End]. +* +* Use GEN_FOREVER for unbound start and or end. +*/ +#define IS_GEN (p, s, e) ({ \ + unsigned int __s = (s), __e = (e); \ + BUILD_BUG_ON(!__builtin_constant_p(s)); \ + BUILD_BUG_ON(!__builtin_constant_p(e)); \ + if ((__s) != GEN_FOREVER) \ + __s = (s) - 1; \ + if ((__e) == GEN_FOREVER) \ + __e = BITS_PER_LONG - 1; \ + else \ + __e = (e) - 1; \ + !!(INTEL_INFO(p)->gen_mask & GENMASK((__e), (__s))); \ +}) +/*
* Return true if revision is in range [since,until] inclusive. *drivers/gpu/drm/i915/intel_fbc.c +0
-0@@ -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. */drivers/gpu/drm/i915/intel_fbc.c +1
-1-if (INTEL_INFO (dev_priv)->gen >=5 &&INTEL_INFO (dev_priv)->gen <7 ) +if (IS_GEN (dev_priv,5 ,6 ))
cache->fb.ilk_ggtt_offset=i915_gem_obj_ggtt_offset(obj);cache->fb.pixel_format=fb->pixel_format;cache->fb.stride= fb->pitches[0];drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -506,7 +506,7 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)* arises: do we still need this and if so how should we go about * invalidating the TLB? */ -if (INTEL_GEN (dev_priv) >=6 &&INTEL_GEN (dev_priv) <8 ) { +if (IS_GEN (dev_priv,6 ,7 )) { i915_reg_t reg = RING_INSTPM(engine->mmio_base);
/* ring should be idle before issuing a sync flush*/drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -1206,7 +1206,7 @@ static int init_render_ring(struct intel_engine_cs *engine) return ret;
/* WaTimedSingleVertexDispatch:cl,bw,ctg,elk,ilk,snb */drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1-if (INTEL_GEN (dev_priv) >=4 &&INTEL_GEN (dev_priv) <7 ) +if (IS_GEN (dev_priv,4 ,6 ))
I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(VS_TIMER_DISPATCH));
/* We need to disable the AsyncFlip performance optimisations in orderdrivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -1215,7 +1215,7 @@ static int init_render_ring(struct intel_engine_cs *engine)* * WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv */ -if (INTEL_GEN (dev_priv) >=6 &&INTEL_GEN (dev_priv) <8 ) +if (IS_GEN (dev_priv,6 ,7 )) I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE));
/* Required for the hardware to program scanline values for waiting */drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -1240,7 +1240,7 @@ static int init_render_ring(struct intel_engine_cs *engine) _MASKED_BIT_DISABLE(CM0_STC_EVICT_DISABLE_LRA_SNB)); }drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1-if (INTEL_GEN (dev_priv) >=6 &&INTEL_GEN (dev_priv) <8 ) +if (IS_GEN (dev_priv,6 ,7 ))
I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
if (HAS_L3_DPF(dev_priv))
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Ro.CI.BAT: success for series starting with [1/5] drm/i915: Make IS_GENx macros work on a mask
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [1/5] drm/i915: Make IS_GENx macros work on a mask
URL : https://patchwork.freedesktop.org/series/6960/
State : success
== Summary ==
Series 6960v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/6960/revisions/1/mbox
ro-bdw-i5-5250u total:219 pass:202 dwarn:4 dfail:0 fail:0 skip:13 ro-bdw-i7-5600u total:219 pass:187 dwarn:0 dfail:0 fail:0 skip:32 ro-bsw-n3050 total:219 pass:174 dwarn:0 dfail:0 fail:3 skip:42 ro-byt-n2820 total:218 pass:173 dwarn:0 dfail:0 fail:4 skip:41 ro-hsw-i3-4010u total:218 pass:193 dwarn:0 dfail:0 fail:0 skip:25 ro-hsw-i7-4770r total:219 pass:194 dwarn:0 dfail:0 fail:0 skip:25 ro-ilk-i7-620lm total:219 pass:151 dwarn:0 dfail:0 fail:1 skip:67 ro-ilk1-i5-650 total:214 pass:151 dwarn:0 dfail:0 fail:2 skip:61 ro-ivb-i7-3770 total:219 pass:183 dwarn:0 dfail:0 fail:0 skip:36 ro-ivb2-i7-3770 total:219 pass:186 dwarn:0 dfail:0 fail:1 skip:32 ro-skl-i7-6700hq total:214 pass:190 dwarn:0 dfail:0 fail:0 skip:24 ro-snb-i7-2620M total:219 pass:177 dwarn:0 dfail:0 fail:1 skip:41
ro-bdw-i7-5557U failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_853/
2d4abf3 drm-intel-nightly: 2016y-05m-10d-09h-36m-54s UTC integration manifest 297c061 drm/i915: Introduce IS_GEN macro
109b940 drm/i915: Do not use a bitfield for INTEL_INFO->num_pipes 9da72cb drm/i915: Replace "INTEL_INFO->gen == x" checks with IS_GENx fc48dc0 drm/i915: Promote IS_BROADWELL to a simple macro
714dc4c drm/i915: Make IS_GENx macros work on a mask
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Ro.CI.BAT: success for series starting with [1/5] drm/i915: Make IS_GENx macros work on a mask
Quoted 26 lines · Patchwork
== Series Details ==
Series: series starting with [1/5] drm/i915: Make
IS_GENxmacros work on a mask
URL : https://patchwork.freedesktop.org/series/6960/
State : success== Summary ==
Series 6960v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/6960/revisions/1/mboxro-bdw-i5-5250u total:219 pass:202 dwarn:4 dfail:0 fail:0 skip:13 ro-bdw-i7-5600u total:219 pass:187 dwarn:0 dfail:0 fail:0 skip:32 ro-bsw-n3050 total:219 pass:174 dwarn:0 dfail:0 fail:3 skip:42 ro-byt-n2820 total:218 pass:173 dwarn:0 dfail:0 fail:4 skip:41 ro-hsw-i3-4010u total:218 pass:193 dwarn:0 dfail:0 fail:0 skip:25 ro-hsw-i7-4770r total:219 pass:194 dwarn:0 dfail:0 fail:0 skip:25 ro-ilk-i7-620lm total:219 pass:151 dwarn:0 dfail:0 fail:1 skip:67 ro-ilk1-i5-650 total:214 pass:151 dwarn:0 dfail:0 fail:2 skip:61 ro-ivb-i7-3770 total:219 pass:183 dwarn:0 dfail:0 fail:0 skip:36 ro-ivb2-i7-3770 total:219 pass:186 dwarn:0 dfail:0 fail:1 skip:32 ro-skl-i7-6700hq total:214 pass:190 dwarn:0 dfail:0 fail:0 skip:24 ro-snb-i7-2620M total:219 pass:177 dwarn:0 dfail:0 fail:1 skip:41ro-bdw-i7-5557U failed to connect after reboot
Quoted 8 lines
Results at /archive/results/CI_IGT_test/RO_Patchwork_853/
2d4abf3 drm-intel-nightly: 2016y-05m-10d-09h-36m-54s UTC integration manifest 297c061 drm/i915: Introduce
IS_GENmacro
109b940 drm/i915: Do not use a bitfield forINTEL_INFO->num_pipes9da72cb drm/i915: Replace "INTEL_INFO->gen== x" checks withIS_GENxfc48dc0 drm/i915: PromoteIS_BROADWELLto a simple macro
714dc4c drm/i915: MakeIS_GENxmacros work on a mask
5/5 needs an r-b if anyone is in the mood and then the series is good to merge.
Thanks,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx