drm/i915/gt: convert to struct drm_device based logging macros.
Subsystems (2)
cover drm/i915/gt: convert to struct drm_device based logging macros.
This patchset continues the conversion of printk based macros to use the struct drm_device based drm logging macros focused on the i915/gt folder.
These patches were achieved using both coccinelle and manually.
Wambui Karuga (7):
drm/i915/ggtt: convert to drm_device based logging macros. drm/i915/lrc: convert to struct drm_device based logging macros. drm/i915/rc6: convert to struct drm_device based logging macros. drm/i915/renderstate: use struct drm_device based logging macros. drm/i915/ring_submission: use drm_device based logging macros. drm/i915/rps: use struct drm_device based logging macros. drm/i915/workarounds: convert to drm_device based logging macros.
drivers/gpu/drm/i915/gt/intel_ggtt.c | 38 ++++++---- drivers/gpu/drm/i915/gt/intel_lrc.c | 14 ++-- drivers/gpu/drm/i915/gt/intel_rc6.c | 35 +++++---- drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- .../gpu/drm/i915/gt/intel_ring_submission.c | 33 ++++---- drivers/gpu/drm/i915/gt/intel_rps.c | 75 +++++++++---------- drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +- 7 files changed, 110 insertions(+), 94 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/7 drm/i915/ggtt: convert to drm_device based logging macros.
Converts various instances of the printk based drm logging macros to use the struct drm_device based logging macros in i915/gt/intel_ggtt.c. This change was done using the following coccinelle script that matches based on the existence of a drm_i915_private device:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were fixed manually.
Note that this converts DRM_DEBUG_DRIVER to drm_dbg()
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
--- drivers/gpu/drm/i915/gt/intel_ggtt.c | 38 ++++++++++++++++------------ 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/gt/intel_ggtt.c +22 -16
@@ -767,13 +767,13 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)else ggtt->gsm =ioremap_wc (phys_addr, size);if (!ggtt->gsm) { -DRM_ERROR ("Failed to map the ggtt page table\n" ); +drm_err (&i915->drm,"Failed to map the ggtt page table\n" );return -ENOMEM ; } ret =setup_scratch_page (&ggtt->vm,GFP_DMA32 );if (ret) { -DRM_ERROR ("Scratch setup failed\n" ); +drm_err (&i915->drm,"Scratch setup failed\n" );/* iounmap will also get called at remove, but meh */ iounmap (ggtt->gsm);return ret;
@@ -833,7 +833,8 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)if (!err) err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (39 ));if (err) -DRM_ERROR ("Can't set DMA mask/consistent mask (%d)\n" , err); +drm_err (&i915->drm, +"Can't set DMA mask/consistent mask (%d)\n" , err);pci_read_config_word (pdev,SNB_GMCH_CTRL , &snb_gmch_ctl);if (IS_CHERRYVIEW (i915))
@@ -980,7 +981,8 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)* just a coarse sanity check. */ if (ggtt->mappable_end < (64 <<20 ) || ggtt->mappable_end > (512 <<20 )) { -DRM_ERROR ("Unknown GMADR size (%pa)\n" , &ggtt->mappable_end); +drm_err (&i915->drm,"Unknown GMADR size (%pa)\n" , + &ggtt->mappable_end);return -ENXIO ; }
@@ -988,7 +990,8 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)if (!err) err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (40 ));if (err) -DRM_ERROR ("Can't set DMA mask/consistent mask (%d)\n" , err); +drm_err (&i915->drm, +"Can't set DMA mask/consistent mask (%d)\n" , err);pci_read_config_word (pdev,SNB_GMCH_CTRL , &snb_gmch_ctl); size =gen6_get_total_gtt_size (snb_gmch_ctl);
@@ -1035,7 +1038,7 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) ret =intel_gmch_probe (i915->bridge_dev, i915->drm.pdev,NULL );if (!ret) { -DRM_ERROR ("failed to set up gmch\n" ); +drm_err (&i915->drm,"failed to set up gmch\n" );return -EIO ; }
@@ -1083,26 +1086,29 @@ static int ggtt_probe_hw(struct i915_ggtt *ggtt, struct intel_gt *gt)return ret;if ((ggtt->vm.total -1 ) >>32 ) { -DRM_ERROR ("We never expected a Global GTT with more than 32bits" -" of address space! Found %lldM!\n" , - ggtt->vm.total >>20 ); +drm_err (&i915->drm, +"We never expected a Global GTT with more than 32bits" +" of address space! Found %lldM!\n" , + ggtt->vm.total >>20 ); ggtt->vm.total =1ULL <<32 ; ggtt->mappable_end =min_t (u64, ggtt->mappable_end, ggtt->vm.total); }if (ggtt->mappable_end > ggtt->vm.total) { -DRM_ERROR ("mappable aperture extends past end of GGTT," -" aperture=%pa, total=%llx\n" , - &ggtt->mappable_end, ggtt->vm.total); +drm_err (&i915->drm, +"mappable aperture extends past end of GGTT," +" aperture=%pa, total=%llx\n" , + &ggtt->mappable_end, ggtt->vm.total); ggtt->mappable_end = ggtt->vm.total; }/* GMADR is the PCI mmio aperture into the global GTT. */ -DRM_DEBUG_DRIVER ("GGTT size = %lluM\n" , ggtt->vm.total >>20 ); -DRM_DEBUG_DRIVER ("GMADR size = %lluM\n" , (u64 )ggtt->mappable_end >>20 ); -DRM_DEBUG_DRIVER ("DSM size = %lluM\n" , - (u64 )resource_size (&intel_graphics_stolen_res) >>20 ); +drm_dbg (&i915->drm,"GGTT size = %lluM\n" , ggtt->vm.total >>20 ); +drm_dbg (&i915->drm,"GMADR size = %lluM\n" , + (u64 )ggtt->mappable_end >>20 ); +drm_dbg (&i915->drm,"DSM size = %lluM\n" , + (u64 )resource_size (&intel_graphics_stolen_res) >>20 );return 0 ; }
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/7 drm/i915/lrc: convert to struct drm_device based logging macros.
In reply to Wambui KarugaConvert various instances of the printk based drm logging macros to the struct drm_device based logging macros.
Note that this converts DRM_DEBUG_DRIVER() to drm_dbg() but does not convert DRM_DEBUG() due to the lack of an analogous drm_device based macro.
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
--- drivers/gpu/drm/i915/gt/intel_lrc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gt/intel_lrc.c +9 -5
@@ -3432,7 +3432,8 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine) ret =lrc_setup_wa_ctx (engine);if (ret) { -DRM_DEBUG_DRIVER ("Failed to setup context WA page: %d\n" , ret); +drm_dbg (&engine->i915->drm, +"Failed to setup context WA page: %d\n" , ret);return ret; }
@@ -3539,7 +3540,8 @@ static bool unexpected_starting_state(struct intel_engine_cs *engine)bool unexpected = false;if (ENGINE_READ_FW (engine,RING_MI_MODE ) &STOP_RING ) { -DRM_DEBUG_DRIVER ("STOP_RING still set in RING_MI_MODE\n" ); +drm_dbg (&engine->i915->drm, +"STOP_RING still set in RING_MI_MODE\n" ); unexpected = true; }
@@ -4483,7 +4485,7 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine)* because we only expect rare glitches but nothing * critical to prevent us from using GPU */ -DRM_ERROR ("WA batch buffer initialization failed\n" ); +drm_err (&i915->drm,"WA batch buffer initialization failed\n" );if (HAS_LOGICAL_RING_ELSQ (i915)) { execlists->submit_reg = uncore->regs +
@@ -4658,7 +4660,8 @@ populate_lr_context(struct intel_context *ce, vaddr =i915_gem_object_pin_map (ctx_obj,I915_MAP_WB );if (IS_ERR (vaddr)) { ret =PTR_ERR (vaddr); -DRM_DEBUG_DRIVER ("Could not map object pages! (%d)\n" , ret); +drm_dbg (&engine->i915->drm, +"Could not map object pages! (%d)\n" , ret);return ret; }
@@ -4751,7 +4754,8 @@ static int __execlists_context_alloc(struct intel_context *ce, ret =populate_lr_context (ce, ctx_obj, engine, ring);if (ret) { -DRM_DEBUG_DRIVER ("Failed to populate LRC: %d\n" , ret); +drm_dbg (&engine->i915->drm, +"Failed to populate LRC: %d\n" , ret); goto error_ring_free; }
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/7 drm/i915/rc6: convert to struct drm_device based logging macros.
In reply to Wambui KarugaConverts various instances of the printk based drm logging macros to use the struct drm_device logging macros. This also involves extracting the drm_i915_private device from intel types in some cases.
Note that this converts DRM_DEBUG_DRIVER() to drm_dbg().
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
--- drivers/gpu/drm/i915/gt/intel_rc6.c | 35 ++++++++++++++++------------- 1 file changed, 20 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/gt/intel_rc6.c +20 -15
@@ -246,16 +246,18 @@ static void gen6_rc6_enable(struct intel_rc6 *rc6) ret =sandybridge_pcode_read (i915,GEN6_PCODE_READ_RC6VIDS , &rc6vids,NULL );if (IS_GEN (i915,6 ) && ret) { -DRM_DEBUG_DRIVER ("Couldn't check for BIOS workaround\n" ); +drm_dbg (&i915->drm,"Couldn't check for BIOS workaround\n" ); }else if (IS_GEN (i915,6 ) && (GEN6_DECODE_RC6_VID (rc6vids &0xff ) <450 )) { -DRM_DEBUG_DRIVER ("You should update your BIOS. Correcting minimum rc6 voltage (%dmV->%dmV)\n" , -GEN6_DECODE_RC6_VID (rc6vids &0xff ),450 ); +drm_dbg (&i915->drm, +"You should update your BIOS. Correcting minimum rc6 voltage (%dmV->%dmV)\n" , +GEN6_DECODE_RC6_VID (rc6vids &0xff ),450 ); rc6vids &=0xffff00 ; rc6vids |=GEN6_ENCODE_RC6_VID (450 ); ret =sandybridge_pcode_write (i915,GEN6_PCODE_WRITE_RC6VIDS , rc6vids);if (ret) -DRM_ERROR ("Couldn't fix incorrect rc6 voltage\n" ); +drm_err (&i915->drm, +"Couldn't fix incorrect rc6 voltage\n" ); } }
@@ -263,14 +265,15 @@ static void gen6_rc6_enable(struct intel_rc6 *rc6)static int chv_rc6_init (struct intel_rc6 *rc6) {struct intel_uncore *uncore =rc6_to_uncore (rc6); +struct drm_i915_private *i915 =rc6_to_i915 (rc6);resource_size_t pctx_paddr, paddr;resource_size_t pctx_size =32 *SZ_1K ;u32 pcbr; pcbr =intel_uncore_read (uncore,VLV_PCBR );if ((pcbr >>VLV_PCBR_ADDR_SHIFT ) ==0 ) { -DRM_DEBUG_DRIVER ("BIOS didn't set up PCBR, fixing up\n" ); - paddr =rc6_to_i915 (rc6)->dsm.end +1 - pctx_size; +drm_dbg (&i915->drm,"BIOS didn't set up PCBR, fixing up\n" ); + paddr = i915->dsm.end +1 - pctx_size;GEM_BUG_ON (paddr >U32_MAX ); pctx_paddr = (paddr & ~4095 );
@@ -304,7 +307,7 @@ static int vlv_rc6_init(struct intel_rc6 *rc6) goto out; } -DRM_DEBUG_DRIVER ("BIOS didn't set up PCBR, fixing up\n" ); +drm_dbg (&i915->drm,"BIOS didn't set up PCBR, fixing up\n" );/* * From the Gunit register HAS:
@@ -316,7 +319,8 @@ static int vlv_rc6_init(struct intel_rc6 *rc6)*/ pctx =i915_gem_object_create_stolen (i915, pctx_size);if (IS_ERR (pctx)) { -DRM_DEBUG ("not enough stolen space for PCTX, disabling\n" ); +drm_dbg (&i915->drm, +"not enough stolen space for PCTX, disabling\n" );return PTR_ERR (pctx); }
@@ -398,14 +402,14 @@ static bool bxt_check_bios_rc6_setup(struct intel_rc6 *rc6) rc_sw_target =intel_uncore_read (uncore,GEN6_RC_STATE ); rc_sw_target &=RC_SW_TARGET_STATE_MASK ; rc_sw_target >>=RC_SW_TARGET_STATE_SHIFT ; -DRM_DEBUG_DRIVER ("BIOS enabled RC states: " +drm_dbg (&i915->drm,"BIOS enabled RC states: " "HW_CTRL %s HW_RC6 %s SW_TARGET_STATE %x\n" ,onoff (rc_ctl &GEN6_RC_CTL_HW_ENABLE ),onoff (rc_ctl &GEN6_RC_CTL_RC6_ENABLE ), rc_sw_target);if (!(intel_uncore_read (uncore,RC6_LOCATION ) &RC6_CTX_IN_DRAM )) { -DRM_DEBUG_DRIVER ("RC6 Base location not set properly.\n" ); +drm_dbg (&i915->drm,"RC6 Base location not set properly.\n" ); enable_rc6 = false; }
@@ -417,7 +421,7 @@ static bool bxt_check_bios_rc6_setup(struct intel_rc6 *rc6)intel_uncore_read (uncore,RC6_CTX_BASE ) &RC6_CTX_BASE_MASK ;if (!(rc6_ctx_base >= i915->dsm_reserved.start && rc6_ctx_base +PAGE_SIZE < i915->dsm_reserved.end)) { -DRM_DEBUG_DRIVER ("RC6 Base address not as expected.\n" ); +drm_dbg (&i915->drm,"RC6 Base address not as expected.\n" ); enable_rc6 = false; }
@@ -425,24 +429,25 @@ static bool bxt_check_bios_rc6_setup(struct intel_rc6 *rc6) (intel_uncore_read(uncore, PWRCTX_MAXCNT_VCSUNIT0) & IDLE_TIME_MASK) > 1 && (intel_uncore_read(uncore, PWRCTX_MAXCNT_BCSUNIT) & IDLE_TIME_MASK) > 1 && (intel_uncore_read(uncore, PWRCTX_MAXCNT_VECSUNIT) & IDLE_TIME_MASK) > 1)) { -DRM_DEBUG_DRIVER ("Engine Idle wait time not set properly.\n" ); +drm_dbg (&i915->drm, +"Engine Idle wait time not set properly.\n" ); enable_rc6 = false; }if (!intel_uncore_read (uncore,GEN8_PUSHBUS_CONTROL ) || !intel_uncore_read (uncore,GEN8_PUSHBUS_ENABLE ) || !intel_uncore_read (uncore,GEN8_PUSHBUS_SHIFT )) { -DRM_DEBUG_DRIVER ("Pushbus not setup properly.\n" ); +drm_dbg (&i915->drm,"Pushbus not setup properly.\n" ); enable_rc6 = false; }if (!intel_uncore_read (uncore,GEN6_GFXPAUSE )) { -DRM_DEBUG_DRIVER ("GFX pause not setup properly.\n" ); +drm_dbg (&i915->drm,"GFX pause not setup properly.\n" ); enable_rc6 = false; }if (!intel_uncore_read (uncore,GEN8_MISC_CTRL0 )) { -DRM_DEBUG_DRIVER ("GPM control not setup properly.\n" ); +drm_dbg (&i915->drm,"GPM control not setup properly.\n" ); enable_rc6 = false; }
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/7 drm/i915/renderstate: use struct drm_device based logging macros.
In reply to Wambui KarugaReplace the use of the printk based drm logging macros with the struct drm_device based logging macros.
--- drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_renderstate.c +1 -1
@@ -102,7 +102,7 @@ static int render_state_setup(struct intel_renderstate *so, }if (rodata->reloc[reloc_index] !=-1 ) { -DRM_ERROR ("only %d relocs resolved\n" , reloc_index); +drm_err (&i915->drm,"only %d relocs resolved\n" , reloc_index); goto err; }
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/7 drm/i915/ring_submission: use drm_device based logging macros.
In reply to Wambui KarugaReplace the use of printk based drm logging macros to the struct drm_device based logging macros in i915/gt/intel_ring_submission.c. This was done using the following semantic patch that transforms based on the existence of a drm_i915_private device:
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were fixed manually.
Note that this converts DRM_DEBUG_DRIVER to drm_dbg().
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
--- .../gpu/drm/i915/gt/intel_ring_submission.c | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/gt/intel_ring_submission.c +18 -15
@@ -577,8 +577,9 @@ static void flush_cs_tlb(struct intel_engine_cs *engine) RING_INSTPM(engine->mmio_base), INSTPM_SYNC_FLUSH, 0, 1000)) -DRM_ERROR ("%s: wait for SyncFlush to complete for TLB invalidation timed out\n" , - engine->name); +drm_err (&dev_priv->drm, +"%s: wait for SyncFlush to complete for TLB invalidation timed out\n" , + engine->name); }static void ring_setup_status_page (struct intel_engine_cs *engine)
@@ -601,8 +602,9 @@ static bool stop_ring(struct intel_engine_cs *engine) MODE_IDLE, MODE_IDLE, 1000)) { -DRM_ERROR ("%s : timed out trying to stop ring\n" , - engine->name); +drm_err (&dev_priv->drm, +"%s : timed out trying to stop ring\n" , + engine->name);/* * Sometimes we observe that the idle flag is not
@@ -661,22 +663,23 @@ static int xcs_resume(struct intel_engine_cs *engine)/* WaClearRingBufHeadRegAtInit:ctg,elk */ if (!stop_ring (engine)) {/* G45 ring initialization often fails to reset head to zero */ -DRM_DEBUG_DRIVER ("%s head not reset to zero " +drm_dbg (&dev_priv->drm,"%s head not reset to zero " +"ctl %08x head %08x tail %08x start %08x\n" , + engine->name, +ENGINE_READ (engine,RING_CTL ), +ENGINE_READ (engine,RING_HEAD ), +ENGINE_READ (engine,RING_TAIL ), +ENGINE_READ (engine,RING_START )); + +if (!stop_ring (engine)) { +drm_err (&dev_priv->drm, +"failed to set %s head to zero " "ctl %08x head %08x tail %08x start %08x\n" , engine->name,ENGINE_READ (engine,RING_CTL ),ENGINE_READ (engine,RING_HEAD ),ENGINE_READ (engine,RING_TAIL ),ENGINE_READ (engine,RING_START )); - -if (!stop_ring (engine)) { -DRM_ERROR ("failed to set %s head to zero " -"ctl %08x head %08x tail %08x start %08x\n" , - engine->name, -ENGINE_READ (engine,RING_CTL ), -ENGINE_READ (engine,RING_HEAD ), -ENGINE_READ (engine,RING_TAIL ), -ENGINE_READ (engine,RING_START )); ret = -EIO ; goto out; }
@@ -719,7 +722,7 @@ static int xcs_resume(struct intel_engine_cs *engine) RING_CTL(engine->mmio_base), RING_VALID, RING_VALID, 50)) { - DRM_ERROR("%s initialization failed " + drm_err(&dev_priv->drm, "%s initialization failed " "ctl %08x (valid? %d) head %08x [%08x] tail %08x [%08x] start %08x [expected %08x]\n", engine->name, ENGINE_READ(engine, RING_CTL),
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/7 drm/i915/rps: use struct drm_device based logging macros.
In reply to Wambui KarugaReplace the use of the printk based drm logging macros with the struct drm_device based logging macros in i915/gt/intel_rps.c. This also involves extracting the drm_i915_private device pointer from various intel types.
This converts the instances of DRM_DEBUG_DRIVER to drm_dbg() while not converting DRM_DEBUG() instances due to the lack of an analogous drm_device based macro.
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
--- drivers/gpu/drm/i915/gt/intel_rps.c | 75 ++++++++++++++--------------- 1 file changed, 36 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/gt/intel_rps.c +36 -39
@@ -183,8 +183,8 @@ static void gen5_rps_init(struct intel_rps *rps) fmin = (rgvmodectl &MEMMODE_FMIN_MASK ); fstart = (rgvmodectl &MEMMODE_FSTART_MASK ) >>MEMMODE_FSTART_SHIFT ; -DRM_DEBUG_DRIVER ("fmax: %d, fmin: %d, fstart: %d\n" , - fmax, fmin, fstart); +drm_dbg (&i915->drm,"fmax: %d, fmin: %d, fstart: %d\n" , + fmax, fmin, fstart); rps->min_freq = fmax; rps->max_freq = fmin;
@@ -453,7 +453,8 @@ static bool gen5_rps_enable(struct intel_rps *rps)if (wait_for_atomic ((intel_uncore_read (uncore,MEMSWCTL ) &MEMCTL_CMD_STS ) ==0 ,10 )) -DRM_ERROR ("stuck trying to change perf mode\n" ); +drm_err (&uncore->i915->drm, +"stuck trying to change perf mode\n" );mdelay (1 );gen5_rps_set (rps, rps->cur_freq);
@@ -880,12 +881,13 @@ static void gen6_rps_init(struct intel_rps *rps)static bool rps_reset (struct intel_rps *rps) { +struct drm_i915_private *i915 =rps_to_i915 (rps);/* force a reset */ rps->power.mode =-1 ; rps->last_freq =-1 ;if (rps_set (rps, rps->min_freq, true)) { -DRM_ERROR ("Failed to reset RPS to initial values\n" ); +drm_err (&i915->drm,"Failed to reset RPS to initial values\n" );return false; }
@@ -1036,8 +1038,8 @@ static bool chv_rps_enable(struct intel_rps *rps)drm_WARN_ONCE (&i915->drm, (val &GPLLENABLE ) ==0 ,"GPLL not enabled\n" ); -DRM_DEBUG_DRIVER ("GPLL enabled? %s\n" ,yesno (val &GPLLENABLE )); -DRM_DEBUG_DRIVER ("GPU status: 0x%08x\n" , val); +drm_dbg (&i915->drm,"GPLL enabled? %s\n" ,yesno (val &GPLLENABLE )); +drm_dbg (&i915->drm,"GPU status: 0x%08x\n" , val);return rps_reset (rps); }
@@ -1134,8 +1136,8 @@ static bool vlv_rps_enable(struct intel_rps *rps)drm_WARN_ONCE (&i915->drm, (val &GPLLENABLE ) ==0 ,"GPLL not enabled\n" ); -DRM_DEBUG_DRIVER ("GPLL enabled? %s\n" ,yesno (val &GPLLENABLE )); -DRM_DEBUG_DRIVER ("GPU status: 0x%08x\n" , val); +drm_dbg (&i915->drm,"GPLL enabled? %s\n" ,yesno (val &GPLLENABLE )); +drm_dbg (&i915->drm,"GPU status: 0x%08x\n" , val);return rps_reset (rps); }
@@ -1292,7 +1294,8 @@ static void vlv_init_gpll_ref_freq(struct intel_rps *rps)CCK_GPLL_CLOCK_CONTROL , i915->czclk_freq); -DRM_DEBUG_DRIVER ("GPLL reference freq: %d kHz\n" , rps->gpll_ref_freq); +drm_dbg (&i915->drm,"GPLL reference freq: %d kHz\n" , + rps->gpll_ref_freq); }static void vlv_rps_init (struct intel_rps *rps)
@@ -1320,28 +1323,24 @@ static void vlv_rps_init(struct intel_rps *rps) i915->mem_freq =1333 ;break ; } -DRM_DEBUG_DRIVER ("DDR speed: %d MHz\n" , i915->mem_freq); +drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); rps->max_freq =vlv_rps_max_freq (rps); rps->rp0_freq = rps->max_freq; -DRM_DEBUG_DRIVER ("max GPU freq: %d MHz (%u)\n" , -intel_gpu_freq (rps, rps->max_freq), - rps->max_freq); +drm_dbg (&i915->drm,"max GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (rps, rps->max_freq), rps->max_freq); rps->efficient_freq =vlv_rps_rpe_freq (rps); -DRM_DEBUG_DRIVER ("RPe GPU freq: %d MHz (%u)\n" , -intel_gpu_freq (rps, rps->efficient_freq), - rps->efficient_freq); +drm_dbg (&i915->drm,"RPe GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (rps, rps->efficient_freq), rps->efficient_freq); rps->rp1_freq =vlv_rps_guar_freq (rps); -DRM_DEBUG_DRIVER ("RP1(Guar Freq) GPU freq: %d MHz (%u)\n" , -intel_gpu_freq (rps, rps->rp1_freq), - rps->rp1_freq); +drm_dbg (&i915->drm,"RP1(Guar Freq) GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (rps, rps->rp1_freq), rps->rp1_freq); rps->min_freq =vlv_rps_min_freq (rps); -DRM_DEBUG_DRIVER ("min GPU freq: %d MHz (%u)\n" , -intel_gpu_freq (rps, rps->min_freq), - rps->min_freq); +drm_dbg (&i915->drm,"min GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (rps, rps->min_freq), rps->min_freq); vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_PUNIT) |
@@ -1371,28 +1370,24 @@ static void chv_rps_init(struct intel_rps *rps) i915->mem_freq =1600 ;break ; } -DRM_DEBUG_DRIVER ("DDR speed: %d MHz\n" , i915->mem_freq); +drm_dbg (&i915->drm,"DDR speed: %d MHz\n" , i915->mem_freq); rps->max_freq =chv_rps_max_freq (rps); rps->rp0_freq = rps->max_freq; -DRM_DEBUG_DRIVER ("max GPU freq: %d MHz (%u)\n" , -intel_gpu_freq (rps, rps->max_freq), - rps->max_freq); +drm_dbg (&i915->drm,"max GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (rps, rps->max_freq), rps->max_freq); rps->efficient_freq =chv_rps_rpe_freq (rps); -DRM_DEBUG_DRIVER ("RPe GPU freq: %d MHz (%u)\n" , -intel_gpu_freq (rps, rps->efficient_freq), - rps->efficient_freq); +drm_dbg (&i915->drm,"RPe GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (rps, rps->efficient_freq), rps->efficient_freq); rps->rp1_freq =chv_rps_guar_freq (rps); -DRM_DEBUG_DRIVER ("RP1(Guar) GPU freq: %d MHz (%u)\n" , -intel_gpu_freq (rps, rps->rp1_freq), - rps->rp1_freq); +drm_dbg (&i915->drm,"RP1(Guar) GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (rps, rps->rp1_freq), rps->rp1_freq); rps->min_freq =chv_rps_min_freq (rps); -DRM_DEBUG_DRIVER ("min GPU freq: %d MHz (%u)\n" , -intel_gpu_freq (rps, rps->min_freq), - rps->min_freq); +drm_dbg (&i915->drm,"min GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (rps, rps->min_freq), rps->min_freq); vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_PUNIT) |
@@ -1455,6 +1450,7 @@ static void rps_work(struct work_struct *work) {struct intel_rps *rps =container_of (work,typeof (*rps), work);struct intel_gt *gt =rps_to_gt (rps); +struct drm_i915_private *i915 =rps_to_i915 (rps);bool client_boost = false;int new_freq, adj, min, max;u32 pm_iir =0 ;
@@ -1530,7 +1526,7 @@ static void rps_work(struct work_struct *work) new_freq =clamp_t (int, new_freq, min, max);if (intel_rps_set (rps, new_freq)) { -DRM_DEBUG_DRIVER ("Failed to set new GPU frequency\n" ); +drm_dbg (&i915->drm,"Failed to set new GPU frequency\n" ); rps->last_adj =0 ; }
@@ -1652,9 +1648,10 @@ void intel_rps_init(struct intel_rps *rps)sandybridge_pcode_read (i915,GEN6_READ_OC_PARAMS , ¶ms,NULL );if (params &BIT (31 )) {/* OC supported */ -DRM_DEBUG_DRIVER ("Overclocking supported, max: %dMHz, overclock: %dMHz\n" , - (rps->max_freq &0xff ) *50 , - (params &0xff ) *50 ); +drm_dbg (&i915->drm, +"Overclocking supported, max: %dMHz, overclock: %dMHz\n" , + (rps->max_freq &0xff ) *50 , + (params &0xff ) *50 ); rps->max_freq = params &0xff ; } }
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/7 drm/i915/workarounds: convert to drm_device based logging macros.
In reply to Wambui KarugaReplace the use of printk based drm logging macros with the struct drm_device based logging macros.
Note that this converts DRM_DEBUG_DRIVER() to drm_dbg().
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +4 -3
@@ -837,7 +837,7 @@ wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)intel_uncore_read (&i915->uncore,GEN10_MIRROR_FUSE3 ) &GEN10_L3BANK_MASK ; -DRM_DEBUG_DRIVER ("L3 fuse = %x\n" , l3_fuse); +drm_dbg (&i915->drm,"L3 fuse = %x\n" , l3_fuse); l3_en = ~(l3_fuse <<GEN10_L3BANK_PAIR_COUNT | l3_fuse); }else { l3_en = ~0 ;
@@ -846,7 +846,8 @@ wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal) slice =fls (sseu->slice_mask) -1 ; subslice =fls (l3_en &intel_sseu_get_subslices (sseu, slice));if (!subslice) { -DRM_WARN ("No common index found between subslice mask %x and L3 bank mask %x!\n" , +drm_warn (&i915->drm, +"No common index found between subslice mask %x and L3 bank mask %x!\n" ,intel_sseu_get_subslices (sseu, slice), l3_en); subslice =fls (l3_en);drm_WARN_ON (&i915->drm, !subslice);
@@ -861,7 +862,7 @@ wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal) mcr_mask =GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ; } -DRM_DEBUG_DRIVER ("MCR slice/subslice = %x\n" , mcr); +drm_dbg (&i915->drm,"MCR slice/subslice = %x\n" , mcr);wa_write_masked_or (wal,GEN8_MCR_SELECTOR , mcr_mask, mcr); }
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gt: convert to struct drm_device based logging macros.
In reply to Wambui Karuga== Series Details ==
== Series Details ==
Series: drm/i915/gt: convert to struct drm_device based logging macros.
URL : https://patchwork.freedesktop.org/series/74707/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 6cfa7991dd93 drm/i915/ggtt: convert to drm_device based logging macros. -:84: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #84: References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
total: 0 errors, 1 warnings, 0 checks, 89 lines checked0d578a154f1b drm/i915/lrc: convert to struct drm_device based logging macros.
-:14: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #14:
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
total: 0 errors, 1 warnings, 0 checks, 44 lines checked90332a78c06d drm/i915/rc6: convert to struct drm_device based logging macros.
-:13: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #13:
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
total: 0 errors, 1 warnings, 0 checks, 109 lines checked449bd50495fa drm/i915/renderstate: use struct drm_device based logging macros.ad89d4cdd325 drm/i915/ring_submission: use drm_device based logging macros.
-:85: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #85:
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
total: 0 errors, 1 warnings, 0 checks, 63 lines checkede344bc88a34c drm/i915/rps: use struct drm_device based logging macros.
-:15: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #15:
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
total: 0 errors, 1 warnings, 0 checks, 164 lines checked8dfd9a57f09d drm/i915/workarounds: convert to drm_device based logging macros.
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #12:
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
total: 0 errors, 1 warnings, 0 checks, 25 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: convert to struct drm_device based logging macros.
In reply to Wambui Karuga== Series Details ==
== Series Details ==
Series: drm/i915/gt: convert to struct drm_device based logging macros.
URL : https://patchwork.freedesktop.org/series/74707/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8137 -> Patchwork_16973
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/index.html
Known issues
------------
Here are the changes found in Patchwork_16973 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-tgl-y: [FAIL][1] ([CI#94]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/fi-tgl-y/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/fi-tgl-y/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-cfl-8700k: [INCOMPLETE][3] ([i915#656]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/fi-cfl-8700k/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/fi-cfl-8700k/igt@i915_selftest@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: [FAIL][5] ([i915#217]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/fi-icl-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/fi-icl-u2/igt@[email protected]
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
[i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
Participating hosts (48 -> 44)
------------------------------
Additional (2): fi-skl-6770hq fi-tgl-dsi
Missing (6): fi-kbl-soraka fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8137 -> Patchwork_16973
CI-20190529: 20190529
CI_DRM_8137: 5786b5e77cc17a1b494b9bdf3c3f29eedc2e2e7d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5510: e100092d50105463f58db531fa953c70cc58bb10 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16973: 8dfd9a57f09d583da9d2a6829720e9967f846bad @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
8dfd9a57f09d drm/i915/workarounds: convert to drm_device based logging macros. e344bc88a34c drm/i915/rps: use struct drm_device based logging macros. ad89d4cdd325 drm/i915/ring_submission: use drm_device based logging macros. 449bd50495fa drm/i915/renderstate: use struct drm_device based logging macros. 90332a78c06d drm/i915/rc6: convert to struct drm_device based logging macros. 0d578a154f1b drm/i915/lrc: convert to struct drm_device based logging macros. 6cfa7991dd93 drm/i915/ggtt: convert to drm_device based logging macros.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gt: convert to struct drm_device based logging macros.
In reply to Wambui Karuga== Series Details ==
== Series Details ==
Series: drm/i915/gt: convert to struct drm_device based logging macros.
URL : https://patchwork.freedesktop.org/series/74707/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8137_full -> Patchwork_16973_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_16973_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_16973_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16973_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_parallel@bcs0-fds:
- shard-kbl: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-kbl7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-kbl1/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@sysfs_preempt_timeout@timeout@rcs0}:
- shard-skl: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-skl7/igt@sysfs_preempt_timeout@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_8137_full and Patchwork_16973_full:
### New IGT tests (2) ###
* igt@sysfs_heartbeat_interval@nopreempt:
- Statuses :
- Exec time: [None] s
* igt@sysfs_timeslice_duration@timeout:
- Statuses :
- Exec time: [None] s
Known issues
------------
Here are the changes found in Patchwork_16973_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [PASS][4] -> [SKIP][5] ([fdo#112080]) +4 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb1/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb3/igt@[email protected]
* igt@gem_ctx_persistence@close-replace-race:
- shard-kbl: [PASS][6] -> [INCOMPLETE][7] ([i915#1402])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-kbl6/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-kbl4/igt@[email protected]
- shard-iclb: [PASS][8] -> [TIMEOUT][9] ([i915#1340])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb8/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb6/igt@[email protected]
- shard-skl: [PASS][10] -> [INCOMPLETE][11] ([i915#1402])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-skl6/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-skl10/igt@[email protected]
- shard-glk: [PASS][12] -> [INCOMPLETE][13] ([i915#1402] / [i915#58] / [k.org#198133])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-glk3/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-glk4/igt@[email protected]
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][14] -> [SKIP][15] ([fdo#110841])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb5/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb4/igt@[email protected]
* igt@gem_ctx_shared@q-independent-bsd2:
- shard-iclb: [PASS][16] -> [SKIP][17] ([fdo#109276]) +4 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb2/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb5/igt@[email protected]
* igt@gem_exec_schedule@implicit-read-write-render:
- shard-snb: [PASS][18] -> [INCOMPLETE][19] ([i915#82])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-snb4/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-snb4/igt@[email protected]
* igt@gem_exec_schedule@preempt-bsd:
- shard-iclb: [PASS][20] -> [SKIP][21] ([fdo#112146]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb8/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb1/igt@[email protected]
* igt@gem_exec_whisper@basic-fds-forked:
- shard-tglb: [PASS][22] -> [INCOMPLETE][23] ([i915#1318] / [i915#1401])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-tglb1/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-tglb5/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [PASS][24] -> [DMESG-WARN][25] ([i915#716])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-glk2/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-glk6/igt@[email protected]
* igt@i915_pm_rps@reset:
- shard-iclb: [PASS][26] -> [FAIL][27] ([i915#413])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb5/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb4/igt@[email protected]
* igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
- shard-glk: [PASS][28] -> [FAIL][29] ([i915#34])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-glk7/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-glk3/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][30] -> [FAIL][31] ([i915#1188])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-skl8/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-skl9/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-apl: [PASS][32] -> [DMESG-WARN][33] ([i915#180]) +3 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-apl3/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-apl2/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-kbl: [PASS][34] -> [DMESG-WARN][35] ([i915#180]) +5 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-kbl1/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-kbl7/igt@[email protected]
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][36] -> [SKIP][37] ([fdo#109441])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb5/igt@kms_psr@psr2_cursor_render.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][38] -> [FAIL][39] ([i915#31])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-apl2/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-apl2/igt@[email protected]
- shard-kbl: [PASS][40] -> [FAIL][41] ([i915#31])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-kbl7/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-kbl1/igt@[email protected]
* igt@perf@short-reads:
- shard-kbl: [PASS][42] -> [FAIL][43] ([i915#51])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-kbl4/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-kbl3/igt@[email protected]
#### Possible fixes ####
* igt@gem_busy@busy-vcs1:
- shard-iclb: [SKIP][44] ([fdo#112080]) -> [PASS][45] +9 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb5/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb4/igt@[email protected]
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][46] ([fdo#110854]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb8/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb1/igt@[email protected]
* igt@gem_exec_parallel@bcs0-fds:
- shard-apl: [FAIL][48] -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-apl6/igt@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-apl8/igt@[email protected]
- shard-iclb: [FAIL][50] -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb2/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb5/igt@[email protected]
- shard-skl: [FAIL][52] -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-skl1/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-skl6/igt@[email protected]
* igt@gem_exec_schedule@implicit-both-bsd2:
- shard-iclb: [SKIP][54] ([fdo#109276] / [i915#677]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb5/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [SKIP][56] ([i915#677]) -> [PASS][57] +2 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb1/igt@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb3/igt@[email protected]
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][58] ([fdo#112146]) -> [PASS][59] +1 similar issue
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb4/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb7/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-unsync:
- shard-hsw: [DMESG-WARN][60] ([fdo#111870]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw7/igt@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw2/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][62] ([i915#716]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-skl3/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-skl5/igt@[email protected]
* igt@i915_pm_dc@dc5-dpms:
- shard-iclb: [FAIL][64] ([i915#447]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb3/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb8/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [FAIL][66] ([i915#72]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-glk1/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-glk7/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-untiled:
- shard-skl: [FAIL][68] ([fdo#108145] / [i915#177] / [i915#52] / [i915#54]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-skl5/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-skl10/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-kbl: [DMESG-WARN][70] ([i915#180]) -> [PASS][71] +1 similar issue
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-kbl7/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-kbl1/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-apl: [DMESG-WARN][72] ([i915#180]) -> [PASS][73] +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-apl6/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-apl7/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][74] ([fdo#108145]) -> [PASS][75] +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-skl5/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-skl10/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][76] ([fdo#109642] / [fdo#111068]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb1/igt@kms_psr2_su@page_flip.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][78] ([fdo#109441]) -> [PASS][79]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb3/igt@kms_psr@psr2_primary_page_flip.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][80] ([fdo#109276]) -> [PASS][81] +11 similar issues
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-iclb8/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-iclb1/igt@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [SKIP][82] ([i915#468]) -> [FAIL][83] ([i915#454])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-tglb2/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-tglb3/igt@[email protected]
* igt@runner@aborted:
- shard-hsw: ([FAIL][84], [FAIL][85], [FAIL][86], [FAIL][87], [FAIL][88], [FAIL][89], [FAIL][90], [FAIL][91]) ([fdo#111870]) -> ([FAIL][92], [FAIL][93], [FAIL][94], [FAIL][95], [FAIL][96], [FAIL][97], [FAIL][98], [FAIL][99], [FAIL][100]) ([fdo#111870] / [i915#478])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw7/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw6/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw6/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw2/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw1/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw5/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw5/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-hsw2/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw5/igt@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw2/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw6/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw2/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw4/igt@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw5/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw1/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw5/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-hsw2/igt@[email protected]
- shard-kbl: [FAIL][101] ([i915#92]) -> ([FAIL][102], [FAIL][103]) ([i915#1389] / [i915#1402] / [i915#92])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-kbl3/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-kbl4/igt@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-kbl3/igt@[email protected]
- shard-skl: ([FAIL][104], [FAIL][105]) ([i915#69]) -> [FAIL][106] ([i915#1402] / [i915#69])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-skl3/igt@[email protected]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8137/shard-skl3/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/shard-skl10/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1318]: https://gitlab.freedesktop.org/drm/intel/issues/1318
[i915#1340]: https://gitlab.freedesktop.org/drm/intel/issues/1340
[i915#1389]: https://gitlab.freedesktop.org/drm/intel/issues/1389
[i915#1401]: https://gitlab.freedesktop.org/drm/intel/issues/1401
[i915#1402]: https://gitlab.freedesktop.org/drm/intel/issues/1402
[i915#177]: https://gitlab.freedesktop.org/drm/intel/issues/177
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#447]: https://gitlab.freedesktop.org/drm/intel/issues/447
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#478]: https://gitlab.freedesktop.org/drm/intel/issues/478
[i915#51]: https://gitlab.freedesktop.org/drm/intel/issues/51
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#58]: https://gitlab.freedesktop.org/drm/intel/issues/58
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8137 -> Patchwork_16973
CI-20190529: 20190529
CI_DRM_8137: 5786b5e77cc17a1b494b9bdf3c3f29eedc2e2e7d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5510: e100092d50105463f58db531fa953c70cc58bb10 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16973: 8dfd9a57f09d583da9d2a6829720e9967f846bad @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16973/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 4 lines · Wambui Karuga
This patchset continues the conversion of printk based macros to use the struct
drm_devicebased drm logging macros focused on the i915/gt folder.
These patches were achieved using both coccinelle and manually.
Pushed the lot, thanks for the patches.
BR,
Jani.
Quoted 18 lines
Wambui Karuga (7):
drm/i915/ggtt: convert todrm_devicebased logging macros. drm/i915/lrc: convert to structdrm_devicebased logging macros. drm/i915/rc6: convert to structdrm_devicebased logging macros. drm/i915/renderstate: use structdrm_devicebased logging macros. drm/i915/ring_submission: usedrm_devicebased logging macros. drm/i915/rps: use structdrm_devicebased logging macros. drm/i915/workarounds: convert todrm_devicebased logging macros.drivers/gpu/drm/i915/gt/intel_ggtt.c | 38 ++++++---- drivers/gpu/drm/i915/gt/intel_lrc.c | 14 ++-- drivers/gpu/drm/i915/gt/intel_rc6.c | 35 +++++---- drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- .../gpu/drm/i915/gt/intel_ring_submission.c | 33 ++++---- drivers/gpu/drm/i915/gt/intel_rps.c | 75 +++++++++---------- drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +- 7 files changed, 110 insertions(+), 94 deletions(-)
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx