drm/i915/display: conversion to drm_device based logging macros
Subsystems (3)
cover drm/i915/display: conversion to drm_device based logging macros
Rebase of Wambui's series [1] to drm-tip, with a couple of manual conversions included.
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/72760/
Wambui Karuga (10):
drm/i915/dsb: convert to drm_device based logging macros. drm/i915/fbc: convert to drm_device based logging macros. drm/i915/fbdev: convert to drm_device based logging. drm/i915/fifo_underrun: convert to drm_device based logging. drm/i915/gmbus: convert to drm_device based logging, drm/i915/hdcp: convert to struct drm_device based logging. drm/i915/hotplug: convert to drm_device based logging. drm/i915/lpe_audio: convert to drm_device based logging macros. drm/i915/lvds: convert to drm_device based logging macros. drm/i915/overlay: convert to drm_device based logging.
drivers/gpu/drm/i915/display/intel_dsb.c | 28 +++--- drivers/gpu/drm/i915/display/intel_fbc.c | 30 +++--- drivers/gpu/drm/i915/display/intel_fbdev.c | 96 +++++++++++-------- .../drm/i915/display/intel_fifo_underrun.c | 29 +++--- drivers/gpu/drm/i915/display/intel_gmbus.c | 33 ++++--- drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 40 ++++---- .../gpu/drm/i915/display/intel_lpe_audio.c | 23 +++-- drivers/gpu/drm/i915/display/intel_lvds.c | 43 +++++---- drivers/gpu/drm/i915/display/intel_overlay.c | 11 ++- 10 files changed, 195 insertions(+), 141 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/10 drm/i915/dsb: convert to drm_device based logging macros.
From: Wambui Karuga <[email protected]>
This converts uses of the printk based drm logging macros to the struct drm_device logging macros in i915/display/intel_dsb.c. This was done using the following coccinelle script:
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
Checkpatch warnings were fixed manually.
--- drivers/gpu/drm/i915/display/intel_dsb.c | 28 ++++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_dsb.c +16 -12
@@ -52,7 +52,7 @@ static inline bool intel_dsb_enable_engine(struct intel_dsb *dsb) dsb_ctrl =intel_de_read (dev_priv,DSB_CTRL (pipe, dsb->id));if (DSB_STATUS & dsb_ctrl) { -DRM_DEBUG_KMS ("DSB engine is busy.\n" ); +drm_dbg_kms (&dev_priv->drm,"DSB engine is busy.\n" );return false; }
@@ -72,7 +72,7 @@ static inline bool intel_dsb_disable_engine(struct intel_dsb *dsb) dsb_ctrl =intel_de_read (dev_priv,DSB_CTRL (pipe, dsb->id));if (DSB_STATUS & dsb_ctrl) { -DRM_DEBUG_KMS ("DSB engine is busy.\n" ); +drm_dbg_kms (&dev_priv->drm,"DSB engine is busy.\n" );return false; }
@@ -115,20 +115,20 @@ intel_dsb_get(struct intel_crtc *crtc) obj =i915_gem_object_create_internal (i915,DSB_BUF_SIZE );if (IS_ERR (obj)) { -DRM_ERROR ("Gem object creation failed\n" ); +drm_err (&i915->drm,"Gem object creation failed\n" ); goto out; } vma =i915_gem_object_ggtt_pin (obj,NULL ,0 ,0 ,0 );if (IS_ERR (vma)) { -DRM_ERROR ("Vma creation failed\n" ); +drm_err (&i915->drm,"Vma creation failed\n" );i915_gem_object_put (obj); goto out; } buf =i915_gem_object_pin_map (vma->obj,I915_MAP_WC );if (IS_ERR (buf)) { -DRM_ERROR ("Command buffer creation failed\n" ); +drm_err (&i915->drm,"Command buffer creation failed\n" ); goto out; }
@@ -203,7 +203,7 @@ void intel_dsb_indexed_reg_write(struct intel_dsb *dsb, i915_reg_t reg, }if (drm_WARN_ON (&dev_priv->drm, dsb->free_pos >=DSB_BUF_SIZE )) { -DRM_DEBUG_KMS ("DSB buffer overflow\n" ); +drm_dbg_kms (&dev_priv->drm,"DSB buffer overflow\n" );return ; }
@@ -277,7 +277,7 @@ void intel_dsb_reg_write(struct intel_dsb *dsb, i915_reg_t reg, u32 val) }if (drm_WARN_ON (&dev_priv->drm, dsb->free_pos >=DSB_BUF_SIZE )) { -DRM_DEBUG_KMS ("DSB buffer overflow\n" ); +drm_dbg_kms (&dev_priv->drm,"DSB buffer overflow\n" );return ; }
@@ -310,7 +310,8 @@ void intel_dsb_commit(struct intel_dsb *dsb) goto reset;if (is_dsb_busy (dsb)) { -DRM_ERROR ("HEAD_PTR write failed - dsb engine is busy.\n" ); +drm_err (&dev_priv->drm, +"HEAD_PTR write failed - dsb engine is busy.\n" ); goto reset; } intel_de_write(dev_priv, DSB_HEAD(pipe, dsb->id),
@@ -322,15 +323,18 @@ void intel_dsb_commit(struct intel_dsb *dsb) (tail - dsb->free_pos * 4));if (is_dsb_busy (dsb)) { -DRM_ERROR ("TAIL_PTR write failed - dsb engine is busy.\n" ); +drm_err (&dev_priv->drm, +"TAIL_PTR write failed - dsb engine is busy.\n" ); goto reset; } -DRM_DEBUG_KMS ("DSB execution started - head 0x%x, tail 0x%x\n" , -i915_ggtt_offset (dsb->vma), tail); +drm_dbg_kms (&dev_priv->drm, +"DSB execution started - head 0x%x, tail 0x%x\n" , +i915_ggtt_offset (dsb->vma), tail);intel_de_write (dev_priv,DSB_TAIL (pipe, dsb->id),i915_ggtt_offset (dsb->vma) + tail);if (wait_for (!is_dsb_busy (dsb),1 )) { -DRM_ERROR ("Timed out waiting for DSB workload completion.\n" ); +drm_err (&dev_priv->drm, +"Timed out waiting for DSB workload completion.\n" ); goto reset; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Please ignore this, I seem to have some smtp trouble which fails some of tha patches. This will be incomplete.
Wambui, I'll resend this later.
BR,
Jani.
Quoted 32 lines · Jani Nikula
Rebase of Wambui's series [1] to drm-tip, with a couple of manual conversions included.
BR,
Jani.[1] https://patchwork.freedesktop.org/series/72760/
Wambui Karuga (10):
drm/i915/dsb: convert todrm_devicebased logging macros. drm/i915/fbc: convert todrm_devicebased logging macros. drm/i915/fbdev: convert todrm_devicebased logging. drm/i915/fifo_underrun: convert todrm_devicebased logging. drm/i915/gmbus: convert todrm_devicebased logging, drm/i915/hdcp: convert to structdrm_devicebased logging. drm/i915/hotplug: convert todrm_devicebased logging. drm/i915/lpe_audio: convert todrm_devicebased logging macros. drm/i915/lvds: convert todrm_devicebased logging macros. drm/i915/overlay: convert todrm_devicebased logging.drivers/gpu/drm/i915/display/intel_dsb.c | 28 +++--- drivers/gpu/drm/i915/display/intel_fbc.c | 30 +++--- drivers/gpu/drm/i915/display/intel_fbdev.c | 96 +++++++++++-------- .../drm/i915/display/intel_fifo_underrun.c | 29 +++--- drivers/gpu/drm/i915/display/intel_gmbus.c | 33 ++++--- drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 40 ++++---- .../gpu/drm/i915/display/intel_lpe_audio.c | 23 +++-- drivers/gpu/drm/i915/display/intel_lvds.c | 43 +++++---- drivers/gpu/drm/i915/display/intel_overlay.c | 11 ++- 10 files changed, 195 insertions(+), 141 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
Quoted 4 lines · Jani Nikula
Please ignore this, I seem to have some smtp trouble which fails some of tha patches. This will be incomplete.
Wambui, I'll resend this later.
Okay, I sent them with the same message-ids, so the patches amended this beginning of the series.
I pushed all the patches that I didn't change. Please double check the below patches that I adjusted, so I can push them.
Quoted 3 lines
Quoted 3 lines
drm/i915/fbc: convert to
drm_devicebased logging macros. drm/i915/fbdev: convert todrm_devicebased logging. drm/i915/hdcp: convert to structdrm_devicebased logging.
Thanks,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Jani Nikula
Quoted 3 lines · Jani Nikula
Please ignore this, I seem to have some smtp trouble which fails some of tha patches. This will be incomplete.
Quoted 12 lines
Quoted 1 line
Wambui, I'll resend this later.
Okay, I sent them with the same message-ids, so the patches amended this beginning of the series.
I pushed all the patches that I didn't change. Please double check the below patches that I adjusted, so I can push them.
Quoted 3 lines
Quoted 3 lines
drm/i915/fbc: convert to
drm_devicebased logging macros. drm/i915/fbdev: convert todrm_devicebased logging. drm/i915/hdcp: convert to structdrm_devicebased logging.
Will do, thanks!
wambui karuga
Quoted 6 lines
Thanks,
Jani.Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Wambui Karuga
Quoted 12 lines · Jani Nikula
Quoted 4 lines · Jani Nikula
Please ignore this, I seem to have some smtp trouble which fails some of tha patches. This will be incomplete.
Wambui, I'll resend this later.
Okay, I sent them with the same message-ids, so the patches amended this beginning of the series.
I pushed all the patches that I didn't change. Please double check the below patches that I adjusted, so I can push them.
Quoted 6 lines
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
drm/i915/fbc: convert to
drm_devicebased logging macros. drm/i915/fbdev: convert todrm_devicebased logging. drm/i915/hdcp: convert to structdrm_devicebased logging.Will do, thanks!
Thanks for the reviews, I've pushed the remaining patches.
BR,
Jani.
Quoted 7 lines
wambui karuga
Quoted 6 lines
Thanks,
Jani.Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/10 drm/i915/fbc: convert to drm_device based logging macros.
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
This replaces the uses of the printk based drm logging macros with the struct drm_device based logging macros in i915/display/intel_fbc.c. This transformation was done using the following coccinelle semantic patch that matches based on the existence of a drm_i915_private device pointer:
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
v2 by Jani:
- also convert pr_info_once to drm based logging
--- drivers/gpu/drm/i915/display/intel_fbc.c | 30 ++++++++++++++---------- 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_fbc.c +18 -12
@@ -104,7 +104,7 @@ static void i8xx_fbc_deactivate(struct drm_i915_private *dev_priv)/* Wait for compressing bit to clear */ if (intel_de_wait_for_clear (dev_priv,FBC_STATUS ,FBC_STAT_COMPRESSING ,10 )) { -DRM_DEBUG_KMS ("FBC idle timed out\n" ); +drm_dbg_kms (&dev_priv->drm,"FBC idle timed out\n" );return ; } }
@@ -485,7 +485,8 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv,if (!ret) goto err_llb;else if (ret >1 ) { -DRM_INFO ("Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n" ); +drm_info (&dev_priv->drm, +"Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n" ); }
@@ -521,8 +522,9 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv, dev_priv->dsm.start + compressed_llb->start); } -DRM_DEBUG_KMS ("reserved %llu bytes of contiguous stolen space for FBC, threshold: %d\n" , - fbc->compressed_fb.size, fbc->threshold); +drm_dbg_kms (&dev_priv->drm, +"reserved %llu bytes of contiguous stolen space for FBC, threshold: %d\n" , + fbc->compressed_fb.size, fbc->threshold);return 0 ;
@@ -531,7 +533,7 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv,i915_gem_stolen_remove_node (dev_priv, &fbc->compressed_fb); err_llb:if (drm_mm_initialized (&dev_priv->mm.stolen)) -pr_info_once ("drm: not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n" , size); +drm_info_once (&dev_priv->drm,"not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n" , size);return -ENOSPC ; }
@@ -945,7 +947,8 @@ static void __intel_fbc_disable(struct drm_i915_private *dev_priv)drm_WARN_ON (&dev_priv->drm, !fbc->crtc);drm_WARN_ON (&dev_priv->drm, fbc->active); -DRM_DEBUG_KMS ("Disabling FBC on pipe %c\n" ,pipe_name (crtc->pipe)); +drm_dbg_kms (&dev_priv->drm,"Disabling FBC on pipe %c\n" , +pipe_name (crtc->pipe));__intel_fbc_cleanup_cfb (dev_priv);
@@ -1173,7 +1176,8 @@ void intel_fbc_enable(struct intel_atomic_state *state,else cache->gen9_wa_cfb_stride =0 ; -DRM_DEBUG_KMS ("Enabling FBC on pipe %c\n" ,pipe_name (crtc->pipe)); +drm_dbg_kms (&dev_priv->drm,"Enabling FBC on pipe %c\n" , +pipe_name (crtc->pipe)); fbc->no_fbc_reason ="FBC enabled but not active yet\n" ; fbc->crtc = crtc;
@@ -1235,7 +1239,7 @@ static void intel_fbc_underrun_work_fn(struct work_struct *work)if (fbc->underrun_detected || !fbc->crtc) goto out; -DRM_DEBUG_KMS ("Disabling FBC due to FIFO underrun.\n" ); +drm_dbg_kms (&dev_priv->drm,"Disabling FBC due to FIFO underrun.\n" ); fbc->underrun_detected = true;intel_fbc_deactivate (dev_priv,"FIFO underrun" );
@@ -1261,7 +1265,8 @@ int intel_fbc_reset_underrun(struct drm_i915_private *dev_priv)return ret;if (dev_priv->fbc.underrun_detected) { -DRM_DEBUG_KMS ("Re-allowing FBC after fifo underrun\n" ); +drm_dbg_kms (&dev_priv->drm, +"Re-allowing FBC after fifo underrun\n" ); dev_priv->fbc.no_fbc_reason ="FIFO underrun cleared" ; }
@@ -1332,7 +1337,8 @@ static bool need_fbc_vtd_wa(struct drm_i915_private *dev_priv)/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */ if (intel_vtd_active () && (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv))) { -DRM_INFO ("Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n" ); +drm_info (&dev_priv->drm, +"Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n" );return true; }
@@ -1360,8 +1366,8 @@ void intel_fbc_init(struct drm_i915_private *dev_priv)mkwrite_device_info (dev_priv)->display.has_fbc = false; i915_modparams.enable_fbc =intel_sanitize_fbc_option (dev_priv); -DRM_DEBUG_KMS ("Sanitized enable_fbc value: %d\n" , - i915_modparams.enable_fbc); +drm_dbg_kms (&dev_priv->drm,"Sanitized enable_fbc value: %d\n" , + i915_modparams.enable_fbc);if (!HAS_FBC (dev_priv)) { fbc->no_fbc_reason ="unsupported by this chipset" ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 02/10] drm/i915/fbc: convert to drm_device based logging macros.
Quoted 85 lines · Jani Nikula
From: Wambui Karuga <[email protected]>
This replaces the uses of the printk based drm logging macros with the struct
drm_devicebased logging macros ini915/display/intel_fbc.c. This transformation was done using the following coccinelle semantic patch that matches based on the existence of adrm_i915_privatedevice pointer:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}
Quoted 7 lines
New checkpatch warnings were addressed manually.
v2 by Jani:
- also convertpr_info_onceto drm based loggingSigned-off-by Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 112 lines
---
drivers/gpu/drm/i915/display/intel_fbc.c| 30 ++++++++++++++----------1 file changed, 18 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/display/intel_fbc.c +6
-4@@ -104,7 +104,7 @@ static void i8xx_fbc_deactivate(struct drm_i915_private *dev_priv)/* Wait for compressing bit to clear */ if (intel_de_wait_for_clear (dev_priv,FBC_STATUS ,FBC_STAT_COMPRESSING ,10 )) { -DRM_DEBUG_KMS ("FBC idle timed out\n" ); +drm_dbg_kms (&dev_priv->drm,"FBC idle timed out\n" );return ; } }@@ -485,7 +485,8 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv,if (!ret) goto err_llb;else if (ret >1 ) { -DRM_INFO ("Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n" ); +drm_info (&dev_priv->drm, +"Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n" ); }@@ -521,8 +522,9 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv, dev_priv->dsm.start + compressed_llb->start); } -DRM_DEBUG_KMS ("reserved %llu bytes of contiguous stolen space for FBC, threshold: %d\n" , - fbc->compressed_fb.size, fbc->threshold); +drm_dbg_kms (&dev_priv->drm, +"reserved %llu bytes of contiguous stolen space for FBC, threshold: %d\n" , + fbc->compressed_fb.size, fbc->threshold);return 0 ;@@ -531,7 +533,7 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv,i915_gem_stolen_remove_node (dev_priv, &fbc->compressed_fb);
err_llb:if (drm_mm_initialized(&dev_priv->mm.stolen))drivers/gpu/drm/i915/display/intel_fbc.c +1
-1-pr_info_once ("drm: not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n" , size); +drm_info_once (&dev_priv->drm,"not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n" , size);return -ENOSPC; }drivers/gpu/drm/i915/display/intel_fbc.c +11
-7@@ -945,7 +947,8 @@ static void __intel_fbc_disable(struct drm_i915_private *dev_priv)drm_WARN_ON (&dev_priv->drm, !fbc->crtc);drm_WARN_ON (&dev_priv->drm, fbc->active); -DRM_DEBUG_KMS ("Disabling FBC on pipe %c\n" ,pipe_name (crtc->pipe)); +drm_dbg_kms (&dev_priv->drm,"Disabling FBC on pipe %c\n" , +pipe_name (crtc->pipe));__intel_fbc_cleanup_cfb (dev_priv);@@ -1173,7 +1176,8 @@ void intel_fbc_enable(struct intel_atomic_state *state,else cache->gen9_wa_cfb_stride =0 ; -DRM_DEBUG_KMS ("Enabling FBC on pipe %c\n" ,pipe_name (crtc->pipe)); +drm_dbg_kms (&dev_priv->drm,"Enabling FBC on pipe %c\n" , +pipe_name (crtc->pipe)); fbc->no_fbc_reason ="FBC enabled but not active yet\n" ; fbc->crtc = crtc;@@ -1235,7 +1239,7 @@ static void intel_fbc_underrun_work_fn(struct work_struct *work)if (fbc->underrun_detected || !fbc->crtc) goto out; -DRM_DEBUG_KMS ("Disabling FBC due to FIFO underrun.\n" ); +drm_dbg_kms (&dev_priv->drm,"Disabling FBC due to FIFO underrun.\n" ); fbc->underrun_detected = true;intel_fbc_deactivate (dev_priv,"FIFO underrun" );@@ -1261,7 +1265,8 @@ int intel_fbc_reset_underrun(struct drm_i915_private *dev_priv)return ret;if (dev_priv->fbc.underrun_detected) { -DRM_DEBUG_KMS ("Re-allowing FBC after fifo underrun\n" ); +drm_dbg_kms (&dev_priv->drm, +"Re-allowing FBC after fifo underrun\n" ); dev_priv->fbc.no_fbc_reason ="FIFO underrun cleared" ; }@@ -1332,7 +1337,8 @@ static bool need_fbc_vtd_wa(struct drm_i915_private *dev_priv)/* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */ if (intel_vtd_active () && (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv))) { -DRM_INFO ("Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n" ); +drm_info (&dev_priv->drm, +"Disabling framebuffer compression (FBC) to prevent screen flicker with VT-d enabled\n" );return true; }@@ -1360,8 +1366,8 @@ void intel_fbc_init(struct drm_i915_private *dev_priv)mkwrite_device_info (dev_priv)->display.has_fbc = false; i915_modparams.enable_fbc =intel_sanitize_fbc_option (dev_priv); -DRM_DEBUG_KMS ("Sanitized enable_fbc value: %d\n" , - i915_modparams.enable_fbc); +drm_dbg_kms (&dev_priv->drm,"Sanitized enable_fbc value: %d\n" , + i915_modparams.enable_fbc);if (!HAS_FBC (dev_priv)) { fbc->no_fbc_reason ="unsupported by this chipset" ;Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 drm/i915/fbdev: convert to drm_device based logging.
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
Convert various instances of printk based drm logging macros to the struct drm_device based logging macros in i915/display/intel_fbdev.c. This also involves extracting the drm_i915_private device from various intel types.
v2 by Jani:
- fix the final one too
--- drivers/gpu/drm/i915/display/intel_fbdev.c | 96 +++++++++++++--------- 1 file changed, 55 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/display/intel_fbdev.c +55 -41
@@ -146,7 +146,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,if (IS_ERR (obj)) obj =i915_gem_object_create_shmem (dev_priv, size);if (IS_ERR (obj)) { -DRM_ERROR ("failed to allocate framebuffer\n" ); +drm_err (&dev_priv->drm,"failed to allocate framebuffer\n" );return PTR_ERR (obj); }
@@ -183,21 +183,23 @@ static int intelfb_create(struct drm_fb_helper *helper,if (intel_fb && (sizes->fb_width > intel_fb->base.width || sizes->fb_height > intel_fb->base.height)) { -DRM_DEBUG_KMS ("BIOS fb too small (%dx%d), we require (%dx%d)," -" releasing it\n" , - intel_fb->base.width, intel_fb->base.height, - sizes->fb_width, sizes->fb_height); +drm_dbg_kms (&dev_priv->drm, +"BIOS fb too small (%dx%d), we require (%dx%d)," +" releasing it\n" , + intel_fb->base.width, intel_fb->base.height, + sizes->fb_width, sizes->fb_height);drm_framebuffer_put (&intel_fb->base); intel_fb = ifbdev->fb =NULL ; }if (!intel_fb ||drm_WARN_ON (dev, !intel_fb_obj (&intel_fb->base))) { -DRM_DEBUG_KMS ("no BIOS fb, allocating a new one\n" ); +drm_dbg_kms (&dev_priv->drm, +"no BIOS fb, allocating a new one\n" ); ret =intelfb_alloc (helper, sizes);if (ret)return ret; intel_fb = ifbdev->fb; }else { -DRM_DEBUG_KMS ("re-using BIOS fb\n" ); +drm_dbg_kms (&dev_priv->drm,"re-using BIOS fb\n" ); prealloc = true; sizes->fb_width = intel_fb->base.width; sizes->fb_height = intel_fb->base.height;
@@ -220,7 +222,7 @@ static int intelfb_create(struct drm_fb_helper *helper, info =drm_fb_helper_alloc_fbi (helper);if (IS_ERR (info)) { -DRM_ERROR ("Failed to allocate fb_info\n" ); +drm_err (&dev_priv->drm,"Failed to allocate fb_info\n" ); ret =PTR_ERR (info); goto out_unpin; }
@@ -240,7 +242,8 @@ static int intelfb_create(struct drm_fb_helper *helper, vaddr =i915_vma_pin_iomap (vma);if (IS_ERR (vaddr)) { -DRM_ERROR ("Failed to remap framebuffer into virtual memory\n" ); +drm_err (&dev_priv->drm, +"Failed to remap framebuffer into virtual memory\n" ); ret =PTR_ERR (vaddr); goto out_unpin; }
@@ -258,9 +261,9 @@ static int intelfb_create(struct drm_fb_helper *helper,/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */ -DRM_DEBUG_KMS ("allocated %dx%d fb: 0x%08x\n" , - ifbdev->fb->base.width, ifbdev->fb->base.height, -i915_ggtt_offset (vma)); +drm_dbg_kms (&dev_priv->drm,"allocated %dx%d fb: 0x%08x\n" , + ifbdev->fb->base.width, ifbdev->fb->base.height, +i915_ggtt_offset (vma)); ifbdev->vma = vma; ifbdev->vma_flags = flags;
@@ -309,6 +312,7 @@ static void intel_fbdev_destroy(struct intel_fbdev *ifbdev)static bool intel_fbdev_init_bios (struct drm_device *dev,struct intel_fbdev *ifbdev) { +struct drm_i915_private *i915 =to_i915 (dev);struct intel_framebuffer *fb =NULL ;struct drm_crtc *crtc;struct intel_crtc *intel_crtc;
@@ -321,21 +325,24 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, intel_crtc =to_intel_crtc (crtc);if (!crtc->state->active || !obj) { -DRM_DEBUG_KMS ("pipe %c not active or no fb, skipping\n" , -pipe_name (intel_crtc->pipe)); +drm_dbg_kms (&i915->drm, +"pipe %c not active or no fb, skipping\n" , +pipe_name (intel_crtc->pipe));continue ; }if (obj->base.size > max_size) { -DRM_DEBUG_KMS ("found possible fb from plane %c\n" , -pipe_name (intel_crtc->pipe)); +drm_dbg_kms (&i915->drm, +"found possible fb from plane %c\n" , +pipe_name (intel_crtc->pipe)); fb =to_intel_framebuffer (crtc->primary->state->fb); max_size = obj->base.size; } }if (!fb) { -DRM_DEBUG_KMS ("no active fbs found, not using BIOS config\n" ); +drm_dbg_kms (&i915->drm, +"no active fbs found, not using BIOS config\n" ); goto out; }
@@ -346,13 +353,14 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, intel_crtc =to_intel_crtc (crtc);if (!crtc->state->active) { -DRM_DEBUG_KMS ("pipe %c not active, skipping\n" , -pipe_name (intel_crtc->pipe)); +drm_dbg_kms (&i915->drm, +"pipe %c not active, skipping\n" , +pipe_name (intel_crtc->pipe));continue ; } -DRM_DEBUG_KMS ("checking plane %c for BIOS fb\n" , -pipe_name (intel_crtc->pipe)); +drm_dbg_kms (&i915->drm,"checking plane %c for BIOS fb\n" , +pipe_name (intel_crtc->pipe));/* * See if the plane fb we found above will fit on this
@@ -362,9 +370,10 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, cur_size = crtc->state->adjusted_mode.crtc_hdisplay; cur_size = cur_size * fb->base.format->cpp[0 ];if (fb->base.pitches[0 ] < cur_size) { -DRM_DEBUG_KMS ("fb not wide enough for plane %c (%d vs %d)\n" , -pipe_name (intel_crtc->pipe), - cur_size, fb->base.pitches[0 ]); +drm_dbg_kms (&i915->drm, +"fb not wide enough for plane %c (%d vs %d)\n" , +pipe_name (intel_crtc->pipe), + cur_size, fb->base.pitches[0 ]); fb =NULL ;break ; }
@@ -372,28 +381,32 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, cur_size = crtc->state->adjusted_mode.crtc_vdisplay; cur_size =intel_fb_align_height (&fb->base,0 , cur_size); cur_size *= fb->base.pitches[0 ]; -DRM_DEBUG_KMS ("pipe %c area: %dx%d, bpp: %d, size: %d\n" , -pipe_name (intel_crtc->pipe), - crtc->state->adjusted_mode.crtc_hdisplay, - crtc->state->adjusted_mode.crtc_vdisplay, - fb->base.format->cpp[0 ] *8 , - cur_size); +drm_dbg_kms (&i915->drm, +"pipe %c area: %dx%d, bpp: %d, size: %d\n" , +pipe_name (intel_crtc->pipe), + crtc->state->adjusted_mode.crtc_hdisplay, + crtc->state->adjusted_mode.crtc_vdisplay, + fb->base.format->cpp[0 ] *8 , + cur_size);if (cur_size > max_size) { -DRM_DEBUG_KMS ("fb not big enough for plane %c (%d vs %d)\n" , -pipe_name (intel_crtc->pipe), - cur_size, max_size); +drm_dbg_kms (&i915->drm, +"fb not big enough for plane %c (%d vs %d)\n" , +pipe_name (intel_crtc->pipe), + cur_size, max_size); fb =NULL ;break ; } -DRM_DEBUG_KMS ("fb big enough for plane %c (%d >= %d)\n" , -pipe_name (intel_crtc->pipe), - max_size, cur_size); +drm_dbg_kms (&i915->drm, +"fb big enough for plane %c (%d >= %d)\n" , +pipe_name (intel_crtc->pipe), + max_size, cur_size); }if (!fb) { -DRM_DEBUG_KMS ("BIOS fb not suitable for all pipes, not using\n" ); +drm_dbg_kms (&i915->drm, +"BIOS fb not suitable for all pipes, not using\n" ); goto out; }
@@ -415,7 +428,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, } -DRM_DEBUG_KMS ("using BIOS fb for initial console\n" ); +drm_dbg_kms (&i915->drm,"using BIOS fb for initial console\n" );return true; out:
@@ -522,8 +535,9 @@ void intel_fbdev_fini(struct drm_i915_private *dev_priv)* processing, fbdev will perform a full connector reprobe if a hotplug event * was received while HPD was suspended. */ -static void intel_fbdev_hpd_set_suspend (struct intel_fbdev *ifbdev,int state) +static void intel_fbdev_hpd_set_suspend (struct drm_i915_private *i915,int state) { +struct intel_fbdev *ifbdev = i915->fbdev;bool send_hpd = false;mutex_lock (&ifbdev->hpd_lock);
@@ -533,7 +547,7 @@ static void intel_fbdev_hpd_set_suspend(struct intel_fbdev *ifbdev, int state)mutex_unlock (&ifbdev->hpd_lock);if (send_hpd) { -DRM_DEBUG_KMS ("Handling delayed fbcon HPD event\n" ); +drm_dbg_kms (&i915->drm,"Handling delayed fbcon HPD event\n" );drm_fb_helper_hotplug_event (&ifbdev->helper); } }
@@ -588,7 +602,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronousdrm_fb_helper_set_suspend (&ifbdev->helper, state);console_unlock (); -intel_fbdev_hpd_set_suspend (ifbdev, state); +intel_fbdev_hpd_set_suspend (dev_priv, state); }void intel_fbdev_output_poll_changed (struct drm_device *dev)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 03/10] drm/i915/fbdev: convert to drm_device based logging.
Quoted 7 lines · Jani Nikula
From: Wambui Karuga <[email protected]>
Convert various instances of printk based drm logging macros to the struct
drm_devicebased logging macros ini915/display/intel_fbdev.c. This also involves extracting thedrm_i915_privatedevice from various intel types.
Quoted 5 lines
v2 by Jani:
- fix the final one tooSigned-off-by Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 238 lines
---
drivers/gpu/drm/i915/display/intel_fbdev.c| 96 +++++++++++++---------1 file changed, 55 insertions(+), 41 deletions(-)drivers/gpu/drm/i915/display/intel_fbdev.c +51
-38@@ -146,7 +146,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,if (IS_ERR (obj)) obj =i915_gem_object_create_shmem (dev_priv, size);if (IS_ERR (obj)) { -DRM_ERROR ("failed to allocate framebuffer\n" ); +drm_err (&dev_priv->drm,"failed to allocate framebuffer\n" );return PTR_ERR (obj); }@@ -183,21 +183,23 @@ static int intelfb_create(struct drm_fb_helper *helper,if (intel_fb && (sizes->fb_width > intel_fb->base.width || sizes->fb_height > intel_fb->base.height)) { -DRM_DEBUG_KMS ("BIOS fb too small (%dx%d), we require (%dx%d)," -" releasing it\n" , - intel_fb->base.width, intel_fb->base.height, - sizes->fb_width, sizes->fb_height); +drm_dbg_kms (&dev_priv->drm, +"BIOS fb too small (%dx%d), we require (%dx%d)," +" releasing it\n" , + intel_fb->base.width, intel_fb->base.height, + sizes->fb_width, sizes->fb_height);drm_framebuffer_put (&intel_fb->base); intel_fb = ifbdev->fb =NULL ; }if (!intel_fb ||drm_WARN_ON (dev, !intel_fb_obj (&intel_fb->base))) { -DRM_DEBUG_KMS ("no BIOS fb, allocating a new one\n" ); +drm_dbg_kms (&dev_priv->drm, +"no BIOS fb, allocating a new one\n" ); ret =intelfb_alloc (helper, sizes);if (ret)return ret; intel_fb = ifbdev->fb; }else { -DRM_DEBUG_KMS ("re-using BIOS fb\n" ); +drm_dbg_kms (&dev_priv->drm,"re-using BIOS fb\n" ); prealloc = true; sizes->fb_width = intel_fb->base.width; sizes->fb_height = intel_fb->base.height;@@ -220,7 +222,7 @@ static int intelfb_create(struct drm_fb_helper *helper, info =drm_fb_helper_alloc_fbi (helper);if (IS_ERR (info)) { -DRM_ERROR ("Failed to allocate fb_info\n" ); +drm_err (&dev_priv->drm,"Failed to allocate fb_info\n" ); ret =PTR_ERR (info); goto out_unpin; }@@ -240,7 +242,8 @@ static int intelfb_create(struct drm_fb_helper *helper, vaddr =i915_vma_pin_iomap (vma);if (IS_ERR (vaddr)) { -DRM_ERROR ("Failed to remap framebuffer into virtual memory\n" ); +drm_err (&dev_priv->drm, +"Failed to remap framebuffer into virtual memory\n" ); ret =PTR_ERR (vaddr); goto out_unpin; }@@ -258,9 +261,9 @@ static int intelfb_create(struct drm_fb_helper *helper,/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */ -DRM_DEBUG_KMS ("allocated %dx%d fb: 0x%08x\n" , - ifbdev->fb->base.width, ifbdev->fb->base.height, -i915_ggtt_offset (vma)); +drm_dbg_kms (&dev_priv->drm,"allocated %dx%d fb: 0x%08x\n" , + ifbdev->fb->base.width, ifbdev->fb->base.height, +i915_ggtt_offset (vma)); ifbdev->vma = vma; ifbdev->vma_flags = flags;@@ -309,6 +312,7 @@ static void intel_fbdev_destroy(struct intel_fbdev *ifbdev)static bool intel_fbdev_init_bios (struct drm_device *dev,struct intel_fbdev *ifbdev) { +struct drm_i915_private *i915 =to_i915 (dev);struct intel_framebuffer *fb =NULL ;struct drm_crtc *crtc;struct intel_crtc *intel_crtc;@@ -321,21 +325,24 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, intel_crtc =to_intel_crtc (crtc);if (!crtc->state->active || !obj) { -DRM_DEBUG_KMS ("pipe %c not active or no fb, skipping\n" , -pipe_name (intel_crtc->pipe)); +drm_dbg_kms (&i915->drm, +"pipe %c not active or no fb, skipping\n" , +pipe_name (intel_crtc->pipe));continue ; }if (obj->base.size > max_size) { -DRM_DEBUG_KMS ("found possible fb from plane %c\n" , -pipe_name (intel_crtc->pipe)); +drm_dbg_kms (&i915->drm, +"found possible fb from plane %c\n" , +pipe_name (intel_crtc->pipe)); fb =to_intel_framebuffer (crtc->primary->state->fb); max_size = obj->base.size; } }if (!fb) { -DRM_DEBUG_KMS ("no active fbs found, not using BIOS config\n" ); +drm_dbg_kms (&i915->drm, +"no active fbs found, not using BIOS config\n" ); goto out; }@@ -346,13 +353,14 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, intel_crtc =to_intel_crtc (crtc);if (!crtc->state->active) { -DRM_DEBUG_KMS ("pipe %c not active, skipping\n" , -pipe_name (intel_crtc->pipe)); +drm_dbg_kms (&i915->drm, +"pipe %c not active, skipping\n" , +pipe_name (intel_crtc->pipe));continue ; } -DRM_DEBUG_KMS ("checking plane %c for BIOS fb\n" , -pipe_name (intel_crtc->pipe)); +drm_dbg_kms (&i915->drm,"checking plane %c for BIOS fb\n" , +pipe_name (intel_crtc->pipe));/* * See if the plane fb we found above will fit on this @@ -362,9 +370,10 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, cur_size = crtc->state->adjusted_mode.crtc_hdisplay; cur_size = cur_size * fb->base.format->cpp[0 ];if (fb->base.pitches[0 ] < cur_size) { -DRM_DEBUG_KMS ("fb not wide enough for plane %c (%d vs %d)\n" , -pipe_name (intel_crtc->pipe), - cur_size, fb->base.pitches[0 ]); +drm_dbg_kms (&i915->drm, +"fb not wide enough for plane %c (%d vs %d)\n" , +pipe_name (intel_crtc->pipe), + cur_size, fb->base.pitches[0 ]); fb =NULL ;break ; }@@ -372,28 +381,32 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, cur_size = crtc->state->adjusted_mode.crtc_vdisplay; cur_size =intel_fb_align_height (&fb->base,0 , cur_size); cur_size *= fb->base.pitches[0 ]; -DRM_DEBUG_KMS ("pipe %c area: %dx%d, bpp: %d, size: %d\n" , -pipe_name (intel_crtc->pipe), - crtc->state->adjusted_mode.crtc_hdisplay, - crtc->state->adjusted_mode.crtc_vdisplay, - fb->base.format->cpp[0 ] *8 , - cur_size); +drm_dbg_kms (&i915->drm, +"pipe %c area: %dx%d, bpp: %d, size: %d\n" , +pipe_name (intel_crtc->pipe), + crtc->state->adjusted_mode.crtc_hdisplay, + crtc->state->adjusted_mode.crtc_vdisplay, + fb->base.format->cpp[0 ] *8 , + cur_size);if (cur_size > max_size) { -DRM_DEBUG_KMS ("fb not big enough for plane %c (%d vs %d)\n" , -pipe_name (intel_crtc->pipe), - cur_size, max_size); +drm_dbg_kms (&i915->drm, +"fb not big enough for plane %c (%d vs %d)\n" , +pipe_name (intel_crtc->pipe), + cur_size, max_size); fb =NULL ;break ; } -DRM_DEBUG_KMS ("fb big enough for plane %c (%d >= %d)\n" , -pipe_name (intel_crtc->pipe), - max_size, cur_size); +drm_dbg_kms (&i915->drm, +"fb big enough for plane %c (%d >= %d)\n" , +pipe_name (intel_crtc->pipe), + max_size, cur_size); }if (!fb) { -DRM_DEBUG_KMS ("BIOS fb not suitable for all pipes, not using\n" ); +drm_dbg_kms (&i915->drm, +"BIOS fb not suitable for all pipes, not using\n" ); goto out; }@@ -415,7 +428,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, } -DRM_DEBUG_KMS ("using BIOS fb for initial console\n" ); +drm_dbg_kms (&i915->drm,"using BIOS fb for initial console\n" );return true;out:
drivers/gpu/drm/i915/display/intel_fbdev.c +4
-3@@ -522,8 +535,9 @@ void intel_fbdev_fini(struct drm_i915_private *dev_priv)* processing, fbdev will perform a full connector reprobe if a hotplug event * was received while HPD was suspended. */ -static void intel_fbdev_hpd_set_suspend (struct intel_fbdev *ifbdev,int state) +static void intel_fbdev_hpd_set_suspend (struct drm_i915_private *i915,int state) { +struct intel_fbdev *ifbdev = i915->fbdev;bool send_hpd = false;mutex_lock (&ifbdev->hpd_lock);@@ -533,7 +547,7 @@ static void intel_fbdev_hpd_set_suspend(struct intel_fbdev *ifbdev, int state)mutex_unlock (&ifbdev->hpd_lock);if (send_hpd) { -DRM_DEBUG_KMS ("Handling delayed fbcon HPD event\n" ); +drm_dbg_kms (&i915->drm,"Handling delayed fbcon HPD event\n" );drm_fb_helper_hotplug_event (&ifbdev->helper); } }@@ -588,7 +602,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronousdrm_fb_helper_set_suspend (&ifbdev->helper, state);console_unlock (); -intel_fbdev_hpd_set_suspend (ifbdev, state); +intel_fbdev_hpd_set_suspend (dev_priv, state); }void intel_fbdev_output_poll_changed (struct drm_device *dev)Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/10 drm/i915/fifo_underrun: convert to drm_device based logging.
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
Convert various instances of the printk based drm logging macros to the struct drm_device based logging macros in i915/display/intel_fifo_underrun.c.
This was done using the following coccinelle script:
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
--- .../drm/i915/display/intel_fifo_underrun.c | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +16 -13
@@ -103,7 +103,7 @@ static void i9xx_check_fifo_underruns(struct intel_crtc *crtc)intel_de_posting_read (dev_priv, reg);trace_intel_cpu_fifo_underrun (dev_priv, crtc->pipe); -DRM_ERROR ("pipe %c underrun\n" ,pipe_name (crtc->pipe)); +drm_err (&dev_priv->drm,"pipe %c underrun\n" ,pipe_name (crtc->pipe)); } static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,
@@ -123,7 +123,8 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,intel_de_posting_read (dev_priv, reg); }else {if (old &&intel_de_read (dev_priv, reg) &PIPE_FIFO_UNDERRUN_STATUS ) -DRM_ERROR ("pipe %c underrun\n" ,pipe_name (pipe)); +drm_err (&dev_priv->drm,"pipe %c underrun\n" , +pipe_name (pipe)); } }
@@ -155,7 +156,7 @@ static void ivb_check_fifo_underruns(struct intel_crtc *crtc)intel_de_posting_read (dev_priv,GEN7_ERR_INT );trace_intel_cpu_fifo_underrun (dev_priv, pipe); -DRM_ERROR ("fifo underrun on pipe %c\n" ,pipe_name (pipe)); +drm_err (&dev_priv->drm,"fifo underrun on pipe %c\n" ,pipe_name (pipe)); } static void ivb_set_fifo_underrun_reporting(struct drm_device *dev,
@@ -176,8 +177,9 @@ static void ivb_set_fifo_underrun_reporting(struct drm_device *dev,if (old &&intel_de_read (dev_priv,GEN7_ERR_INT ) &ERR_INT_FIFO_UNDERRUN (pipe)) { -DRM_ERROR ("uncleared fifo underrun on pipe %c\n" , -pipe_name (pipe)); +drm_err (&dev_priv->drm, +"uncleared fifo underrun on pipe %c\n" , +pipe_name (pipe)); } } }
@@ -223,8 +225,8 @@ static void cpt_check_pch_fifo_underruns(struct intel_crtc *crtc)intel_de_posting_read (dev_priv,SERR_INT );trace_intel_pch_fifo_underrun (dev_priv, pch_transcoder); -DRM_ERROR ("pch fifo underrun on pch transcoder %c\n" , -pipe_name (pch_transcoder)); +drm_err (&dev_priv->drm,"pch fifo underrun on pch transcoder %c\n" , +pipe_name (pch_transcoder)); } static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,
@@ -246,8 +248,9 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,if (old &&intel_de_read (dev_priv,SERR_INT ) &SERR_INT_TRANS_FIFO_UNDERRUN (pch_transcoder)) { -DRM_ERROR ("uncleared pch fifo underrun on pch transcoder %c\n" , -pipe_name (pch_transcoder)); +drm_err (&dev_priv->drm, +"uncleared pch fifo underrun on pch transcoder %c\n" , +pipe_name (pch_transcoder)); } } }
@@ -381,8 +384,8 @@ void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,if (intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false)) {trace_intel_cpu_fifo_underrun (dev_priv, pipe); -DRM_ERROR ("CPU pipe %c FIFO underrun\n" , -pipe_name (pipe)); +drm_err (&dev_priv->drm,"CPU pipe %c FIFO underrun\n" , +pipe_name (pipe)); }intel_fbc_handle_fifo_underrun_irq (dev_priv);
@@ -403,8 +406,8 @@ void intel_pch_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,if (intel_set_pch_fifo_underrun_reporting (dev_priv, pch_transcoder, false)) {trace_intel_pch_fifo_underrun (dev_priv, pch_transcoder); -DRM_ERROR ("PCH transcoder %c FIFO underrun\n" , -pipe_name (pch_transcoder)); +drm_err (&dev_priv->drm,"PCH transcoder %c FIFO underrun\n" , +pipe_name (pch_transcoder)); } }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/10 drm/i915/gmbus: convert to drm_device based logging,
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
Conversion instances of printk based drm logging macros to use the struct drm_device based logging macros in i915/display/intel_gmbus.c. This was done using the following coccinelle semantic patch that transforms based on the existence of an existing 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(
+drm_dbg(&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,
...)
)
...+>
}
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
--- drivers/gpu/drm/i915/display/intel_gmbus.c | 33 +++++++++++++--------- 1 file changed, 19 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/intel_gmbus.c +19 -14
@@ -631,8 +631,9 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,* till then let it sleep. */ if (gmbus_wait_idle (dev_priv)) { -DRM_DEBUG_KMS ("GMBUS [%s] timed out waiting for idle\n" , - adapter->name); +drm_dbg_kms (&dev_priv->drm, +"GMBUS [%s] timed out waiting for idle\n" , + adapter->name); ret = -ETIMEDOUT ; }intel_de_write_fw (dev_priv,GMBUS0 ,0 );
@@ -655,8 +656,9 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,*/ ret = -ENXIO ;if (gmbus_wait_idle (dev_priv)) { -DRM_DEBUG_KMS ("GMBUS [%s] timed out after NAK\n" , - adapter->name); +drm_dbg_kms (&dev_priv->drm, +"GMBUS [%s] timed out after NAK\n" , + adapter->name); ret = -ETIMEDOUT ; }
@@ -668,9 +670,9 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,intel_de_write_fw (dev_priv,GMBUS1 ,0 );intel_de_write_fw (dev_priv,GMBUS0 ,0 ); -DRM_DEBUG_KMS ("GMBUS [%s] NAK for addr: %04x %c(%d)\n" , - adapter->name, msgs[i].addr, - (msgs[i].flags &I2C_M_RD ) ?'r' :'w' , msgs[i].len); +drm_dbg_kms (&dev_priv->drm,"GMBUS [%s] NAK for addr: %04x %c(%d)\n" , + adapter->name, msgs[i].addr, + (msgs[i].flags &I2C_M_RD ) ?'r' :'w' , msgs[i].len);/* * Passive adapters sometimes NAK the first probe. Retry the first
@@ -679,16 +681,18 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,* drm_do_probe_ddc_edid, which bails out on the first -ENXIO. */ if (ret == -ENXIO && i ==0 && try++ ==0 ) { -DRM_DEBUG_KMS ("GMBUS [%s] NAK on first message, retry\n" , - adapter->name); +drm_dbg_kms (&dev_priv->drm, +"GMBUS [%s] NAK on first message, retry\n" , + adapter->name); goto retry; } goto out; timeout: -DRM_DEBUG_KMS ("GMBUS [%s] timed out, falling back to bit banging on pin %d\n" , - bus->adapter.name, bus->reg0 &0xff ); +drm_dbg_kms (&dev_priv->drm, +"GMBUS [%s] timed out, falling back to bit banging on pin %d\n" , + bus->adapter.name, bus->reg0 &0xff );intel_de_write_fw (dev_priv,GMBUS0 ,0 );/*
@@ -925,9 +929,10 @@ void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)mutex_lock (&dev_priv->gmbus_mutex); bus->force_bit += force_bit ?1 :-1 ; -DRM_DEBUG_KMS ("%sabling bit-banging on %s. force bit now %d\n" , - force_bit ?"en" :"dis" , adapter->name, - bus->force_bit); +drm_dbg_kms (&dev_priv->drm, +"%sabling bit-banging on %s. force bit now %d\n" , + force_bit ?"en" :"dis" , adapter->name, + bus->force_bit);mutex_unlock (&dev_priv->gmbus_mutex); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm/i915/hdcp: convert to struct drm_device based logging.
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
Converts various instances of the printk based drm logging macros to the struct drm_device based logging macros in i915/display/intel_hdcp.c. This also involves extracting the drm_i915_private device from the intel_connector type for use in the macros.
v2 by Jani:
- rebase
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +2 -1
@@ -1391,6 +1391,7 @@ staticint hdcp2_propagate_stream_management_info (struct intel_connector *connector) {struct intel_digital_port *intel_dig_port =intel_attached_dig_port (connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;union {struct hdcp2_rep_stream_manage stream_manage;
@@ -1431,7 +1432,7 @@ int hdcp2_propagate_stream_management_info(struct intel_connector *connector) hdcp->seq_num_m++;if (hdcp->seq_num_m >HDCP_2_2_SEQ_NUM_MAX ) { -DRM_DEBUG_KMS ("seq_num_m roll over.\n" ); +drm_dbg_kms (&i915->drm,"seq_num_m roll over.\n" );return -1 ; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 06/10] drm/i915/hdcp: convert to struct drm_device based logging.
Quoted 7 lines · Jani Nikula
From: Wambui Karuga <[email protected]>
Converts various instances of the printk based drm logging macros to the struct
drm_devicebased logging macros ini915/display/intel_hdcp.c. This also involves extracting thedrm_i915_privatedevice from theintel_connectortype for use in the macros.
Quoted 5 lines
v2 by Jani:
- rebaseSigned-off-by Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 29 lines
---
drivers/gpu/drm/i915/display/intel_hdcp.c| 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_hdcp.c +2
-1@@ -1391,6 +1391,7 @@ staticint hdcp2_propagate_stream_management_info (struct intel_connector *connector) {struct intel_digital_port *intel_dig_port =intel_attached_dig_port (connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;union {struct hdcp2_rep_stream_manage stream_manage;@@ -1431,7 +1432,7 @@ int hdcp2_propagate_stream_management_info(struct intel_connector *connector) hdcp->seq_num_m++;if (hdcp->seq_num_m >HDCP_2_2_SEQ_NUM_MAX ) { -DRM_DEBUG_KMS ("seq_num_m roll over.\n" ); +drm_dbg_kms (&i915->drm,"seq_num_m roll over.\n" );return -1 ; }Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/10 drm/i915/hotplug: convert to drm_device based logging.
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
Converts various instances of the printk based drm logging macros to the struct drm_device based logging macros in i915/display/intel_hotplug.c. In some cases, this involves extracting the drm_i915_private pointer from the drm_device struct to be used in the logging macros.
--- drivers/gpu/drm/i915/display/intel_hotplug.c | 40 ++++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/display/intel_hotplug.c +24 -16
@@ -170,10 +170,13 @@ static bool intel_hpd_irq_storm_detect(struct drm_i915_private *dev_priv, hpd->stats[pin].count += increment;if (hpd->stats[pin].count > threshold) { hpd->stats[pin].state =HPD_MARK_DISABLED ; -DRM_DEBUG_KMS ("HPD interrupt storm detected on PIN %d\n" , pin); +drm_dbg_kms (&dev_priv->drm, +"HPD interrupt storm detected on PIN %d\n" , pin); storm = true; }else { -DRM_DEBUG_KMS ("Received HPD interrupt on PIN %d - cnt: %d\n" , pin, +drm_dbg_kms (&dev_priv->drm, +"Received HPD interrupt on PIN %d - cnt: %d\n" , + pin, hpd->stats[pin].count); }
@@ -202,7 +205,8 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv) dev_priv->hotplug.stats[pin].state != HPD_MARK_DISABLED)continue ; -DRM_INFO ("HPD interrupt storm detected on connector %s: " +drm_info (&dev_priv->drm, +"HPD interrupt storm detected on connector %s: " "switching from hotplug detection to polling\n" , connector->base.name);
@@ -244,8 +248,9 @@ static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)continue ;if (connector->base.polled != connector->polled) -DRM_DEBUG_DRIVER ("Reenabling HPD on connector %s\n" , - connector->base.name); +drm_dbg (&dev_priv->drm, +"Reenabling HPD on connector %s\n" , + connector->base.name); connector->base.polled = connector->polled; }drm_connector_list_iter_end (&conn_iter);
@@ -280,11 +285,12 @@ intel_encoder_hotplug(struct intel_encoder *encoder,if (old_status == connector->base.status)return INTEL_HOTPLUG_UNCHANGED ; -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] status updated from %s to %s\n" , - connector->base.base.id, - connector->base.name, -drm_get_connector_status_name (old_status), -drm_get_connector_status_name (connector->base.status)); +drm_dbg_kms (&to_i915 (dev)->drm, +"[CONNECTOR:%d:%s] status updated from %s to %s\n" , + connector->base.base.id, + connector->base.name, +drm_get_connector_status_name (old_status), +drm_get_connector_status_name (connector->base.status));return INTEL_HOTPLUG_CHANGED ; }
@@ -358,7 +364,7 @@ static void i915_hotplug_work_func(struct work_struct *work)u32 hpd_retry_bits;mutex_lock (&dev->mode_config.mutex); -DRM_DEBUG_KMS ("running encoder hotplug functions\n" ); +drm_dbg_kms (&dev_priv->drm,"running encoder hotplug functions\n" );spin_lock_irq (&dev_priv->irq_lock);
@@ -386,8 +392,9 @@ static void i915_hotplug_work_func(struct work_struct *work)struct intel_encoder *encoder =intel_attached_encoder (connector); -DRM_DEBUG_KMS ("Connector %s (pin %i) received hotplug event.\n" , - connector->base.name, pin); +drm_dbg_kms (&dev_priv->drm, +"Connector %s (pin %i) received hotplug event.\n" , + connector->base.name, pin);switch (encoder->hotplug (encoder, connector, hpd_event_bits & hpd_bit)) {
@@ -472,9 +479,10 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv, long_hpd = long_mask &BIT (pin); -DRM_DEBUG_DRIVER ("digital hpd on [ENCODER:%d:%s] - %s\n" , - encoder->base.base.id, encoder->base.name, - long_hpd ?"long" :"short" ); +drm_dbg (&dev_priv->drm, +"digital hpd on [ENCODER:%d:%s] - %s\n" , + encoder->base.base.id, encoder->base.name, + long_hpd ?"long" :"short" ); queue_dig = true;if (long_hpd) {
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/10 drm/i915/lpe_audio: convert to drm_device based logging macros.
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
Convert various uses of the printk based drm logging macros to the struct drm_device based logging macros in i915/display/intel_lpe_audio.c.
Note that this converts DRM_DEBUG to drm_dbg().
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
--- .../gpu/drm/i915/display/intel_lpe_audio.c | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_lpe_audio.c +14 -9
@@ -127,7 +127,8 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv)kfree (pdata);if (IS_ERR (platdev)) { -DRM_ERROR ("Failed to allocate LPE audio platform device\n" ); +drm_err (&dev_priv->drm, +"Failed to allocate LPE audio platform device\n" );return platdev; }
@@ -190,7 +191,8 @@ static bool lpe_audio_detect(struct drm_i915_private *dev_priv) };if (!pci_dev_present (atom_hdaudio_ids)) { -DRM_INFO ("HDaudio controller not detected, using LPE audio instead\n" ); +drm_info (&dev_priv->drm, +"HDaudio controller not detected, using LPE audio instead\n" ); lpe_present = true; } }
@@ -203,18 +205,19 @@ static int lpe_audio_setup(struct drm_i915_private *dev_priv) dev_priv->lpe_audio.irq =irq_alloc_desc (0 );if (dev_priv->lpe_audio.irq <0 ) { -DRM_ERROR ("Failed to allocate IRQ desc: %d\n" , +drm_err (&dev_priv->drm,"Failed to allocate IRQ desc: %d\n" , dev_priv->lpe_audio.irq); ret = dev_priv->lpe_audio.irq; goto err; } -DRM_DEBUG ("irq = %d\n" , dev_priv->lpe_audio.irq); +drm_dbg (&dev_priv->drm,"irq = %d\n" , dev_priv->lpe_audio.irq); ret =lpe_audio_irq_init (dev_priv);if (ret) { -DRM_ERROR ("Failed to initialize irqchip for lpe audio: %d\n" , +drm_err (&dev_priv->drm, +"Failed to initialize irqchip for lpe audio: %d\n" , ret); goto err_free_irq; }
@@ -223,7 +226,8 @@ static int lpe_audio_setup(struct drm_i915_private *dev_priv)if (IS_ERR (dev_priv->lpe_audio.platdev)) { ret =PTR_ERR (dev_priv->lpe_audio.platdev); -DRM_ERROR ("Failed to create lpe audio platform device: %d\n" , +drm_err (&dev_priv->drm, +"Failed to create lpe audio platform device: %d\n" , ret); goto err_free_irq; }
@@ -259,8 +263,8 @@ void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv) ret =generic_handle_irq (dev_priv->lpe_audio.irq);if (ret) -DRM_ERROR_RATELIMITED ("error handling LPE audio irq: %d\n" , - ret); +drm_err_ratelimited (&dev_priv->drm, +"error handling LPE audio irq: %d\n" , ret); }/**
@@ -278,7 +282,8 @@ int intel_lpe_audio_init(struct drm_i915_private *dev_priv)if (lpe_audio_detect (dev_priv)) { ret =lpe_audio_setup (dev_priv);if (ret <0 ) -DRM_ERROR ("failed to setup LPE Audio bridge\n" ); +drm_err (&dev_priv->drm, +"failed to setup LPE Audio bridge\n" ); }return ret; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/10 drm/i915/lvds: convert to drm_device based logging macros.
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
Converts various instances of the printk based drm logging macros to the struct drm_device based logging macros in i915/display/intel_lvds.c. This transformation was done by 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(
+drm_dbg(&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,
...)
)
...+>
}
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
New checkpatch warnings were fixed manually.
--- drivers/gpu/drm/i915/display/intel_lvds.c | 43 +++++++++++++---------- 1 file changed, 25 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_lvds.c +25 -18
@@ -181,8 +181,9 @@ static void intel_lvds_pps_get_hw_state(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) <=4 && pps->t1_t2 ==0 && pps->t5 ==0 && pps->t3 ==0 && pps->tx ==0 ) { -DRM_DEBUG_KMS ("Panel power timings uninitialized, " -"setting defaults\n" ); +drm_dbg_kms (&dev_priv->drm, +"Panel power timings uninitialized, " +"setting defaults\n" );/* Set T2 to 40ms and T5 to 200ms in 100 usec units */ pps->t1_t2 =40 *10 ; pps->t5 =200 *10 ;
@@ -191,10 +192,10 @@ static void intel_lvds_pps_get_hw_state(struct drm_i915_private *dev_priv, pps->tx =200 *10 ; } -DRM_DEBUG_DRIVER ("LVDS PPS:t1+t2 %d t3 %d t4 %d t5 %d tx %d " -"divider %d port %d powerdown_on_reset %d\n" , - pps->t1_t2, pps->t3, pps->t4, pps->t5, pps->tx, - pps->divider, pps->port, pps->powerdown_on_reset); +drm_dbg (&dev_priv->drm,"LVDS PPS:t1+t2 %d t3 %d t4 %d t5 %d tx %d " +"divider %d port %d powerdown_on_reset %d\n" , + pps->t1_t2, pps->t3, pps->t4, pps->t5, pps->tx, + pps->divider, pps->port, pps->powerdown_on_reset); } static void intel_lvds_pps_init_hw(struct drm_i915_private *dev_priv,
@@ -316,7 +317,8 @@ static void intel_enable_lvds(struct intel_encoder *encoder,intel_de_posting_read (dev_priv, lvds_encoder->reg);if (intel_de_wait_for_set (dev_priv,PP_STATUS (0 ),PP_ON ,5000 )) -DRM_ERROR ("timed out waiting for panel to power on\n" ); +drm_err (&dev_priv->drm, +"timed out waiting for panel to power on\n" );intel_panel_enable_backlight (pipe_config, conn_state); }
@@ -331,7 +333,8 @@ static void intel_disable_lvds(struct intel_encoder *encoder,intel_de_write (dev_priv,PP_CONTROL (0 ),intel_de_read (dev_priv,PP_CONTROL (0 )) & ~PANEL_POWER_ON );if (intel_de_wait_for_clear (dev_priv,PP_STATUS (0 ),PP_ON ,1000 )) -DRM_ERROR ("timed out waiting for panel to power off\n" ); +drm_err (&dev_priv->drm, +"timed out waiting for panel to power off\n" );intel_de_write (dev_priv, lvds_encoder->reg,intel_de_read (dev_priv, lvds_encoder->reg) & ~LVDS_PORT_EN );
@@ -397,7 +400,7 @@ static int intel_lvds_compute_config(struct intel_encoder *intel_encoder,/* Should never happen!! */ if (INTEL_GEN (dev_priv) <4 && intel_crtc->pipe ==0 ) { -DRM_ERROR ("Can't support LVDS on pipe A\n" ); +drm_err (&dev_priv->drm,"Can't support LVDS on pipe A\n" );return -EINVAL ; }
@@ -407,8 +410,9 @@ static int intel_lvds_compute_config(struct intel_encoder *intel_encoder, lvds_bpp =6 *3 ;if (lvds_bpp != pipe_config->pipe_bpp && !pipe_config->bw_constrained) { -DRM_DEBUG_KMS ("forcing display bpp (was %d) to LVDS (%d)\n" , - pipe_config->pipe_bpp, lvds_bpp); +drm_dbg_kms (&dev_priv->drm, +"forcing display bpp (was %d) to LVDS (%d)\n" , + pipe_config->pipe_bpp, lvds_bpp); pipe_config->pipe_bpp = lvds_bpp; }
@@ -832,7 +836,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) }if (!dev_priv->vbt.int_lvds_support) { -DRM_DEBUG_KMS ("Internal LVDS support disabled by VBT\n" ); +drm_dbg_kms (&dev_priv->drm, +"Internal LVDS support disabled by VBT\n" );return ; }
@@ -851,10 +856,12 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) pin =GMBUS_PIN_PANEL ;if (!intel_bios_is_lvds_present (dev_priv, &pin)) {if ((lvds &LVDS_PORT_EN ) ==0 ) { -DRM_DEBUG_KMS ("LVDS is not present in VBT\n" ); +drm_dbg_kms (&dev_priv->drm, +"LVDS is not present in VBT\n" );return ; } -DRM_DEBUG_KMS ("LVDS is not present in VBT, but enabled anyway\n" ); +drm_dbg_kms (&dev_priv->drm, +"LVDS is not present in VBT, but enabled anyway\n" ); } lvds_encoder =kzalloc (sizeof (*lvds_encoder),GFP_KERNEL );
@@ -968,7 +975,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)*/ fixed_mode =intel_encoder_current_mode (intel_encoder);if (fixed_mode) { -DRM_DEBUG_KMS ("using current (BIOS) mode: " ); +drm_dbg_kms (&dev_priv->drm,"using current (BIOS) mode: " );drm_mode_debug_printmodeline (fixed_mode); fixed_mode->type |=DRM_MODE_TYPE_PREFERRED ; }
@@ -984,8 +991,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)intel_panel_setup_backlight (connector,INVALID_PIPE ); lvds_encoder->is_dual_link =compute_is_dual_link_lvds (lvds_encoder); -DRM_DEBUG_KMS ("detected %s-link lvds configuration\n" , - lvds_encoder->is_dual_link ?"dual" :"single" ); +drm_dbg_kms (&dev_priv->drm,"detected %s-link lvds configuration\n" , + lvds_encoder->is_dual_link ?"dual" :"single" ); lvds_encoder->a3_power = lvds &LVDS_A3_POWER_MASK ;
@@ -994,7 +1001,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) failed:mutex_unlock (&dev->mode_config.mutex); -DRM_DEBUG_KMS ("No LVDS modes found, disabling.\n" ); +drm_dbg_kms (&dev_priv->drm,"No LVDS modes found, disabling.\n" );drm_connector_cleanup (connector);drm_encoder_cleanup (encoder);kfree (lvds_encoder);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/10 drm/i915/overlay: convert to drm_device based logging.
In reply to Jani NikulaFrom: Wambui Karuga <[email protected]>
Convert various instances of the printk based drm logging macros to the struct drm_device based logging macros in i915/display/intel_overlay.c. This transformation was achieved using the following coccinelle script:
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
@@
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(
+drm_dbg(&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,
...)
)
...+>
}
Note that this converts DRM_DEBUG to drm_dbg().
Checkpatch warnings were addressed manually.
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
--- drivers/gpu/drm/i915/display/intel_overlay.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_overlay.c +6 -5
@@ -323,7 +323,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay,/* check for underruns */ tmp =intel_de_read (dev_priv,DOVSTA );if (tmp & (1 <<17 )) -DRM_DEBUG ("overlay underrun, DOVSTA: %x\n" , tmp); +drm_dbg (&dev_priv->drm,"overlay underrun, DOVSTA: %x\n" , tmp); rq =alloc_request (overlay,NULL );if (IS_ERR (rq))
@@ -1068,7 +1068,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data, overlay = dev_priv->overlay;if (!overlay) { -DRM_DEBUG ("userspace bug: no overlay\n" ); +drm_dbg (&dev_priv->drm,"userspace bug: no overlay\n" );return -ENODEV ; }
@@ -1092,7 +1092,8 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,drm_modeset_lock_all (dev);if (i915_gem_object_is_tiled (new_bo)) { -DRM_DEBUG_KMS ("buffer used for overlay image can not be tiled\n" ); +drm_dbg_kms (&dev_priv->drm, +"buffer used for overlay image can not be tiled\n" ); ret = -EINVAL ; goto out_unlock; }
@@ -1227,7 +1228,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data, overlay = dev_priv->overlay;if (!overlay) { -DRM_DEBUG ("userspace bug: no overlay\n" ); +drm_dbg (&dev_priv->drm,"userspace bug: no overlay\n" );return -ENODEV ; }
@@ -1371,7 +1372,7 @@ void intel_overlay_setup(struct drm_i915_private *dev_priv)update_reg_attrs (overlay, overlay->regs); dev_priv->overlay = overlay; -DRM_INFO ("Initialized overlay support.\n" ); +drm_info (&dev_priv->drm,"Initialized overlay support.\n" );return ; out_free:
Signature · 6 lines
2.20.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/display: conversion to drm_device based logging macros (rev6)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: conversion to drm_device based logging macros (rev6)
URL : https://patchwork.freedesktop.org/series/72760/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 9af612966bd6 drm/i915/dsb: convert to drm_device based logging macros. ffc752ecce02 drm/i915/fbc: convert to drm_device based logging macros. -:137: WARNING:LONG_LINE: line over 100 characters #137: FILE: drivers/gpu/drm/i915/display/intel_fbc.c:536: + drm_info_once(&dev_priv->drm, "not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size);
total: 0 errors, 1 warnings, 0 checks, 90 lines checked6c4d85ced842 drm/i915/fbdev: convert to drm_device based logging.33f35a10a5da drm/i915/fifo_underrun: convert to drm_device based logging.d013e210c934 drm/i915/gmbus: convert to drm_device based logging,8e4437f36baf drm/i915/hdcp: convert to struct drm_device based logging.0538804f90d2 drm/i915/hotplug: convert to drm_device based logging.62a278bf95cb drm/i915/lpe_audio: convert to 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, 68 lines checked1eca7c5e271a drm/i915/lvds: convert to drm_device based logging macros.4d3a4d7c1f64 drm/i915/overlay: convert to drm_device based logging.
-:91: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #91:
References: https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
total: 0 errors, 1 warnings, 0 checks, 41 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/display: conversion to drm_device based logging macros (rev6)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: conversion to drm_device based logging macros (rev6)
URL : https://patchwork.freedesktop.org/series/72760/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8106 -> Patchwork_16901
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/index.html
Known issues
------------
Here are the changes found in Patchwork_16901 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@gem_flink_basic@bad-open:
- fi-tgl-y: [DMESG-WARN][1] ([CI#94] / [i915#402]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/fi-tgl-y/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-kbl-8809g: [FAIL][3] ([i915#1209]) -> [FAIL][4] ([i915#192] / [i915#193] / [i915#194])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/fi-kbl-8809g/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/fi-kbl-8809g/igt@[email protected]
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[i915#1209]: https://gitlab.freedesktop.org/drm/intel/issues/1209
[i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
[i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
[i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (44 -> 40)
------------------------------
Additional (5): fi-bdw-5557u fi-kbl-7500u fi-cfl-8109u fi-skl-6600u fi-snb-2600
Missing (9): fi-kbl-7560u fi-hsw-4200u fi-byt-j1900 fi-bsw-cyan fi-ctg-p8600 fi-ivb-3770 fi-blb-e6850 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8106 -> Patchwork_16901
CI-20190529: 20190529
CI_DRM_8106: 5b0076e8066ea8218e7857ee1aa28b0670acde94 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5504: d6788bf0404f76b66170e18eb26c85004b5ccb25 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16901: 4d3a4d7c1f6498c4c369ab68de5be7b0270ef3dc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
4d3a4d7c1f64 drm/i915/overlay: convert to drm_device based logging. 1eca7c5e271a drm/i915/lvds: convert to drm_device based logging macros. 62a278bf95cb drm/i915/lpe_audio: convert to drm_device based logging macros. 0538804f90d2 drm/i915/hotplug: convert to drm_device based logging. 8e4437f36baf drm/i915/hdcp: convert to struct drm_device based logging. d013e210c934 drm/i915/gmbus: convert to drm_device based logging, 33f35a10a5da drm/i915/fifo_underrun: convert to drm_device based logging. 6c4d85ced842 drm/i915/fbdev: convert to drm_device based logging. ffc752ecce02 drm/i915/fbc: convert to drm_device based logging macros. 9af612966bd6 drm/i915/dsb: convert to drm_device based logging macros.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: conversion to drm_device based logging macros (rev6)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: conversion to drm_device based logging macros (rev6)
URL : https://patchwork.freedesktop.org/series/72760/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8106_full -> Patchwork_16901_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_16901_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#110854])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb8/igt@[email protected]
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#112080]) +10 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb5/igt@[email protected]
* igt@gem_exec_schedule@implicit-read-write-bsd2:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276] / [i915#677]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb3/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#112146]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb8/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb2/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109276]) +17 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb8/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [PASS][11] -> [DMESG-WARN][12] ([i915#180]) +3 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl7/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-kbl1/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][13] -> [FAIL][14] ([i915#46])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-skl10/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-skl2/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][15] -> [FAIL][16] ([i915#79])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-skl10/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-skl2/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-apl: [PASS][17] -> [DMESG-WARN][18] ([i915#180]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl6/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-apl4/igt@[email protected]
* igt@kms_flip@plain-flip-ts-check-interruptible:
- shard-skl: [PASS][19] -> [FAIL][20] ([i915#34])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-skl1/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-skl5/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-pwrite:
- shard-glk: [PASS][21] -> [FAIL][22] ([i915#49])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-glk8/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-pwrite.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-glk8/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-pwrite.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109642] / [fdo#111068])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb1/igt@[email protected]
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb1/igt@kms_psr@psr2_cursor_render.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][27] -> [FAIL][28] ([i915#31])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl1/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-apl1/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [DMESG-WARN][29] ([i915#180]) -> [PASS][30] +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl1/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-kbl4/igt@[email protected]
* igt@gem_ctx_persistence@close-replace-race:
- shard-apl: [INCOMPLETE][31] ([fdo#103927] / [i915#1402]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl1/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-apl3/igt@[email protected]
* igt@gem_ctx_persistence@processes:
- shard-kbl: [FAIL][33] ([i915#570] / [i915#679]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl2/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-kbl2/igt@[email protected]
* igt@gem_exec_balancer@hang:
- shard-tglb: [FAIL][35] ([i915#1277]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-tglb1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-tglb1/igt@[email protected]
* igt@gem_exec_schedule@implicit-both-bsd:
- shard-iclb: [SKIP][37] ([i915#677]) -> [PASS][38] +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb4/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb6/igt@[email protected]
* igt@gem_exec_schedule@implicit-both-bsd1:
- shard-iclb: [SKIP][39] ([fdo#109276] / [i915#677]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb8/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb2/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [SKIP][41] ([fdo#112146]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb4/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb5/igt@[email protected]
* igt@gem_exec_whisper@basic-queues-forked:
- shard-glk: [DMESG-WARN][43] ([i915#118] / [i915#95]) -> [PASS][44] +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-glk2/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-glk4/igt@[email protected]
* igt@i915_suspend@sysfs-reader:
- shard-snb: [DMESG-WARN][45] ([i915#42]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-snb4/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-snb2/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-dpms:
- shard-skl: [FAIL][47] ([i915#54]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-skl4/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-skl4/igt@[email protected]
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][49] ([fdo#109349]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb5/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb2/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
- shard-glk: [FAIL][51] ([i915#79]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-glk9/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-glk8/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [INCOMPLETE][53] -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-kbl6/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-skl: [INCOMPLETE][55] ([i915#69]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-skl8/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-skl5/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][57] ([fdo#108145]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-skl4/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-skl4/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-glk: [FAIL][59] ([i915#899]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-glk9/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-glk8/igt@[email protected]
* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][61] ([fdo#109441]) -> [PASS][62] +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb8/igt@kms_psr@psr2_suspend.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb2/igt@kms_psr@psr2_suspend.html
* igt@kms_setmode@basic:
- shard-skl: [FAIL][63] ([i915#31]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-skl10/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-skl2/igt@[email protected]
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][65] ([i915#180]) -> [PASS][66] +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl1/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-apl1/igt@[email protected]
* igt@perf_pmu@busy-no-semaphores-vcs1:
- shard-iclb: [SKIP][67] ([fdo#112080]) -> [PASS][68] +15 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb5/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb2/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][69] ([fdo#109276]) -> [PASS][70] +25 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-iclb5/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-iclb2/igt@[email protected]
#### Warnings ####
* igt@gem_linear_blits@normal:
- shard-apl: [TIMEOUT][71] ([i915#1322]) -> [TIMEOUT][72] ([fdo#111732] / [i915#1322])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl4/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-apl3/igt@[email protected]
* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [FAIL][73] ([i915#454]) -> [SKIP][74] ([i915#468])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-tglb1/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-tglb2/igt@[email protected]
* igt@i915_pm_rpm@fences:
- shard-snb: [INCOMPLETE][75] ([i915#82]) -> [SKIP][76] ([fdo#109271])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-snb4/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-snb6/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [DMESG-WARN][77] ([i915#180] / [i915#56]) -> [DMESG-WARN][78] ([i915#180])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-kbl1/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-kbl4/igt@[email protected]
* igt@runner@aborted:
- shard-apl: ([FAIL][79], [FAIL][80]) ([fdo#103927] / [i915#1402]) -> [FAIL][81] ([fdo#103927])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl1/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8106/shard-apl2/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16901/shard-apl6/igt@[email protected]
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111732]: https://bugs.freedesktop.org/show_bug.cgi?id=111732
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1277]: https://gitlab.freedesktop.org/drm/intel/issues/1277
[i915#1322]: https://gitlab.freedesktop.org/drm/intel/issues/1322
[i915#1402]: https://gitlab.freedesktop.org/drm/intel/issues/1402
[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#42]: https://gitlab.freedesktop.org/drm/intel/issues/42
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#46]: https://gitlab.freedesktop.org/drm/intel/issues/46
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#56]: https://gitlab.freedesktop.org/drm/intel/issues/56
[i915#570]: https://gitlab.freedesktop.org/drm/intel/issues/570
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#679]: https://gitlab.freedesktop.org/drm/intel/issues/679
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8106 -> Patchwork_16901
CI-20190529: 20190529
CI_DRM_8106: 5b0076e8066ea8218e7857ee1aa28b0670acde94 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5504: d6788bf0404f76b66170e18eb26c85004b5ccb25 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16901: 4d3a4d7c1f6498c4c369ab68de5be7b0270ef3dc @ 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_16901/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx