drm/i915/audio: use struct drm_device based logging
Subsystems (3)
PATCH 1/17 drm/i915/audio: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&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,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&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,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_audio.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_audio.c +7 -5
@@ -252,14 +252,16 @@ static u32 audio_config_hdmi_pixel_clock(const struct intel_crtc_state *crtc_sta i =ARRAY_SIZE (hdmi_audio_clock);if (i ==ARRAY_SIZE (hdmi_audio_clock)) { -DRM_DEBUG_KMS ("HDMI audio pixel clock setting for %d not found, falling back to defaults\n" , - adjusted_mode->crtc_clock); +drm_dbg_kms (&dev_priv->drm, +"HDMI audio pixel clock setting for %d not found, falling back to defaults\n" , + adjusted_mode->crtc_clock); i =1 ; } -DRM_DEBUG_KMS ("Configuring HDMI audio for pixel clock %d (0x%08x)\n" , - hdmi_audio_clock[i].clock, - hdmi_audio_clock[i].config); +drm_dbg_kms (&dev_priv->drm, +"Configuring HDMI audio for pixel clock %d (0x%08x)\n" , + hdmi_audio_clock[i].clock, + hdmi_audio_clock[i].config);return hdmi_audio_clock[i].config; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/17 drm/i915/panel: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&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,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&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,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_panel.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_panel.c +11 -8
@@ -684,9 +684,10 @@ static void intel_panel_actually_set_backlight(const struct drm_connector_state *conn_state, u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -DRM_DEBUG_DRIVER ("set backlight PWM = %d\n" , level); +drm_dbg_kms (&i915->drm,"set backlight PWM = %d\n" , level); level =intel_panel_compute_brightness (connector, level); panel->backlight.set (conn_state, level);
@@ -867,8 +868,8 @@ void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_st* another client is not activated. */ if (dev_priv->drm.switch_power_state ==DRM_SWITCH_POWER_CHANGING ) { -drm_dbg (&dev_priv->drm, -"Skipping backlight disable on vga switch\n" ); +drm_dbg_kms (&dev_priv->drm, +"Skipping backlight disable on vga switch\n" );return ; }
@@ -1244,7 +1245,7 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)mutex_unlock (&dev_priv->backlight_lock); -drm_dbg (&dev_priv->drm,"get backlight PWM = %d\n" , val); +drm_dbg_kms (&dev_priv->drm,"get backlight PWM = %d\n" , val);return val; }
@@ -1335,6 +1336,7 @@ static const struct backlight_ops intel_backlight_device_ops = {int intel_backlight_device_register (struct intel_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;struct backlight_properties props;
@@ -1374,14 +1376,15 @@ int intel_backlight_device_register(struct intel_connector *connector) &intel_backlight_device_ops, &props);if (IS_ERR (panel->backlight.device)) { -DRM_ERROR ("Failed to register backlight: %ld\n" , -PTR_ERR (panel->backlight.device)); +drm_err (&i915->drm,"Failed to register backlight: %ld\n" , +PTR_ERR (panel->backlight.device)); panel->backlight.device =NULL ;return -ENODEV ; } -DRM_DEBUG_KMS ("Connector %s backlight sysfs interface registered\n" , - connector->base.name); +drm_dbg_kms (&i915->drm, +"Connector %s backlight sysfs interface registered\n" , + connector->base.name);return 0 ; }
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/17] drm/i915/panel: use struct drm_device based logging
Quoted 97 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_panel.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_panel.c +0
-0
drivers/gpu/drm/i915/display/intel_panel.c static void · line 687
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_panel.c +1
-0@@ -684,9 +684,10 @@ static void intel_panel_actually_set_backlight(const struct drm_connector_state *conn_state, u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);
This addition does not match with the cocci script mentioned in the commit description.
Are you sure same script is used to generate this patch?
Quoted 28 lines
drivers/gpu/drm/i915/display/intel_panel.c +4
-4struct intel_panel *panel = &connector->panel; -DRM_DEBUG_DRIVER ("set backlight PWM = %d\n" , level); +drm_dbg_kms (&i915->drm,"set backlight PWM = %d\n" , level); level =intel_panel_compute_brightness (connector, level); panel->backlight.set (conn_state, level);@@ -867,8 +868,8 @@ void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_st* another client is not activated. */ if (dev_priv->drm.switch_power_state ==DRM_SWITCH_POWER_CHANGING ) { -drm_dbg (&dev_priv->drm, -"Skipping backlight disable on vga switch\n" ); +drm_dbg_kms (&dev_priv->drm, +"Skipping backlight disable on vga switch\n" );return ; }@@ -1244,7 +1245,7 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)mutex_unlock (&dev_priv->backlight_lock); -drm_dbg (&dev_priv->drm,"get backlight PWM = %d\n" , val); +drm_dbg_kms (&dev_priv->drm,"get backlight PWM = %d\n" , val);return val; }
drivers/gpu/drm/i915/display/intel_panel.c static const struct backlight_ops intel_backlight_device_ops = { · line 1339
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_panel.c +1
-0@@ -1335,6 +1336,7 @@ static const struct backlight_ops intel_backlight_device_ops = {int intel_backlight_device_register (struct intel_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);
Same as above.
Quoted 30 lines
drivers/gpu/drm/i915/display/intel_panel.c +5
-4struct intel_panel *panel = &connector->panel;struct backlight_properties props;@@ -1374,14 +1376,15 @@ int intel_backlight_device_register(struct intel_connector *connector) &intel_backlight_device_ops, &props);if (IS_ERR (panel->backlight.device)) { -DRM_ERROR ("Failed to register backlight: %ld\n" , -PTR_ERR (panel->backlight.device)); +drm_err (&i915->drm,"Failed to register backlight: %ld\n" , +PTR_ERR (panel->backlight.device)); panel->backlight.device =NULL ;return -ENODEV ; } -DRM_DEBUG_KMS ("Connector %s backlight sysfs interface registered\n" , - connector->base.name); +drm_dbg_kms (&i915->drm, +"Connector %s backlight sysfs interface registered\n" , + connector->base.name);return 0 ; }Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 02/17] drm/i915/panel: use struct drm_device based logging
Quoted 93 lines · Bharadiya,Pankaj
Quoted 92 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_panel.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_panel.c static void · line 687
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_panel.c +1
-0@@ -684,9 +684,10 @@ static void intel_panel_actually_set_backlight(const struct drm_connector_state *conn_state, u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);This addition does not match with the cocci script mentioned in the commit description.
Are you sure same script is used to generate this patch?
I've made some manual changes, such as adding locals first and then running the script.
BR,
Jani.
Quoted 66 lines
Quoted 29 lines
drivers/gpu/drm/i915/display/intel_panel.c +4
-4struct intel_panel *panel = &connector->panel; -DRM_DEBUG_DRIVER ("set backlight PWM = %d\n" , level); +drm_dbg_kms (&i915->drm,"set backlight PWM = %d\n" , level); level =intel_panel_compute_brightness (connector, level); panel->backlight.set (conn_state, level);@@ -867,8 +868,8 @@ void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_st* another client is not activated. */ if (dev_priv->drm.switch_power_state ==DRM_SWITCH_POWER_CHANGING ) { -drm_dbg (&dev_priv->drm, -"Skipping backlight disable on vga switch\n" ); +drm_dbg_kms (&dev_priv->drm, +"Skipping backlight disable on vga switch\n" );return ; }@@ -1244,7 +1245,7 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)mutex_unlock (&dev_priv->backlight_lock); -drm_dbg (&dev_priv->drm,"get backlight PWM = %d\n" , val); +drm_dbg_kms (&dev_priv->drm,"get backlight PWM = %d\n" , val);return val; }drivers/gpu/drm/i915/display/intel_panel.c static const struct backlight_ops intel_backlight_device_ops = { · line 1339
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_panel.c +1
-0@@ -1335,6 +1336,7 @@ static const struct backlight_ops intel_backlight_device_ops = {int intel_backlight_device_register (struct intel_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);Same as above.
Quoted 30 lines
drivers/gpu/drm/i915/display/intel_panel.c +5
-4struct intel_panel *panel = &connector->panel;struct backlight_properties props;@@ -1374,14 +1376,15 @@ int intel_backlight_device_register(struct intel_connector *connector) &intel_backlight_device_ops, &props);if (IS_ERR (panel->backlight.device)) { -DRM_ERROR ("Failed to register backlight: %ld\n" , -PTR_ERR (panel->backlight.device)); +drm_err (&i915->drm,"Failed to register backlight: %ld\n" , +PTR_ERR (panel->backlight.device)); panel->backlight.device =NULL ;return -ENODEV ; } -DRM_DEBUG_KMS ("Connector %s backlight sysfs interface registered\n" , - connector->base.name); +drm_dbg_kms (&i915->drm, +"Connector %s backlight sysfs interface registered\n" , + connector->base.name);return 0 ; }Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 02/17] drm/i915/panel: use struct drm_device based logging
Quoted 108 lines · Jani Nikula
Quoted 93 lines · Bharadiya,Pankaj
Quoted 92 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_panel.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)Quoted 13 lines
drivers/gpu/drm/i915/display/intel_panel.c static void · line 687
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_panel.c +1
-0@@ -684,9 +684,10 @@ static void intel_panel_actually_set_backlight(const struct drm_connector_state *conn_state, u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);This addition does not match with the cocci script mentioned in the commit description.
Are you sure same script is used to generate this patch?
Quoted 2 lines
I've made some manual changes, such as adding locals first and then running the script.
Adding new i915 variable seems to be redundant here since we can directly use "connector->base.dev" for getting struct drm_device pointer.
Thanks,
Pankaj
Quoted 66 lines
BR,
Jani.Quoted 62 lines
Quoted 29 lines
drivers/gpu/drm/i915/display/intel_panel.c +4
-4struct intel_panel *panel = &connector->panel; -DRM_DEBUG_DRIVER ("set backlight PWM = %d\n" , level); +drm_dbg_kms (&i915->drm,"set backlight PWM = %d\n" , level); level =intel_panel_compute_brightness (connector, level); panel->backlight.set (conn_state, level);@@ -867,8 +868,8 @@ void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_st* another client is not activated. */ if (dev_priv->drm.switch_power_state ==DRM_SWITCH_POWER_CHANGING ) { -drm_dbg (&dev_priv->drm, -"Skipping backlight disable on vga switch\n" ); +drm_dbg_kms (&dev_priv->drm, +"Skipping backlight disable on vga switch\n" );return ; }@@ -1244,7 +1245,7 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)mutex_unlock (&dev_priv->backlight_lock); -drm_dbg (&dev_priv->drm,"get backlight PWM = %d\n" , val); +drm_dbg_kms (&dev_priv->drm,"get backlight PWM = %d\n" , val);return val; }drivers/gpu/drm/i915/display/intel_panel.c static const struct backlight_ops intel_backlight_device_ops = { · line 1339
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_panel.c +1
-0@@ -1335,6 +1336,7 @@ static const struct backlight_ops intel_backlight_device_ops = {int intel_backlight_device_register (struct intel_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);Same as above.
Quoted 26 lines
drivers/gpu/drm/i915/display/intel_panel.c +5
-4struct intel_panel *panel = &connector->panel;struct backlight_properties props;@@ -1374,14 +1376,15 @@ int intel_backlight_device_register(struct intel_connector *connector) &intel_backlight_device_ops, &props);if (IS_ERR (panel->backlight.device)) { -DRM_ERROR ("Failed to register backlight: %ld\n" , -PTR_ERR (panel->backlight.device)); +drm_err (&i915->drm,"Failed to register backlight: %ld\n" , +PTR_ERR (panel->backlight.device)); panel->backlight.device =NULL ;return -ENODEV ; } -DRM_DEBUG_KMS ("Connector %s backlight sysfs interface registered\n" , - connector->base.name); +drm_dbg_kms (&i915->drm, +"Connector %s backlight sysfs interface registered\n" , + connector->base.name);return 0 ; }Signature · 1 line
2.20.1
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 1 line
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 02/17] drm/i915/panel: use struct drm_device based logging
Quoted 3 lines · Bharadiya,Pankaj
Adding new i915 variable seems to be redundant here since we can directly use "
connector->base.dev" for getting structdrm_devicepointer.
We could. However, struct drm_i915_private *i915 is widely used and needed throughout the driver, all over the place. I'd rather add i915 now instead of first using connector->base.dev or whatever, and having someone add i915 at a later time and then converting to &i915->drm.
BR,
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
Re: [Intel-gfx] [PATCH 02/17] drm/i915/panel: use struct drm_device based logging
In reply to Jani NikulaQuoted 86 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,...)
)
...+>
}
Quoted 2 lines
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 72 lines
---
drivers/gpu/drm/i915/display/intel_panel.c| 19 +++++++++++--------1 file changed, 11 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_panel.c +11
-8@@ -684,9 +684,10 @@ static void intel_panel_actually_set_backlight(const struct drm_connector_state *conn_state, u32 level) {struct intel_connector *connector =to_intel_connector (conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -DRM_DEBUG_DRIVER ("set backlight PWM = %d\n" , level); +drm_dbg_kms (&i915->drm,"set backlight PWM = %d\n" , level); level =intel_panel_compute_brightness (connector, level); panel->backlight.set (conn_state, level);@@ -867,8 +868,8 @@ void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_st* another client is not activated. */ if (dev_priv->drm.switch_power_state ==DRM_SWITCH_POWER_CHANGING ) { -drm_dbg (&dev_priv->drm, -"Skipping backlight disable on vga switch\n" ); +drm_dbg_kms (&dev_priv->drm, +"Skipping backlight disable on vga switch\n" );return ; }@@ -1244,7 +1245,7 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)mutex_unlock (&dev_priv->backlight_lock); -drm_dbg (&dev_priv->drm,"get backlight PWM = %d\n" , val); +drm_dbg_kms (&dev_priv->drm,"get backlight PWM = %d\n" , val);return val; }@@ -1335,6 +1336,7 @@ static const struct backlight_ops intel_backlight_device_ops = {int intel_backlight_device_register (struct intel_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel;struct backlight_properties props;@@ -1374,14 +1376,15 @@ int intel_backlight_device_register(struct intel_connector *connector) &intel_backlight_device_ops, &props);if (IS_ERR (panel->backlight.device)) { -DRM_ERROR ("Failed to register backlight: %ld\n" , -PTR_ERR (panel->backlight.device)); +drm_err (&i915->drm,"Failed to register backlight: %ld\n" , +PTR_ERR (panel->backlight.device)); panel->backlight.device =NULL ;return -ENODEV ; } -DRM_DEBUG_KMS ("Connector %s backlight sysfs interface registered\n" , - connector->base.name); +drm_dbg_kms (&i915->drm, +"Connector %s backlight sysfs interface registered\n" , + connector->base.name);return 0 ; }Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/17 drm/i915/tc: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&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,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&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,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_tc.c | 47 ++++++++++++++----------- 1 file changed, 27 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/display/intel_tc.c +27 -20
@@ -152,6 +152,7 @@ void intel_tc_port_set_fia_lane_count(struct intel_digital_port *dig_port,static void tc_port_fixup_legacy_flag (struct intel_digital_port *dig_port,u32 live_status_mask) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);u32 valid_hpd_mask;if (dig_port->tc_legacy_port)
@@ -164,8 +165,9 @@ static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port,return ;/* If live status mismatches the VBT flag, trust the live status. */ -DRM_ERROR ("Port %s: live status %08x mismatches the legacy port flag, fix flag\n" , - dig_port->tc_port_name, live_status_mask); +drm_err (&i915->drm, +"Port %s: live status %08x mismatches the legacy port flag, fix flag\n" , + dig_port->tc_port_name, live_status_mask); dig_port->tc_legacy_port = !dig_port->tc_legacy_port; }
@@ -233,8 +235,7 @@ static bool icl_tc_phy_set_safe_mode(struct intel_digital_port *dig_port,if (val ==0xffffffff ) {drm_dbg_kms (&i915->drm,"Port %s: PHY in TCCOLD, can't set safe-mode to %s\n" , - dig_port->tc_port_name, -enableddisabled (enable)); + dig_port->tc_port_name,enableddisabled (enable));return false; }
@@ -286,11 +287,12 @@ static bool icl_tc_phy_is_in_safe_mode(struct intel_digital_port *dig_port)static void icl_tc_phy_connect (struct intel_digital_port *dig_port,int required_lanes) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);int max_lanes;if (!icl_tc_phy_status_complete (dig_port)) { -DRM_DEBUG_KMS ("Port %s: PHY not ready\n" , - dig_port->tc_port_name); +drm_dbg_kms (&i915->drm,"Port %s: PHY not ready\n" , + dig_port->tc_port_name); goto out_set_tbt_alt_mode; }
@@ -311,15 +313,16 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port,* became disconnected. Not necessary for legacy mode. */ if (!(tc_port_live_status_mask (dig_port) &BIT (TC_PORT_DP_ALT ))) { -DRM_DEBUG_KMS ("Port %s: PHY sudden disconnect\n" , - dig_port->tc_port_name); +drm_dbg_kms (&i915->drm,"Port %s: PHY sudden disconnect\n" , + dig_port->tc_port_name); goto out_set_safe_mode; }if (max_lanes < required_lanes) { -DRM_DEBUG_KMS ("Port %s: PHY max lanes %d < required lanes %d\n" , - dig_port->tc_port_name, - max_lanes, required_lanes); +drm_dbg_kms (&i915->drm, +"Port %s: PHY max lanes %d < required lanes %d\n" , + dig_port->tc_port_name, + max_lanes, required_lanes); goto out_set_safe_mode; }
@@ -357,15 +360,17 @@ static void icl_tc_phy_disconnect(struct intel_digital_port *dig_port)static bool icl_tc_phy_is_connected (struct intel_digital_port *dig_port) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +if (!icl_tc_phy_status_complete (dig_port)) { -DRM_DEBUG_KMS ("Port %s: PHY status not complete\n" , - dig_port->tc_port_name); +drm_dbg_kms (&i915->drm,"Port %s: PHY status not complete\n" , + dig_port->tc_port_name);return dig_port->tc_mode ==TC_PORT_TBT_ALT ; }if (icl_tc_phy_is_in_safe_mode (dig_port)) { -DRM_DEBUG_KMS ("Port %s: PHY still in safe mode\n" , - dig_port->tc_port_name); +drm_dbg_kms (&i915->drm,"Port %s: PHY still in safe mode\n" , + dig_port->tc_port_name);return false; }
@@ -438,6 +443,7 @@ intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port,void intel_tc_port_sanitize (struct intel_digital_port *dig_port) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);struct intel_encoder *encoder = &dig_port->base;int active_links =0 ;
@@ -451,8 +457,9 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port)if (active_links) {if (!icl_tc_phy_is_connected (dig_port)) -DRM_DEBUG_KMS ("Port %s: PHY disconnected with %d active link(s)\n" , - dig_port->tc_port_name, active_links); +drm_dbg_kms (&i915->drm, +"Port %s: PHY disconnected with %d active link(s)\n" , + dig_port->tc_port_name, active_links);intel_tc_port_link_init_refcount (dig_port, active_links); goto out;
@@ -462,9 +469,9 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port)icl_tc_phy_connect (dig_port,1 ); out: -DRM_DEBUG_KMS ("Port %s: sanitize mode (%s)\n" , - dig_port->tc_port_name, -tc_port_mode_name (dig_port->tc_mode)); +drm_dbg_kms (&i915->drm,"Port %s: sanitize mode (%s)\n" , + dig_port->tc_port_name, +tc_port_mode_name (dig_port->tc_mode));mutex_unlock (&dig_port->tc_lock); }
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/17] drm/i915/tc: use struct drm_device based logging
Quoted 86 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,...)
)
...+>
}
Quoted 2 lines
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 128 lines
---
drivers/gpu/drm/i915/display/intel_tc.c| 47 ++++++++++++++-----------1 file changed, 27 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/display/intel_tc.c +24
-17@@ -152,6 +152,7 @@ void intel_tc_port_set_fia_lane_count(struct intel_digital_port *dig_port,static void tc_port_fixup_legacy_flag (struct intel_digital_port *dig_port,u32 live_status_mask) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);u32 valid_hpd_mask;if (dig_port->tc_legacy_port)@@ -164,8 +165,9 @@ static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port,return ;/* If live status mismatches the VBT flag, trust the live status. */ -DRM_ERROR ("Port %s: live status %08x mismatches the legacy port flag, fix flag\n" , - dig_port->tc_port_name, live_status_mask); +drm_err (&i915->drm, +"Port %s: live status %08x mismatches the legacy port flag, fix flag\n" , + dig_port->tc_port_name, live_status_mask); dig_port->tc_legacy_port = !dig_port->tc_legacy_port; }@@ -233,8 +235,7 @@ static bool icl_tc_phy_set_safe_mode(struct intel_digital_port *dig_port,if (val ==0xffffffff ) {drm_dbg_kms (&i915->drm,"Port %s: PHY in TCCOLD, can't set safe-mode to %s\n" , - dig_port->tc_port_name, -enableddisabled (enable)); + dig_port->tc_port_name,enableddisabled (enable));return false; }@@ -286,11 +287,12 @@ static bool icl_tc_phy_is_in_safe_mode(struct intel_digital_port *dig_port)static void icl_tc_phy_connect (struct intel_digital_port *dig_port,int required_lanes) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);int max_lanes;if (!icl_tc_phy_status_complete (dig_port)) { -DRM_DEBUG_KMS ("Port %s: PHY not ready\n" , - dig_port->tc_port_name); +drm_dbg_kms (&i915->drm,"Port %s: PHY not ready\n" , + dig_port->tc_port_name); goto out_set_tbt_alt_mode; }@@ -311,15 +313,16 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port,* became disconnected. Not necessary for legacy mode. */ if (!(tc_port_live_status_mask (dig_port) &BIT (TC_PORT_DP_ALT ))) { -DRM_DEBUG_KMS ("Port %s: PHY sudden disconnect\n" , - dig_port->tc_port_name); +drm_dbg_kms (&i915->drm,"Port %s: PHY sudden disconnect\n" , + dig_port->tc_port_name); goto out_set_safe_mode; }if (max_lanes < required_lanes) { -DRM_DEBUG_KMS ("Port %s: PHY max lanes %d < required lanes %d\n" , - dig_port->tc_port_name, - max_lanes, required_lanes); +drm_dbg_kms (&i915->drm, +"Port %s: PHY max lanes %d < required lanes %d\n" , + dig_port->tc_port_name, + max_lanes, required_lanes); goto out_set_safe_mode; }@@ -357,15 +360,17 @@ static void icl_tc_phy_disconnect(struct intel_digital_port *dig_port)static bool icl_tc_phy_is_connected (struct intel_digital_port *dig_port) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +if (!icl_tc_phy_status_complete (dig_port)) { -DRM_DEBUG_KMS ("Port %s: PHY status not complete\n" , - dig_port->tc_port_name); +drm_dbg_kms (&i915->drm,"Port %s: PHY status not complete\n" , + dig_port->tc_port_name);return dig_port->tc_mode ==TC_PORT_TBT_ALT ; }if (icl_tc_phy_is_in_safe_mode (dig_port)) { -DRM_DEBUG_KMS ("Port %s: PHY still in safe mode\n" , - dig_port->tc_port_name); +drm_dbg_kms (&i915->drm,"Port %s: PHY still in safe mode\n" , + dig_port->tc_port_name);return false; }@@ -438,6 +443,7 @@ intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port,void intel_tc_port_sanitize (struct intel_digital_port *dig_port) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);struct intel_encoder *encoder = &dig_port->base;int active_links =0 ;@@ -451,8 +457,9 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port)if (active_links) {if (!icl_tc_phy_is_connected (dig_port)) -DRM_DEBUG_KMS ("Port %s: PHY disconnected with %d active link(s)\n" , - dig_port->tc_port_name, active_links); +drm_dbg_kms (&i915->drm, +"Port %s: PHY disconnected with %d active link(s)\n" , + dig_port->tc_port_name, active_links);intel_tc_port_link_init_refcount (dig_port, active_links); goto out;@@ -462,9 +469,9 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port)icl_tc_phy_connect (dig_port,1 );out:
drivers/gpu/drm/i915/display/intel_tc.c +3
-3-DRM_DEBUG_KMS ("Port %s: sanitize mode (%s)\n" , - dig_port->tc_port_name, -tc_port_mode_name (dig_port->tc_mode)); +drm_dbg_kms (&i915->drm,"Port %s: sanitize mode (%s)\n" , + dig_port->tc_port_name, +tc_port_mode_name (dig_port->tc_mode));
Quoted 6 lines
mutex_unlock(&dig_port->tc_lock); }Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/17 drm/i915/dp: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&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,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&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,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_dp.c | 333 +++++++++++++++--------- 1 file changed, 213 insertions(+), 120 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +213 -120
@@ -463,6 +463,7 @@ static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp,int intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp,int link_rate,u8 lane_count) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int index; index = intel_dp_rate_index(intel_dp->common_rates,
@@ -473,7 +474,8 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, !intel_dp_can_link_train_fallback_for_edp(intel_dp, intel_dp->common_rates[index - 1], lane_count)) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); +drm_dbg_kms (&i915->drm, +"Retrying Link training for eDP with same parameters\n" );return 0 ; } intel_dp->max_link_rate = intel_dp->common_rates[index -1 ];
@@ -483,13 +485,14 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, !intel_dp_can_link_train_fallback_for_edp(intel_dp, intel_dp_max_common_rate(intel_dp), lane_count >> 1)) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); +drm_dbg_kms (&i915->drm, +"Retrying Link training for eDP with same parameters\n" );return 0 ; } intel_dp->max_link_rate =intel_dp_max_common_rate (intel_dp); intel_dp->max_link_lane_count = lane_count >>1 ; }else { -DRM_ERROR ("Link Training Unsuccessful\n" ); +drm_err (&i915->drm,"Link Training Unsuccessful\n" );return -1 ; }
@@ -564,6 +567,7 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock,int mode_hdisplay) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 min_slice_count, i;int max_slice_width;
@@ -576,8 +580,9 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp, max_slice_width =drm_dp_dsc_sink_max_slice_width (intel_dp->dsc_dpcd);if (max_slice_width <DP_DSC_MIN_SLICE_WIDTH_VALUE ) { -DRM_DEBUG_KMS ("Unsupported slice width %d by DP DSC Sink device\n" , - max_slice_width); +drm_dbg_kms (&i915->drm, +"Unsupported slice width %d by DP DSC Sink device\n" , + max_slice_width);return 0 ; }/* Also take into account max slice width */
@@ -595,7 +600,8 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,return valid_dsc_slicecount[i]; } -DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count); +drm_dbg_kms (&i915->drm,"Unsupported Slice Count %d\n" , + min_slice_count);return 0 ; }
@@ -1843,6 +1849,7 @@ static void snprintf_int_array(char *str, size_t len,static void intel_dp_print_rates (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);char str[128 ];/* FIXME: too big for stack? */ if (!drm_debug_enabled (DRM_UT_KMS ))
@@ -1850,15 +1857,15 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp)snprintf_int_array (str,sizeof (str), intel_dp->source_rates, intel_dp->num_source_rates); -DRM_DEBUG_KMS ("source rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"source rates: %s\n" , str);snprintf_int_array (str,sizeof (str), intel_dp->sink_rates, intel_dp->num_sink_rates); -DRM_DEBUG_KMS ("sink rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"sink rates: %s\n" , str);snprintf_int_array (str,sizeof (str), intel_dp->common_rates, intel_dp->num_common_rates); -DRM_DEBUG_KMS ("common rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"common rates: %s\n" , str); }int
@@ -1965,6 +1972,8 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp,struct intel_crtc_state *pipe_config, struct link_config_limits *limits) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp); +/* For DP Compliance we override the computed bpp for the pipe */ if (intel_dp->compliance.test_data.bpc !=0 ) {int bpp =3 * intel_dp->compliance.test_data.bpc;
@@ -1972,7 +1981,7 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp, limits->min_bpp = limits->max_bpp = bpp; pipe_config->dither_force_disable = bpp ==6 *3 ; -DRM_DEBUG_KMS ("Setting pipe_bpp to %d\n" , bpp); +drm_dbg_kms (&i915->drm,"Setting pipe_bpp to %d\n" , bpp); }/* Use values requested by Compliance Test Request */
@@ -2066,6 +2075,7 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 dsc_max_bpc)static int intel_dp_dsc_compute_params (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (encoder);struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config;u8 line_buf_depth;
@@ -2100,7 +2110,8 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder, line_buf_depth =drm_dp_dsc_sink_line_buf_depth (intel_dp->dsc_dpcd);if (!line_buf_depth) { -DRM_DEBUG_KMS ("DSC Sink Line Buffer Depth invalid\n" ); +drm_dbg_kms (&i915->drm, +"DSC Sink Line Buffer Depth invalid\n" );return -EINVAL ; }
@@ -2241,6 +2252,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);
@@ -2277,11 +2289,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,intel_dp_adjust_compliance_config (intel_dp, pipe_config, &limits); -DRM_DEBUG_KMS ("DP link computation with max lane count %i " -"max rate %d max bpp %d pixel clock %iKHz\n" , - limits.max_lane_count, - intel_dp->common_rates[limits.max_clock], - limits.max_bpp, adjusted_mode->crtc_clock); +drm_dbg_kms (&i915->drm,"DP link computation with max lane count %i " +"max rate %d max bpp %d pixel clock %iKHz\n" , + limits.max_lane_count, + intel_dp->common_rates[limits.max_clock], + limits.max_bpp, adjusted_mode->crtc_clock);/* * Optimize for slow and wide. This is the place to add alternative
@@ -2290,7 +2302,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, ret =intel_dp_compute_link_config_wide (intel_dp, pipe_config, &limits);/* enable compression if the mode doesn't fit available BW */ -DRM_DEBUG_KMS ("Force DSC en = %d\n" , intel_dp->force_dsc_en); +drm_dbg_kms (&i915->drm,"Force DSC en = %d\n" , intel_dp->force_dsc_en);if (ret || intel_dp->force_dsc_en) { ret =intel_dp_dsc_compute_config (intel_dp, pipe_config, conn_state, &limits);
@@ -2299,26 +2311,29 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, }if (pipe_config->dsc.compression_enable) { -DRM_DEBUG_KMS ("DP lane count %d clock %d Input bpp %d Compressed bpp %d\n" , - pipe_config->lane_count, pipe_config->port_clock, - pipe_config->pipe_bpp, - pipe_config->dsc.compressed_bpp); - -DRM_DEBUG_KMS ("DP link rate required %i available %i\n" , -intel_dp_link_required (adjusted_mode->crtc_clock, - pipe_config->dsc.compressed_bpp), -intel_dp_max_data_rate (pipe_config->port_clock, - pipe_config->lane_count)); +drm_dbg_kms (&i915->drm, +"DP lane count %d clock %d Input bpp %d Compressed bpp %d\n" , + pipe_config->lane_count, pipe_config->port_clock, + pipe_config->pipe_bpp, + pipe_config->dsc.compressed_bpp); + +drm_dbg_kms (&i915->drm, +"DP link rate required %i available %i\n" , +intel_dp_link_required (adjusted_mode->crtc_clock, + pipe_config->dsc.compressed_bpp), +intel_dp_max_data_rate (pipe_config->port_clock, + pipe_config->lane_count)); }else { -DRM_DEBUG_KMS ("DP lane count %d clock %d bpp %d\n" , - pipe_config->lane_count, pipe_config->port_clock, - pipe_config->pipe_bpp); +drm_dbg_kms (&i915->drm,"DP lane count %d clock %d bpp %d\n" , + pipe_config->lane_count, pipe_config->port_clock, + pipe_config->pipe_bpp); -DRM_DEBUG_KMS ("DP link rate required %i available %i\n" , -intel_dp_link_required (adjusted_mode->crtc_clock, - pipe_config->pipe_bpp), -intel_dp_max_data_rate (pipe_config->port_clock, - pipe_config->lane_count)); +drm_dbg_kms (&i915->drm, +"DP link rate required %i available %i\n" , +intel_dp_link_required (adjusted_mode->crtc_clock, + pipe_config->pipe_bpp), +intel_dp_max_data_rate (pipe_config->port_clock, + pipe_config->lane_count)); }return 0 ; }
@@ -2328,6 +2343,7 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,struct drm_connector *connector, struct intel_crtc_state *crtc_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp);const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
@@ -2344,7 +2360,8 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,/* YCBCR 420 output conversion needs a scaler */ ret =skl_update_scaler_crtc (crtc_state);if (ret) { -DRM_DEBUG_KMS ("Scaler allocation for output failed\n" ); +drm_dbg_kms (&i915->drm, +"Scaler allocation for output failed\n" );return ret; }
@@ -2770,22 +2787,27 @@ static void wait_panel_status(struct intel_dp *intel_dp,static void wait_panel_on (struct intel_dp *intel_dp) { -DRM_DEBUG_KMS ("Wait for panel power on\n" ); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); + +drm_dbg_kms (&i915->drm,"Wait for panel power on\n" );wait_panel_status (intel_dp,IDLE_ON_MASK ,IDLE_ON_VALUE ); }static void wait_panel_off (struct intel_dp *intel_dp) { -DRM_DEBUG_KMS ("Wait for panel power off time\n" ); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); + +drm_dbg_kms (&i915->drm,"Wait for panel power off time\n" );wait_panel_status (intel_dp,IDLE_OFF_MASK ,IDLE_OFF_VALUE ); }static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);ktime_t panel_power_on_time;s64 panel_power_off_duration; -DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +drm_dbg_kms (&i915->drm,"Wait for panel power cycle\n" );/* take the difference of currrent time and panel power off time * and then make panel wait for t11_t12 if needed. */
@@ -3149,11 +3171,12 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (conn_state->best_encoder)); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_dp_is_edp (intel_dp))return ; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );intel_panel_enable_backlight (crtc_state, conn_state);_intel_edp_backlight_on (intel_dp);
@@ -3187,11 +3210,12 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp)void intel_edp_backlight_off (const struct drm_connector_state *old_conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (old_conn_state->best_encoder)); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_dp_is_edp (intel_dp))return ; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );_intel_edp_backlight_off (intel_dp);intel_panel_disable_backlight (old_conn_state);
@@ -3204,6 +3228,7 @@ void intel_edp_backlight_off(const struct drm_connector_state *old_conn_state)static void intel_edp_backlight_power (struct intel_connector *connector,bool enable) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_dp *intel_dp =intel_attached_dp (connector);intel_wakeref_t wakeref;bool is_enabled;
@@ -3214,8 +3239,8 @@ static void intel_edp_backlight_power(struct intel_connector *connector,if (is_enabled == enable)return ; -DRM_DEBUG_KMS ("panel power control backlight %s\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"panel power control backlight %s\n" , + enable ?"enable" :"disable" );if (enable)_intel_edp_backlight_on (intel_dp);
@@ -3325,6 +3350,7 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state, bool enable) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int ret;if (!crtc_state->dsc.compression_enable)
@@ -3333,13 +3359,15 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, ret =drm_dp_dpcd_writeb (&intel_dp->aux,DP_DSC_ENABLE , enable ?DP_DECOMPRESSION_EN :0 );if (ret <0 ) -DRM_DEBUG_KMS ("Failed to %s sink decompression state\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm, +"Failed to %s sink decompression state\n" , + enable ?"enable" :"disable" ); }/* If the sink supports it, try to set the power state appropriately */ void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int ret, i;/* Should have a valid DPCD by this point */
@@ -3372,8 +3400,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode) }if (ret !=1 ) -DRM_DEBUG_KMS ("failed to %s sink power state\n" , - mode ==DRM_MODE_DPMS_ON ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"failed to %s sink power state\n" , + mode ==DRM_MODE_DPMS_ON ?"enable" :"disable" ); } static bool cpt_dp_port_selected(struct drm_i915_private *dev_priv,
@@ -4456,6 +4484,7 @@ intel_dp_link_down(struct intel_encoder *encoder,static void intel_dp_extended_receiver_capabilities (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 dpcd_ext[6 ];/*
@@ -4471,20 +4500,22 @@ intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp)if (drm_dp_dpcd_read (&intel_dp->aux,DP_DP13_DPCD_REV , &dpcd_ext,sizeof (dpcd_ext)) !=sizeof (dpcd_ext)) { -DRM_ERROR ("DPCD failed read at extended capabilities\n" ); +drm_err (&i915->drm, +"DPCD failed read at extended capabilities\n" );return ; }if (intel_dp->dpcd[DP_DPCD_REV ] > dpcd_ext[DP_DPCD_REV ]) { -DRM_DEBUG_KMS ("DPCD extended DPCD rev less than base DPCD rev\n" ); +drm_dbg_kms (&i915->drm, +"DPCD extended DPCD rev less than base DPCD rev\n" );return ; }if (!memcmp (intel_dp->dpcd, dpcd_ext,sizeof (dpcd_ext)))return ; -DRM_DEBUG_KMS ("Base DPCD: %*ph\n" , - (int )sizeof (intel_dp->dpcd), intel_dp->dpcd); +drm_dbg_kms (&i915->drm,"Base DPCD: %*ph\n" , + (int )sizeof (intel_dp->dpcd), intel_dp->dpcd);memcpy (intel_dp->dpcd, dpcd_ext,sizeof (dpcd_ext)); }
@@ -4492,13 +4523,16 @@ intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp)bool intel_dp_read_dpcd (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +if (drm_dp_dpcd_read (&intel_dp->aux,0x000 , intel_dp->dpcd,sizeof (intel_dp->dpcd)) <0 )return false;/* aux transfer failed */ intel_dp_extended_receiver_capabilities (intel_dp); -DRM_DEBUG_KMS ("DPCD: %*ph\n" , (int )sizeof (intel_dp->dpcd), intel_dp->dpcd); +drm_dbg_kms (&i915->drm,"DPCD: %*ph\n" , (int )sizeof (intel_dp->dpcd), + intel_dp->dpcd);return intel_dp->dpcd[DP_DPCD_REV ] !=0 ; }
@@ -4515,6 +4549,8 @@ bool intel_dp_get_colorimetry_status(struct intel_dp *intel_dp)static void intel_dp_get_dsc_sink_cap (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +/* * Clear the cached register set to avoid using stale values * for the sinks that do not support DSC.
@@ -4530,20 +4566,23 @@ static void intel_dp_get_dsc_sink_cap(struct intel_dp *intel_dp)if (drm_dp_dpcd_read (&intel_dp->aux,DP_DSC_SUPPORT , intel_dp->dsc_dpcd,sizeof (intel_dp->dsc_dpcd)) <0 ) -DRM_ERROR ("Failed to read DPCD register 0x%x\n" , -DP_DSC_SUPPORT ); +drm_err (&i915->drm, +"Failed to read DPCD register 0x%x\n" , +DP_DSC_SUPPORT ); -DRM_DEBUG_KMS ("DSC DPCD: %*ph\n" , - (int )sizeof (intel_dp->dsc_dpcd), - intel_dp->dsc_dpcd); +drm_dbg_kms (&i915->drm,"DSC DPCD: %*ph\n" , + (int )sizeof (intel_dp->dsc_dpcd), + intel_dp->dsc_dpcd);/* FEC is supported only on DP 1.4 */ if (!intel_dp_is_edp (intel_dp) &&drm_dp_dpcd_readb (&intel_dp->aux,DP_FEC_CAPABILITY , &intel_dp->fec_capable) <0 ) -DRM_ERROR ("Failed to read FEC DPCD register\n" ); +drm_err (&i915->drm, +"Failed to read FEC DPCD register\n" ); -DRM_DEBUG_KMS ("FEC CAPABILITY: %x\n" , intel_dp->fec_capable); +drm_dbg_kms (&i915->drm,"FEC CAPABILITY: %x\n" , + intel_dp->fec_capable); } }
@@ -4717,14 +4756,16 @@ intel_dp_can_mst(struct intel_dp *intel_dp)static void intel_dp_configure_mst (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base;bool sink_can_mst =intel_dp_sink_can_mst (intel_dp); -DRM_DEBUG_KMS ("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n" , - encoder->base.base.id, encoder->base.name, -yesno (intel_dp->can_mst),yesno (sink_can_mst), -yesno (i915_modparams.enable_dp_mst)); +drm_dbg_kms (&i915->drm, +"[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n" , + encoder->base.base.id, encoder->base.name, +yesno (intel_dp->can_mst),yesno (sink_can_mst), +yesno (i915_modparams.enable_dp_mst));if (!intel_dp->can_mst)return ;
@@ -5098,6 +5139,7 @@ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp);struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct dp_sdp infoframe_sdp = {};struct hdmi_drm_infoframe drm_infoframe = {};
@@ -5108,18 +5150,20 @@ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp, ret =drm_hdmi_infoframe_set_hdr_metadata (&drm_infoframe, conn_state);if (ret) { -DRM_DEBUG_KMS ("couldn't set HDR metadata in infoframe\n" ); +drm_dbg_kms (&i915->drm, +"couldn't set HDR metadata in infoframe\n" );return ; } len =hdmi_drm_infoframe_pack_only (&drm_infoframe, buf,sizeof (buf));if (len <0 ) { -DRM_DEBUG_KMS ("buffer size is smaller than hdr metadata infoframe\n" ); +drm_dbg_kms (&i915->drm, +"buffer size is smaller than hdr metadata infoframe\n" );return ; }if (len != infoframe_size) { -DRM_DEBUG_KMS ("wrong static hdr metadata size\n" ); +drm_dbg_kms (&i915->drm,"wrong static hdr metadata size\n" );return ; }
@@ -5197,6 +5241,7 @@ void intel_dp_hdr_metadata_enable(struct intel_dp *intel_dp,static u8 intel_dp_autotest_link_training (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int status =0 ;int test_link_rate;u8 test_lane_count, test_link_bw;
@@ -5208,7 +5253,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp) &test_lane_count);if (status <=0 ) { -DRM_DEBUG_KMS ("Lane count read failed\n" ); +drm_dbg_kms (&i915->drm,"Lane count read failed\n" );return DP_TEST_NAK ; } test_lane_count &=DP_MAX_LANE_COUNT_MASK ;
@@ -5216,7 +5261,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp) status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_LINK_RATE , &test_link_bw);if (status <=0 ) { -DRM_DEBUG_KMS ("Link Rate read failed\n" ); +drm_dbg_kms (&i915->drm,"Link Rate read failed\n" );return DP_TEST_NAK ; } test_link_rate =drm_dp_bw_code_to_link_rate (test_link_bw);
@@ -5234,6 +5279,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp)static u8 intel_dp_autotest_video_pattern (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 test_pattern;u8 test_misc;__be16 h_width, v_height;
@@ -5243,7 +5289,7 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_PATTERN , &test_pattern);if (status <=0 ) { -DRM_DEBUG_KMS ("Test pattern read failed\n" ); +drm_dbg_kms (&i915->drm,"Test pattern read failed\n" );return DP_TEST_NAK ; }if (test_pattern !=DP_COLOR_RAMP )
@@ -5252,21 +5298,21 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_H_WIDTH_HI , &h_width,2 );if (status <=0 ) { -DRM_DEBUG_KMS ("H Width read failed\n" ); +drm_dbg_kms (&i915->drm,"H Width read failed\n" );return DP_TEST_NAK ; } status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_V_HEIGHT_HI , &v_height,2 );if (status <=0 ) { -DRM_DEBUG_KMS ("V Height read failed\n" ); +drm_dbg_kms (&i915->drm,"V Height read failed\n" );return DP_TEST_NAK ; } status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_MISC0 , &test_misc);if (status <=0 ) { -DRM_DEBUG_KMS ("TEST MISC read failed\n" ); +drm_dbg_kms (&i915->drm,"TEST MISC read failed\n" );return DP_TEST_NAK ; }if ((test_misc &DP_TEST_COLOR_FORMAT_MASK ) !=DP_COLOR_FORMAT_RGB )
@@ -5295,6 +5341,7 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp)static u8 intel_dp_autotest_edid (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 test_result =DP_TEST_ACK ;struct intel_connector *intel_connector = intel_dp->attached_connector;struct drm_connector *connector = &intel_connector->base;
@@ -5311,9 +5358,10 @@ static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)*/ if (intel_dp->aux.i2c_nack_count >0 || intel_dp->aux.i2c_defer_count >0 ) -DRM_DEBUG_KMS ("EDID read had %d NACKs, %d DEFERs\n" , - intel_dp->aux.i2c_nack_count, - intel_dp->aux.i2c_defer_count); +drm_dbg_kms (&i915->drm, +"EDID read had %d NACKs, %d DEFERs\n" , + intel_dp->aux.i2c_nack_count, + intel_dp->aux.i2c_defer_count); intel_dp->compliance.test_data.edid =INTEL_DP_RESOLUTION_FAILSAFE ; }else {struct edid *block = intel_connector->detect_edid;
@@ -5325,7 +5373,8 @@ static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_EDID_CHECKSUM , block->checksum) <=0 ) -DRM_DEBUG_KMS ("Failed to write EDID checksum\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write EDID checksum\n" ); test_result =DP_TEST_ACK |DP_TEST_EDID_CHECKSUM_WRITE ; intel_dp->compliance.test_data.edid =INTEL_DP_RESOLUTION_PREFERRED ;
@@ -5345,35 +5394,38 @@ static u8 intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)static void intel_dp_handle_test_request (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 response =DP_TEST_NAK ;u8 request =0 ;int status; status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_REQUEST , &request);if (status <=0 ) { -DRM_DEBUG_KMS ("Could not read test request from sink\n" ); +drm_dbg_kms (&i915->drm, +"Could not read test request from sink\n" ); goto update_status; }switch (request) {case DP_TEST_LINK_TRAINING : -DRM_DEBUG_KMS ("LINK_TRAINING test requested\n" ); +drm_dbg_kms (&i915->drm,"LINK_TRAINING test requested\n" ); response =intel_dp_autotest_link_training (intel_dp);break ;case DP_TEST_LINK_VIDEO_PATTERN : -DRM_DEBUG_KMS ("TEST_PATTERN test requested\n" ); +drm_dbg_kms (&i915->drm,"TEST_PATTERN test requested\n" ); response =intel_dp_autotest_video_pattern (intel_dp);break ;case DP_TEST_LINK_EDID_READ : -DRM_DEBUG_KMS ("EDID test requested\n" ); +drm_dbg_kms (&i915->drm,"EDID test requested\n" ); response =intel_dp_autotest_edid (intel_dp);break ;case DP_TEST_LINK_PHY_TEST_PATTERN : -DRM_DEBUG_KMS ("PHY_PATTERN test requested\n" ); +drm_dbg_kms (&i915->drm,"PHY_PATTERN test requested\n" ); response =intel_dp_autotest_phy_pattern (intel_dp);break ;default : -DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , request); +drm_dbg_kms (&i915->drm,"Invalid test request '%02x'\n" , + request);break ; }
@@ -5383,12 +5435,14 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) update_status: status =drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_RESPONSE , response);if (status <=0 ) -DRM_DEBUG_KMS ("Could not write test response to sink\n" ); +drm_dbg_kms (&i915->drm, +"Could not write test response to sink\n" ); }static int intel_dp_check_mst_status (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);bool bret;if (intel_dp->is_mst) {
@@ -5405,12 +5459,13 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)/* check link status - esi[10] = 0x200c */ if (intel_dp->active_mst_links >0 && !drm_dp_channel_eq_ok (&esi[10 ], intel_dp->lane_count)) { -DRM_DEBUG_KMS ("channel EQ not ok, retraining\n" ); +drm_dbg_kms (&i915->drm, +"channel EQ not ok, retraining\n" );intel_dp_start_link_train (intel_dp);intel_dp_stop_link_train (intel_dp); } -DRM_DEBUG_KMS ("got esi %3ph\n" , esi); +drm_dbg_kms (&i915->drm,"got esi %3ph\n" , esi); ret =drm_dp_mst_hpd_irq (&intel_dp->mst_mgr, esi, &handled);if (handled) {
@@ -5426,7 +5481,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) bret =intel_dp_get_sink_irq_esi (intel_dp, esi);if (bret == true) { -DRM_DEBUG_KMS ("got esi2 %3ph\n" , esi); +drm_dbg_kms (&i915->drm, +"got esi2 %3ph\n" , esi); goto go_again; } }else
@@ -5434,7 +5490,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)return ret; }else { -DRM_DEBUG_KMS ("failed to get ESI - device may have failed\n" ); +drm_dbg_kms (&i915->drm, +"failed to get ESI - device may have failed\n" ); intel_dp->is_mst = false;drm_dp_mst_topology_mgr_set_mst (&intel_dp->mst_mgr, intel_dp->is_mst);
@@ -5595,6 +5652,7 @@ intel_dp_hotplug(struct intel_encoder *encoder,static void intel_dp_check_service_irq (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 val;if (intel_dp->dpcd[DP_DPCD_REV ] <0x11 )
@@ -5613,7 +5671,7 @@ static void intel_dp_check_service_irq(struct intel_dp *intel_dp)intel_hdcp_handle_cp_irq (intel_dp->attached_connector);if (val &DP_SINK_SPECIFIC_IRQ ) -DRM_DEBUG_DRIVER ("Sink specific irq unhandled\n" ); +drm_dbg_kms (&i915->drm,"Sink specific irq unhandled\n" ); }/*
@@ -5680,6 +5738,7 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)static enum drm_connector_status intel_dp_detect_dpcd (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_lspcon *lspcon =dp_to_lspcon (intel_dp);u8 *dpcd = intel_dp->dpcd;u8 type;
@@ -5727,7 +5786,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) }/* Anything else is out of spec, warn and ignore */ -DRM_DEBUG_KMS ("Broken DP branch device, ignoring\n" ); +drm_dbg_kms (&i915->drm,"Broken DP branch device, ignoring\n" );return connector_status_disconnected; }
@@ -6199,6 +6258,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)static int intel_dp_connector_register (struct drm_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct intel_dp *intel_dp =intel_attached_dp (to_intel_connector (connector));int ret;
@@ -6208,8 +6268,8 @@ intel_dp_connector_register(struct drm_connector *connector)intel_connector_debugfs_add (connector); -DRM_DEBUG_KMS ("registering %s bus for %s\n" , - intel_dp->aux.name, connector->kdev->kobj.name); +drm_dbg_kms (&i915->drm,"registering %s bus for %s\n" , + intel_dp->aux.name, connector->kdev->kobj.name); intel_dp->aux.dev = connector->kdev; ret =drm_dp_aux_register (&intel_dp->aux);
@@ -6295,6 +6355,7 @@ staticint intel_dp_hdcp_write_an_aksv (struct intel_digital_port *intel_dig_port,u8 *an) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (&intel_dig_port->base.base));static const struct drm_dp_aux_msg msg = { .request =DP_AUX_NATIVE_WRITE ,
@@ -6309,8 +6370,9 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, dpcd_ret =drm_dp_dpcd_write (&intel_dig_port->dp.aux,DP_AUX_HDCP_AN , an,DRM_HDCP_AN_LEN );if (dpcd_ret !=DRM_HDCP_AN_LEN ) { -DRM_DEBUG_KMS ("Failed to write An over DP/AUX (%zd)\n" , - dpcd_ret); +drm_dbg_kms (&i915->drm, +"Failed to write An over DP/AUX (%zd)\n" , + dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret; }
@@ -6326,17 +6388,19 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, rxbuf,sizeof (rxbuf), DP_AUX_CH_CTL_AUX_AKSV_SELECT);if (ret <0 ) { -DRM_DEBUG_KMS ("Write Aksv over DP/AUX failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm, +"Write Aksv over DP/AUX failed (%d)\n" , ret);return ret; }else if (ret ==0 ) { -DRM_DEBUG_KMS ("Aksv write over DP/AUX was empty\n" ); +drm_dbg_kms (&i915->drm,"Aksv write over DP/AUX was empty\n" );return -EIO ; } reply = (rxbuf[0 ] >>4 ) &DP_AUX_NATIVE_REPLY_MASK ;if (reply !=DP_AUX_NATIVE_REPLY_ACK ) { -DRM_DEBUG_KMS ("Aksv write: no DP_AUX_NATIVE_REPLY_ACK %x\n" , - reply); +drm_dbg_kms (&i915->drm, +"Aksv write: no DP_AUX_NATIVE_REPLY_ACK %x\n" , + reply);return -EIO ; }return 0 ;
@@ -6345,11 +6409,14 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,static int intel_dp_hdcp_read_bksv (struct intel_digital_port *intel_dig_port,u8 *bksv) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret !=DRM_HDCP_KSV_LEN ) { -DRM_DEBUG_KMS ("Read Bksv from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read Bksv from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }return 0 ;
@@ -6358,7 +6425,9 @@ static int intel_dp_hdcp_read_bksv(struct intel_digital_port *intel_dig_port,static int intel_dp_hdcp_read_bstatus (struct intel_digital_port *intel_dig_port,u8 *bstatus) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; +/* * For some reason the HDMI and DP HDCP specs call this register * definition by different names. In the HDMI spec, it's called BSTATUS,
@@ -6367,7 +6436,8 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *intel_dig_port, ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BINFO , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret !=DRM_HDCP_BSTATUS_LEN ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }return 0 ;
@@ -6377,12 +6447,14 @@ staticint intel_dp_hdcp_read_bcaps (struct intel_digital_port *intel_dig_port,u8 *bcaps) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BCAPS , bcaps,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bcaps from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bcaps from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }
@@ -6408,11 +6480,14 @@ staticint intel_dp_hdcp_read_ri_prime (struct intel_digital_port *intel_dig_port,u8 *ri_prime) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret !=DRM_HDCP_RI_LEN ) { -DRM_DEBUG_KMS ("Read Ri' from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm,"Read Ri' from DP/AUX failed (%zd)\n" , + ret);return ret >=0 ? -EIO : ret; }return 0 ;
@@ -6422,12 +6497,15 @@ staticint intel_dp_hdcp_read_ksv_ready (struct intel_digital_port *intel_dig_port,bool *ksv_ready) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;u8 bstatus; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; } *ksv_ready = bstatus &DP_BSTATUS_READY ;
@@ -6438,6 +6516,7 @@ staticint intel_dp_hdcp_read_ksv_fifo (struct intel_digital_port *intel_dig_port,int num_downstream,u8 *ksv_fifo) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;int i;
@@ -6449,8 +6528,9 @@ int intel_dp_hdcp_read_ksv_fifo(struct intel_digital_port *intel_dig_port, ksv_fifo + i *DRM_HDCP_KSV_LEN , len);if (ret != len) { -DRM_DEBUG_KMS ("Read ksv[%d] from DP/AUX failed (%zd)\n" , - i, ret); +drm_dbg_kms (&i915->drm, +"Read ksv[%d] from DP/AUX failed (%zd)\n" , + i, ret);return ret >=0 ? -EIO : ret; } }
@@ -6461,6 +6541,7 @@ staticint intel_dp_hdcp_read_v_prime_part (struct intel_digital_port *intel_dig_port,int i,u32 *part) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )
@@ -6470,7 +6551,8 @@ int intel_dp_hdcp_read_v_prime_part(struct intel_digital_port *intel_dig_port,DP_AUX_HDCP_V_PRIME (i), part, DRM_HDCP_V_PRIME_PART_LEN);if (ret !=DRM_HDCP_V_PRIME_PART_LEN ) { -DRM_DEBUG_KMS ("Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret); +drm_dbg_kms (&i915->drm, +"Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret; }return 0 ;
@@ -6487,13 +6569,15 @@ int intel_dp_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port,static bool intel_dp_hdcp_check_link (struct intel_digital_port *intel_dig_port) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return false; }
@@ -6568,13 +6652,15 @@ static inlineint intel_dp_hdcp2_read_rx_status (struct intel_digital_port *intel_dig_port,u8 *rx_status) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_HDCP_2_2_REG_RXSTATUS_OFFSET , rx_status,HDCP_2_2_DP_RXSTATUS_LEN );if (ret !=HDCP_2_2_DP_RXSTATUS_LEN ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }
@@ -6618,6 +6704,7 @@ static ssize_t intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, const struct hdcp2_dp_msg_data *hdcp2_msg_data) { + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);struct intel_dp *dp = &intel_dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;u8 msg_id = hdcp2_msg_data->msg_id;
@@ -6649,8 +6736,9 @@ intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, }if (ret) -DRM_DEBUG_KMS ("msg_id %d, ret %d, timeout(mSec): %d\n" , - hdcp2_msg_data->msg_id, ret, timeout); +drm_dbg_kms (&i915->drm, +"msg_id %d, ret %d, timeout(mSec): %d\n" , + hdcp2_msg_data->msg_id, ret, timeout);return ret; }
@@ -6736,6 +6824,7 @@ staticint intel_dp_hdcp2_read_msg (struct intel_digital_port *intel_dig_port,u8 msg_id,void *buf,size_t size) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);unsigned int offset;u8 *byte = buf;ssize_t ret, bytes_to_recv, len;
@@ -6769,7 +6858,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *intel_dig_port, ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux, offset, (void *)byte, len);if (ret <0 ) { -DRM_DEBUG_KMS ("msg_id %d, ret %zd\n" , msg_id, ret); +drm_dbg_kms (&i915->drm,"msg_id %d, ret %zd\n" , + msg_id, ret);return ret; }
@@ -7115,6 +7205,7 @@ static bool intel_edp_have_power(struct intel_dp *intel_dp)enum irqreturn intel_dp_hpd_pulse (struct intel_digital_port *intel_dig_port,bool long_hpd) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_dp *intel_dp = &intel_dig_port->dp; if (intel_dig_port->base.type == INTEL_OUTPUT_EDP &&
@@ -7125,17 +7216,18 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* would end up in an endless cycle of * "vdd off -> long/short hpd -> vdd on -> detect -> vdd off -> ..." */ -DRM_DEBUG_KMS ("ignoring %s hpd on eDP [ENCODER:%d:%s]\n" , - long_hpd ?"long" :"short" , - intel_dig_port->base.base.base.id, - intel_dig_port->base.base.name); +drm_dbg_kms (&i915->drm, +"ignoring %s hpd on eDP [ENCODER:%d:%s]\n" , + long_hpd ?"long" :"short" , + intel_dig_port->base.base.base.id, + intel_dig_port->base.base.name);return IRQ_HANDLED ; } -DRM_DEBUG_KMS ("got hpd irq on [ENCODER:%d:%s] - %s\n" , - intel_dig_port->base.base.base.id, - intel_dig_port->base.base.name, - long_hpd ?"long" :"short" ); +drm_dbg_kms (&i915->drm,"got hpd irq on [ENCODER:%d:%s] - %s\n" , + intel_dig_port->base.base.base.id, + intel_dig_port->base.base.name, + long_hpd ?"long" :"short" );if (long_hpd) { intel_dp->reset_link_params = true;
@@ -7148,8 +7240,9 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* If we were in MST mode, and device is not * there, get out of MST mode */ -DRM_DEBUG_KMS ("MST device may have disappeared %d vs %d\n" , - intel_dp->is_mst, intel_dp->mst_mgr.mst_state); +drm_dbg_kms (&i915->drm, +"MST device may have disappeared %d vs %d\n" , + intel_dp->is_mst, intel_dp->mst_mgr.mst_state); intel_dp->is_mst = false;drm_dp_mst_topology_mgr_set_mst (&intel_dp->mst_mgr, intel_dp->is_mst);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 04/17] drm/i915/dp: use struct drm_device based logging
Quoted 81 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,
Quoted 3 lines
...)
)
...+>
As per this script, conversion should happen at places where struct drm_i915_private pointer is already available, but patch does conversions in several other conversions not related to this script by adding struct drm_i915_private pointer.
Here is my example script which does the WARN* conversion. This avoids manuallal additions.
@@
identifier func, T;
@@func(struct intel_dp *T,...) {
+ struct drm_i915_private *i915 = dp_to_i915(T);
<+...
(
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&i915->drm,
...)
)
...+>
}
@@
identifier func, T;
@@
func(...) {
...
struct intel_dp *T = ...;
+ struct drm_i915_private *i915 = dp_to_i915(T);
<+...
(
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&i915->drm,
...)
)
...+>
}
Thanks,
Pankaj
Quoted 1,044 lines
}
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 333 +++++++++++++++--------- 1 file changed, 213 insertions(+), 120 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +213
-120@@ -463,6 +463,7 @@ static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp,int intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp,int link_rate,u8 lane_count) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int index; index = intel_dp_rate_index(intel_dp->common_rates,@@ -473,7 +474,8 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, !intel_dp_can_link_train_fallback_for_edp(intel_dp, intel_dp->common_rates[index - 1], lane_count)) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); +drm_dbg_kms (&i915->drm, +"Retrying Link training for eDP with same parameters\n" );return 0 ; } intel_dp->max_link_rate = intel_dp->common_rates[index -1 ];@@ -483,13 +485,14 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, !intel_dp_can_link_train_fallback_for_edp(intel_dp, intel_dp_max_common_rate(intel_dp), lane_count >> 1)) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); +drm_dbg_kms (&i915->drm, +"Retrying Link training for eDP with same parameters\n" );return 0 ; } intel_dp->max_link_rate =intel_dp_max_common_rate (intel_dp); intel_dp->max_link_lane_count = lane_count >>1 ; }else { -DRM_ERROR ("Link Training Unsuccessful\n" ); +drm_err (&i915->drm,"Link Training Unsuccessful\n" );return -1 ; }@@ -564,6 +567,7 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock,int mode_hdisplay) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 min_slice_count, i;int max_slice_width;@@ -576,8 +580,9 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp, max_slice_width =drm_dp_dsc_sink_max_slice_width (intel_dp->dsc_dpcd);if (max_slice_width <DP_DSC_MIN_SLICE_WIDTH_VALUE ) { -DRM_DEBUG_KMS ("Unsupported slice width %d by DP DSC Sink device\n" , - max_slice_width); +drm_dbg_kms (&i915->drm, +"Unsupported slice width %d by DP DSC Sink device\n" , + max_slice_width);return 0 ; }/* Also take into account max slice width */ @@ -595,7 +600,8 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,return valid_dsc_slicecount[i]; } -DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count); +drm_dbg_kms (&i915->drm,"Unsupported Slice Count %d\n" , + min_slice_count);return 0 ; }@@ -1843,6 +1849,7 @@ static void snprintf_int_array(char *str, size_t len,static void intel_dp_print_rates (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);char str[128 ];/* FIXME: too big for stack? */ if (!drm_debug_enabled (DRM_UT_KMS ))@@ -1850,15 +1857,15 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp)snprintf_int_array (str,sizeof (str), intel_dp->source_rates, intel_dp->num_source_rates); -DRM_DEBUG_KMS ("source rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"source rates: %s\n" , str);snprintf_int_array (str,sizeof (str), intel_dp->sink_rates, intel_dp->num_sink_rates); -DRM_DEBUG_KMS ("sink rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"sink rates: %s\n" , str);snprintf_int_array (str,sizeof (str), intel_dp->common_rates, intel_dp->num_common_rates); -DRM_DEBUG_KMS ("common rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"common rates: %s\n" , str); }int @@ -1965,6 +1972,8 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp,struct intel_crtc_state *pipe_config, struct link_config_limits *limits) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp); +/* For DP Compliance we override the computed bpp for the pipe */ if (intel_dp->compliance.test_data.bpc !=0 ) {int bpp =3 * intel_dp->compliance.test_data.bpc;@@ -1972,7 +1981,7 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp, limits->min_bpp = limits->max_bpp = bpp; pipe_config->dither_force_disable = bpp ==6 *3 ; -DRM_DEBUG_KMS ("Setting pipe_bpp to %d\n" , bpp); +drm_dbg_kms (&i915->drm,"Setting pipe_bpp to %d\n" , bpp); }/* Use values requested by Compliance Test Request */ @@ -2066,6 +2075,7 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 dsc_max_bpc)static int intel_dp_dsc_compute_params (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (encoder);struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config;u8 line_buf_depth;@@ -2100,7 +2110,8 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder, line_buf_depth =drm_dp_dsc_sink_line_buf_depth (intel_dp->dsc_dpcd);if (!line_buf_depth) { -DRM_DEBUG_KMS ("DSC Sink Line Buffer Depth invalid\n" ); +drm_dbg_kms (&i915->drm, +"DSC Sink Line Buffer Depth invalid\n" );return -EINVAL ; }@@ -2241,6 +2252,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);@@ -2277,11 +2289,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,intel_dp_adjust_compliance_config (intel_dp, pipe_config, &limits); -DRM_DEBUG_KMS ("DP link computation with max lane count %i " -"max rate %d max bpp %d pixel clock %iKHz\n" , - limits.max_lane_count, - intel_dp->common_rates[limits.max_clock], - limits.max_bpp, adjusted_mode->crtc_clock); +drm_dbg_kms (&i915->drm,"DP link computation with max lane count %i " +"max rate %d max bpp %d pixel clock %iKHz\n" , + limits.max_lane_count, + intel_dp->common_rates[limits.max_clock], + limits.max_bpp, adjusted_mode->crtc_clock);/* * Optimize for slow and wide. This is the place to add alternative @@ -2290,7 +2302,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, ret =intel_dp_compute_link_config_wide (intel_dp, pipe_config, &limits);/* enable compression if the mode doesn't fit available BW */ -DRM_DEBUG_KMS ("Force DSC en = %d\n" , intel_dp->force_dsc_en); +drm_dbg_kms (&i915->drm,"Force DSC en = %d\n" , intel_dp->force_dsc_en);if (ret || intel_dp->force_dsc_en) { ret =intel_dp_dsc_compute_config (intel_dp, pipe_config, conn_state, &limits);@@ -2299,26 +2311,29 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, }if (pipe_config->dsc.compression_enable) { -DRM_DEBUG_KMS ("DP lane count %d clock %d Input bpp %d Compressed bpp %d\n" , - pipe_config->lane_count, pipe_config->port_clock, - pipe_config->pipe_bpp, - pipe_config->dsc.compressed_bpp); - -DRM_DEBUG_KMS ("DP link rate required %i available %i\n" , -intel_dp_link_required (adjusted_mode->crtc_clock, - pipe_config->dsc.compressed_bpp), -intel_dp_max_data_rate (pipe_config->port_clock, - pipe_config->lane_count)); +drm_dbg_kms (&i915->drm, +"DP lane count %d clock %d Input bpp %d Compressed bpp %d\n" , + pipe_config->lane_count, pipe_config->port_clock, + pipe_config->pipe_bpp, + pipe_config->dsc.compressed_bpp); + +drm_dbg_kms (&i915->drm, +"DP link rate required %i available %i\n" , +intel_dp_link_required (adjusted_mode->crtc_clock, + pipe_config->dsc.compressed_bpp), +intel_dp_max_data_rate (pipe_config->port_clock, + pipe_config->lane_count)); }else { -DRM_DEBUG_KMS ("DP lane count %d clock %d bpp %d\n" , - pipe_config->lane_count, pipe_config->port_clock, - pipe_config->pipe_bpp); +drm_dbg_kms (&i915->drm,"DP lane count %d clock %d bpp %d\n" , + pipe_config->lane_count, pipe_config->port_clock, + pipe_config->pipe_bpp); -DRM_DEBUG_KMS ("DP link rate required %i available %i\n" , -intel_dp_link_required (adjusted_mode->crtc_clock, - pipe_config->pipe_bpp), -intel_dp_max_data_rate (pipe_config->port_clock, - pipe_config->lane_count)); +drm_dbg_kms (&i915->drm, +"DP link rate required %i available %i\n" , +intel_dp_link_required (adjusted_mode->crtc_clock, + pipe_config->pipe_bpp), +intel_dp_max_data_rate (pipe_config->port_clock, + pipe_config->lane_count)); }return 0 ; }@@ -2328,6 +2343,7 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,struct drm_connector *connector, struct intel_crtc_state *crtc_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp);const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;@@ -2344,7 +2360,8 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,/* YCBCR 420 output conversion needs a scaler */ ret =skl_update_scaler_crtc (crtc_state);if (ret) { -DRM_DEBUG_KMS ("Scaler allocation for output failed\n" ); +drm_dbg_kms (&i915->drm, +"Scaler allocation for output failed\n" );return ret; }@@ -2770,22 +2787,27 @@ static void wait_panel_status(struct intel_dp *intel_dp,static void wait_panel_on (struct intel_dp *intel_dp) { -DRM_DEBUG_KMS ("Wait for panel power on\n" ); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); + +drm_dbg_kms (&i915->drm,"Wait for panel power on\n" );wait_panel_status (intel_dp,IDLE_ON_MASK ,IDLE_ON_VALUE ); }static void wait_panel_off (struct intel_dp *intel_dp) { -DRM_DEBUG_KMS ("Wait for panel power off time\n" ); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); + +drm_dbg_kms (&i915->drm,"Wait for panel power off time\n" );wait_panel_status (intel_dp,IDLE_OFF_MASK ,IDLE_OFF_VALUE ); }static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);ktime_t panel_power_on_time;s64 panel_power_off_duration; -DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +drm_dbg_kms (&i915->drm,"Wait for panel power cycle\n" );/* take the difference of currrent time and panel power off time * and then make panel wait for t11_t12 if needed. */ @@ -3149,11 +3171,12 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (conn_state->best_encoder)); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_dp_is_edp (intel_dp))return ; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );intel_panel_enable_backlight (crtc_state, conn_state);_intel_edp_backlight_on (intel_dp);@@ -3187,11 +3210,12 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp)void intel_edp_backlight_off (const struct drm_connector_state *old_conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (old_conn_state->best_encoder)); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_dp_is_edp (intel_dp))return ; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );_intel_edp_backlight_off (intel_dp);intel_panel_disable_backlight (old_conn_state);@@ -3204,6 +3228,7 @@ void intel_edp_backlight_off(const struct drm_connector_state *old_conn_state)static void intel_edp_backlight_power (struct intel_connector *connector,bool enable) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_dp *intel_dp =intel_attached_dp (connector);intel_wakeref_t wakeref;bool is_enabled;@@ -3214,8 +3239,8 @@ static void intel_edp_backlight_power(struct intel_connector *connector,if (is_enabled == enable)return ; -DRM_DEBUG_KMS ("panel power control backlight %s\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"panel power control backlight %s\n" , + enable ?"enable" :"disable" );if (enable)_intel_edp_backlight_on (intel_dp);@@ -3325,6 +3350,7 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state, bool enable) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int ret;if (!crtc_state->dsc.compression_enable)@@ -3333,13 +3359,15 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, ret =drm_dp_dpcd_writeb (&intel_dp->aux,DP_DSC_ENABLE , enable ?DP_DECOMPRESSION_EN :0 );if (ret <0 ) -DRM_DEBUG_KMS ("Failed to %s sink decompression state\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm, +"Failed to %s sink decompression state\n" , + enable ?"enable" :"disable" ); }/* If the sink supports it, try to set the power state appropriately */ void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int ret, i;/* Should have a valid DPCD by this point */ @@ -3372,8 +3400,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode) }if (ret !=1 ) -DRM_DEBUG_KMS ("failed to %s sink power state\n" , - mode ==DRM_MODE_DPMS_ON ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"failed to %s sink power state\n" , + mode ==DRM_MODE_DPMS_ON ?"enable" :"disable" ); } static bool cpt_dp_port_selected(struct drm_i915_private *dev_priv,@@ -4456,6 +4484,7 @@ intel_dp_link_down(struct intel_encoder *encoder,static void intel_dp_extended_receiver_capabilities (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 dpcd_ext[6 ];/* @@ -4471,20 +4500,22 @@ intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp)if (drm_dp_dpcd_read (&intel_dp->aux,DP_DP13_DPCD_REV , &dpcd_ext,sizeof (dpcd_ext)) !=sizeof (dpcd_ext)) { -DRM_ERROR ("DPCD failed read at extended capabilities\n" ); +drm_err (&i915->drm, +"DPCD failed read at extended capabilities\n" );return ; }if (intel_dp->dpcd[DP_DPCD_REV ] > dpcd_ext[DP_DPCD_REV ]) { -DRM_DEBUG_KMS ("DPCD extended DPCD rev less than base DPCD rev\n" ); +drm_dbg_kms (&i915->drm, +"DPCD extended DPCD rev less than base DPCD rev\n" );return ; }if (!memcmp (intel_dp->dpcd, dpcd_ext,sizeof (dpcd_ext)))return ; -DRM_DEBUG_KMS ("Base DPCD: %*ph\n" , - (int )sizeof (intel_dp->dpcd), intel_dp->dpcd); +drm_dbg_kms (&i915->drm,"Base DPCD: %*ph\n" , + (int )sizeof (intel_dp->dpcd), intel_dp->dpcd);memcpy (intel_dp->dpcd, dpcd_ext,sizeof (dpcd_ext)); }@@ -4492,13 +4523,16 @@ intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp)bool intel_dp_read_dpcd (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +if (drm_dp_dpcd_read (&intel_dp->aux,0x000 , intel_dp->dpcd,sizeof (intel_dp->dpcd)) <0 )return false;/* aux transfer failed */ intel_dp_extended_receiver_capabilities (intel_dp); -DRM_DEBUG_KMS ("DPCD: %*ph\n" , (int )sizeof (intel_dp->dpcd), intel_dp->dpcd); +drm_dbg_kms (&i915->drm,"DPCD: %*ph\n" , (int )sizeof (intel_dp->dpcd), + intel_dp->dpcd);return intel_dp->dpcd[DP_DPCD_REV ] !=0 ; }@@ -4515,6 +4549,8 @@ bool intel_dp_get_colorimetry_status(struct intel_dp *intel_dp)static void intel_dp_get_dsc_sink_cap (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +/* * Clear the cached register set to avoid using stale values * for the sinks that do not support DSC. @@ -4530,20 +4566,23 @@ static void intel_dp_get_dsc_sink_cap(struct intel_dp *intel_dp)if (drm_dp_dpcd_read (&intel_dp->aux,DP_DSC_SUPPORT , intel_dp->dsc_dpcd,sizeof (intel_dp->dsc_dpcd)) <0 ) -DRM_ERROR ("Failed to read DPCD register 0x%x\n" , -DP_DSC_SUPPORT ); +drm_err (&i915->drm, +"Failed to read DPCD register 0x%x\n" , +DP_DSC_SUPPORT ); -DRM_DEBUG_KMS ("DSC DPCD: %*ph\n" , - (int )sizeof (intel_dp->dsc_dpcd), - intel_dp->dsc_dpcd); +drm_dbg_kms (&i915->drm,"DSC DPCD: %*ph\n" , + (int )sizeof (intel_dp->dsc_dpcd), + intel_dp->dsc_dpcd);/* FEC is supported only on DP 1.4 */ if (!intel_dp_is_edp (intel_dp) &&drm_dp_dpcd_readb (&intel_dp->aux,DP_FEC_CAPABILITY , &intel_dp->fec_capable) <0 ) -DRM_ERROR ("Failed to read FEC DPCD register\n" ); +drm_err (&i915->drm, +"Failed to read FEC DPCD register\n" ); -DRM_DEBUG_KMS ("FEC CAPABILITY: %x\n" , intel_dp->fec_capable); +drm_dbg_kms (&i915->drm,"FEC CAPABILITY: %x\n" , + intel_dp->fec_capable); } }@@ -4717,14 +4756,16 @@ intel_dp_can_mst(struct intel_dp *intel_dp)static void intel_dp_configure_mst (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base;bool sink_can_mst =intel_dp_sink_can_mst (intel_dp); -DRM_DEBUG_KMS ("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n" , - encoder->base.base.id, encoder->base.name, -yesno (intel_dp->can_mst),yesno (sink_can_mst), -yesno (i915_modparams.enable_dp_mst)); +drm_dbg_kms (&i915->drm, +"[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n" , + encoder->base.base.id, encoder->base.name, +yesno (intel_dp->can_mst),yesno (sink_can_mst), +yesno (i915_modparams.enable_dp_mst));if (!intel_dp->can_mst)return ;@@ -5098,6 +5139,7 @@ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp);struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct dp_sdp infoframe_sdp = {};struct hdmi_drm_infoframe drm_infoframe = {};@@ -5108,18 +5150,20 @@ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp, ret =drm_hdmi_infoframe_set_hdr_metadata (&drm_infoframe, conn_state);if (ret) { -DRM_DEBUG_KMS ("couldn't set HDR metadata in infoframe\n" ); +drm_dbg_kms (&i915->drm, +"couldn't set HDR metadata in infoframe\n" );return ; } len =hdmi_drm_infoframe_pack_only (&drm_infoframe, buf,sizeof (buf));if (len <0 ) { -DRM_DEBUG_KMS ("buffer size is smaller than hdr metadata infoframe\n" ); +drm_dbg_kms (&i915->drm, +"buffer size is smaller than hdr metadata infoframe\n" );return ; }if (len != infoframe_size) { -DRM_DEBUG_KMS ("wrong static hdr metadata size\n" ); +drm_dbg_kms (&i915->drm,"wrong static hdr metadata size\n" );return ; }@@ -5197,6 +5241,7 @@ void intel_dp_hdr_metadata_enable(struct intel_dp *intel_dp,static u8 intel_dp_autotest_link_training (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int status =0 ;int test_link_rate;u8 test_lane_count, test_link_bw;@@ -5208,7 +5253,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp) &test_lane_count);if (status <=0 ) { -DRM_DEBUG_KMS ("Lane count read failed\n" ); +drm_dbg_kms (&i915->drm,"Lane count read failed\n" );return DP_TEST_NAK ; } test_lane_count &=DP_MAX_LANE_COUNT_MASK ;@@ -5216,7 +5261,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp) status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_LINK_RATE , &test_link_bw);if (status <=0 ) { -DRM_DEBUG_KMS ("Link Rate read failed\n" ); +drm_dbg_kms (&i915->drm,"Link Rate read failed\n" );return DP_TEST_NAK ; } test_link_rate =drm_dp_bw_code_to_link_rate (test_link_bw);@@ -5234,6 +5279,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp)static u8 intel_dp_autotest_video_pattern (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 test_pattern;u8 test_misc;__be16 h_width, v_height;@@ -5243,7 +5289,7 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_PATTERN , &test_pattern);if (status <=0 ) { -DRM_DEBUG_KMS ("Test pattern read failed\n" ); +drm_dbg_kms (&i915->drm,"Test pattern read failed\n" );return DP_TEST_NAK ; }if (test_pattern !=DP_COLOR_RAMP )@@ -5252,21 +5298,21 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_H_WIDTH_HI , &h_width,2 );if (status <=0 ) { -DRM_DEBUG_KMS ("H Width read failed\n" ); +drm_dbg_kms (&i915->drm,"H Width read failed\n" );return DP_TEST_NAK ; } status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_V_HEIGHT_HI , &v_height,2 );if (status <=0 ) { -DRM_DEBUG_KMS ("V Height read failed\n" ); +drm_dbg_kms (&i915->drm,"V Height read failed\n" );return DP_TEST_NAK ; } status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_MISC0 , &test_misc);if (status <=0 ) { -DRM_DEBUG_KMS ("TEST MISC read failed\n" ); +drm_dbg_kms (&i915->drm,"TEST MISC read failed\n" );return DP_TEST_NAK ; }if ((test_misc &DP_TEST_COLOR_FORMAT_MASK ) !=DP_COLOR_FORMAT_RGB )@@ -5295,6 +5341,7 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp)static u8 intel_dp_autotest_edid (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 test_result =DP_TEST_ACK ;struct intel_connector *intel_connector = intel_dp->attached_connector;struct drm_connector *connector = &intel_connector->base;@@ -5311,9 +5358,10 @@ static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)*/ if (intel_dp->aux.i2c_nack_count >0 || intel_dp->aux.i2c_defer_count >0 ) -DRM_DEBUG_KMS ("EDID read had %d NACKs, %d DEFERs\n" , - intel_dp->aux.i2c_nack_count, - intel_dp->aux.i2c_defer_count); +drm_dbg_kms (&i915->drm, +"EDID read had %d NACKs, %d DEFERs\n" , + intel_dp->aux.i2c_nack_count, + intel_dp->aux.i2c_defer_count); intel_dp->compliance.test_data.edid =INTEL_DP_RESOLUTION_FAILSAFE ; }else {struct edid *block = intel_connector->detect_edid;@@ -5325,7 +5373,8 @@ static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_EDID_CHECKSUM , block->checksum) <=0 ) -DRM_DEBUG_KMS ("Failed to write EDID checksum\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write EDID checksum\n" ); test_result =DP_TEST_ACK |DP_TEST_EDID_CHECKSUM_WRITE ; intel_dp->compliance.test_data.edid =INTEL_DP_RESOLUTION_PREFERRED ;@@ -5345,35 +5394,38 @@ static u8 intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)static void intel_dp_handle_test_request (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 response =DP_TEST_NAK ;u8 request =0 ;int status; status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_REQUEST , &request);if (status <=0 ) { -DRM_DEBUG_KMS ("Could not read test request from sink\n" ); +drm_dbg_kms (&i915->drm, +"Could not read test request from sink\n" ); goto update_status; }switch (request) {case DP_TEST_LINK_TRAINING : -DRM_DEBUG_KMS ("LINK_TRAINING test requested\n" ); +drm_dbg_kms (&i915->drm,"LINK_TRAINING test requested\n" ); response =intel_dp_autotest_link_training (intel_dp);break ;case DP_TEST_LINK_VIDEO_PATTERN : -DRM_DEBUG_KMS ("TEST_PATTERN test requested\n" ); +drm_dbg_kms (&i915->drm,"TEST_PATTERN test requested\n" ); response =intel_dp_autotest_video_pattern (intel_dp);break ;case DP_TEST_LINK_EDID_READ : -DRM_DEBUG_KMS ("EDID test requested\n" ); +drm_dbg_kms (&i915->drm,"EDID test requested\n" ); response =intel_dp_autotest_edid (intel_dp);break ;case DP_TEST_LINK_PHY_TEST_PATTERN : -DRM_DEBUG_KMS ("PHY_PATTERN test requested\n" ); +drm_dbg_kms (&i915->drm,"PHY_PATTERN test requested\n" ); response =intel_dp_autotest_phy_pattern (intel_dp);break ;default : -DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , request); +drm_dbg_kms (&i915->drm,"Invalid test request '%02x'\n" , + request);break ; }@@ -5383,12 +5435,14 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) update_status: status =drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_RESPONSE , response);if (status <=0 ) -DRM_DEBUG_KMS ("Could not write test response to sink\n" ); +drm_dbg_kms (&i915->drm, +"Could not write test response to sink\n" ); }static int intel_dp_check_mst_status (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);bool bret;if (intel_dp->is_mst) {@@ -5405,12 +5459,13 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)/* check link status - esi[10] = 0x200c */ if (intel_dp->active_mst_links >0 && !drm_dp_channel_eq_ok (&esi[10 ], intel_dp->lane_count)) { -DRM_DEBUG_KMS ("channel EQ not ok, retraining\n" ); +drm_dbg_kms (&i915->drm, +"channel EQ not ok, retraining\n" );intel_dp_start_link_train (intel_dp);intel_dp_stop_link_train (intel_dp); } -DRM_DEBUG_KMS ("got esi %3ph\n" , esi); +drm_dbg_kms (&i915->drm,"got esi %3ph\n" , esi); ret =drm_dp_mst_hpd_irq (&intel_dp->mst_mgr, esi, &handled);if (handled) {@@ -5426,7 +5481,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) bret =intel_dp_get_sink_irq_esi (intel_dp, esi);if (bret == true) { -DRM_DEBUG_KMS ("got esi2 %3ph\n" , esi); +drm_dbg_kms (&i915->drm, +"got esi2 %3ph\n" , esi); goto go_again; } }else @@ -5434,7 +5490,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)return ret; }else { -DRM_DEBUG_KMS ("failed to get ESI - device may have failed\n" ); +drm_dbg_kms (&i915->drm, +"failed to get ESI - device may have failed\n" ); intel_dp->is_mst = false;drm_dp_mst_topology_mgr_set_mst (&intel_dp->mst_mgr, intel_dp->is_mst);@@ -5595,6 +5652,7 @@ intel_dp_hotplug(struct intel_encoder *encoder,static void intel_dp_check_service_irq (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 val;if (intel_dp->dpcd[DP_DPCD_REV ] <0x11 )@@ -5613,7 +5671,7 @@ static void intel_dp_check_service_irq(struct intel_dp *intel_dp)intel_hdcp_handle_cp_irq (intel_dp->attached_connector);if (val &DP_SINK_SPECIFIC_IRQ ) -DRM_DEBUG_DRIVER ("Sink specific irq unhandled\n" ); +drm_dbg_kms (&i915->drm,"Sink specific irq unhandled\n" ); }/* @@ -5680,6 +5738,7 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)static enum drm_connector_status intel_dp_detect_dpcd (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_lspcon *lspcon =dp_to_lspcon (intel_dp);u8 *dpcd = intel_dp->dpcd;u8 type;@@ -5727,7 +5786,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) }/* Anything else is out of spec, warn and ignore */ -DRM_DEBUG_KMS ("Broken DP branch device, ignoring\n" ); +drm_dbg_kms (&i915->drm,"Broken DP branch device, ignoring\n" );return connector_status_disconnected; }@@ -6199,6 +6258,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)static int intel_dp_connector_register (struct drm_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct intel_dp *intel_dp =intel_attached_dp (to_intel_connector (connector));int ret;@@ -6208,8 +6268,8 @@ intel_dp_connector_register(struct drm_connector *connector)intel_connector_debugfs_add (connector); -DRM_DEBUG_KMS ("registering %s bus for %s\n" , - intel_dp->aux.name, connector->kdev->kobj.name); +drm_dbg_kms (&i915->drm,"registering %s bus for %s\n" , + intel_dp->aux.name, connector->kdev->kobj.name); intel_dp->aux.dev = connector->kdev; ret =drm_dp_aux_register (&intel_dp->aux);@@ -6295,6 +6355,7 @@ staticint intel_dp_hdcp_write_an_aksv (struct intel_digital_port *intel_dig_port,u8 *an) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (&intel_dig_port->base.base));static const struct drm_dp_aux_msg msg = { .request =DP_AUX_NATIVE_WRITE ,@@ -6309,8 +6370,9 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, dpcd_ret =drm_dp_dpcd_write (&intel_dig_port->dp.aux,DP_AUX_HDCP_AN , an,DRM_HDCP_AN_LEN );if (dpcd_ret !=DRM_HDCP_AN_LEN ) { -DRM_DEBUG_KMS ("Failed to write An over DP/AUX (%zd)\n" , - dpcd_ret); +drm_dbg_kms (&i915->drm, +"Failed to write An over DP/AUX (%zd)\n" , + dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret; }@@ -6326,17 +6388,19 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, rxbuf,sizeof (rxbuf), DP_AUX_CH_CTL_AUX_AKSV_SELECT);if (ret <0 ) { -DRM_DEBUG_KMS ("Write Aksv over DP/AUX failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm, +"Write Aksv over DP/AUX failed (%d)\n" , ret);return ret; }else if (ret ==0 ) { -DRM_DEBUG_KMS ("Aksv write over DP/AUX was empty\n" ); +drm_dbg_kms (&i915->drm,"Aksv write over DP/AUX was empty\n" );return -EIO ; } reply = (rxbuf[0 ] >>4 ) &DP_AUX_NATIVE_REPLY_MASK ;if (reply !=DP_AUX_NATIVE_REPLY_ACK ) { -DRM_DEBUG_KMS ("Aksv write: no DP_AUX_NATIVE_REPLY_ACK %x\n" , - reply); +drm_dbg_kms (&i915->drm, +"Aksv write: no DP_AUX_NATIVE_REPLY_ACK %x\n" , + reply);return -EIO ; }return 0 ;@@ -6345,11 +6409,14 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,static int intel_dp_hdcp_read_bksv (struct intel_digital_port *intel_dig_port,u8 *bksv) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret !=DRM_HDCP_KSV_LEN ) { -DRM_DEBUG_KMS ("Read Bksv from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read Bksv from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6358,7 +6425,9 @@ static int intel_dp_hdcp_read_bksv(struct intel_digital_port *intel_dig_port,static int intel_dp_hdcp_read_bstatus (struct intel_digital_port *intel_dig_port,u8 *bstatus) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; +/* * For some reason the HDMI and DP HDCP specs call this register * definition by different names. In the HDMI spec, it's called BSTATUS, @@ -6367,7 +6436,8 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *intel_dig_port, ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BINFO , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret !=DRM_HDCP_BSTATUS_LEN ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6377,12 +6447,14 @@ staticint intel_dp_hdcp_read_bcaps (struct intel_digital_port *intel_dig_port,u8 *bcaps) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BCAPS , bcaps,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bcaps from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bcaps from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -6408,11 +6480,14 @@ staticint intel_dp_hdcp_read_ri_prime (struct intel_digital_port *intel_dig_port,u8 *ri_prime) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret !=DRM_HDCP_RI_LEN ) { -DRM_DEBUG_KMS ("Read Ri' from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm,"Read Ri' from DP/AUX failed (%zd)\n" , + ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6422,12 +6497,15 @@ staticint intel_dp_hdcp_read_ksv_ready (struct intel_digital_port *intel_dig_port,bool *ksv_ready) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;u8 bstatus; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; } *ksv_ready = bstatus &DP_BSTATUS_READY ;@@ -6438,6 +6516,7 @@ staticint intel_dp_hdcp_read_ksv_fifo (struct intel_digital_port *intel_dig_port,int num_downstream,u8 *ksv_fifo) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;int i;@@ -6449,8 +6528,9 @@ int intel_dp_hdcp_read_ksv_fifo(struct intel_digital_port *intel_dig_port, ksv_fifo + i *DRM_HDCP_KSV_LEN , len);if (ret != len) { -DRM_DEBUG_KMS ("Read ksv[%d] from DP/AUX failed (%zd)\n" , - i, ret); +drm_dbg_kms (&i915->drm, +"Read ksv[%d] from DP/AUX failed (%zd)\n" , + i, ret);return ret >=0 ? -EIO : ret; } }@@ -6461,6 +6541,7 @@ staticint intel_dp_hdcp_read_v_prime_part (struct intel_digital_port *intel_dig_port,int i,u32 *part) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )@@ -6470,7 +6551,8 @@ int intel_dp_hdcp_read_v_prime_part(struct intel_digital_port *intel_dig_port,DP_AUX_HDCP_V_PRIME (i), part, DRM_HDCP_V_PRIME_PART_LEN);if (ret !=DRM_HDCP_V_PRIME_PART_LEN ) { -DRM_DEBUG_KMS ("Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret); +drm_dbg_kms (&i915->drm, +"Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6487,13 +6569,15 @@ int intel_dp_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port,static bool intel_dp_hdcp_check_link (struct intel_digital_port *intel_dig_port) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return false; }@@ -6568,13 +6652,15 @@ static inlineint intel_dp_hdcp2_read_rx_status (struct intel_digital_port *intel_dig_port,u8 *rx_status) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_HDCP_2_2_REG_RXSTATUS_OFFSET , rx_status,HDCP_2_2_DP_RXSTATUS_LEN );if (ret !=HDCP_2_2_DP_RXSTATUS_LEN ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -6618,6 +6704,7 @@ static ssize_t intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, const struct hdcp2_dp_msg_data *hdcp2_msg_data) { + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);struct intel_dp *dp = &intel_dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;u8 msg_id = hdcp2_msg_data->msg_id;@@ -6649,8 +6736,9 @@ intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, }if (ret) -DRM_DEBUG_KMS ("msg_id %d, ret %d, timeout(mSec): %d\n" , - hdcp2_msg_data->msg_id, ret, timeout); +drm_dbg_kms (&i915->drm, +"msg_id %d, ret %d, timeout(mSec): %d\n" , + hdcp2_msg_data->msg_id, ret, timeout);return ret; }@@ -6736,6 +6824,7 @@ staticint intel_dp_hdcp2_read_msg (struct intel_digital_port *intel_dig_port,u8 msg_id,void *buf,size_t size) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);unsigned int offset;u8 *byte = buf;ssize_t ret, bytes_to_recv, len;@@ -6769,7 +6858,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *intel_dig_port, ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux, offset, (void *)byte, len);if (ret <0 ) { -DRM_DEBUG_KMS ("msg_id %d, ret %zd\n" , msg_id, ret); +drm_dbg_kms (&i915->drm,"msg_id %d, ret %zd\n" , + msg_id, ret);return ret; }@@ -7115,6 +7205,7 @@ static bool intel_edp_have_power(struct intel_dp *intel_dp)enum irqreturn intel_dp_hpd_pulse (struct intel_digital_port *intel_dig_port,bool long_hpd) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_dp *intel_dp = &intel_dig_port->dp; if (intel_dig_port->base.type == INTEL_OUTPUT_EDP &&@@ -7125,17 +7216,18 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* would end up in an endless cycle of * "vdd off -> long/short hpd -> vdd on -> detect -> vdd off -> ..." */ -DRM_DEBUG_KMS ("ignoring %s hpd on eDP [ENCODER:%d:%s]\n" , - long_hpd ?"long" :"short" , - intel_dig_port->base.base.base.id, - intel_dig_port->base.base.name); +drm_dbg_kms (&i915->drm, +"ignoring %s hpd on eDP [ENCODER:%d:%s]\n" , + long_hpd ?"long" :"short" , + intel_dig_port->base.base.base.id, + intel_dig_port->base.base.name);return IRQ_HANDLED ; } -DRM_DEBUG_KMS ("got hpd irq on [ENCODER:%d:%s] - %s\n" , - intel_dig_port->base.base.base.id, - intel_dig_port->base.base.name, - long_hpd ?"long" :"short" ); +drm_dbg_kms (&i915->drm,"got hpd irq on [ENCODER:%d:%s] - %s\n" , + intel_dig_port->base.base.base.id, + intel_dig_port->base.base.name, + long_hpd ?"long" :"short" );if (long_hpd) { intel_dp->reset_link_params = true;@@ -7148,8 +7240,9 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* If we were in MST mode, and device is not * there, get out of MST mode */ -DRM_DEBUG_KMS ("MST device may have disappeared %d vs %d\n" , - intel_dp->is_mst, intel_dp->mst_mgr.mst_state); +drm_dbg_kms (&i915->drm, +"MST device may have disappeared %d vs %d\n" , + intel_dp->is_mst, intel_dp->mst_mgr.mst_state); intel_dp->is_mst = false;drm_dp_mst_topology_mgr_set_mst (&intel_dp->mst_mgr, intel_dp->is_mst);Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 04/17] drm/i915/dp: use struct drm_device based logging
Quoted 91 lines · Bharadiya,Pankaj
Quoted 81 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,Quoted 3 lines
...)
)
...+>As per this script, conversion should happen at places where struct
drm_i915_privatepointer is already available, but patch does conversions in several other conversions not related to this script by adding structdrm_i915_privatepointer.
Quoted 2 lines
Here is my example script which does the WARN* conversion. This avoids manuallal additions.
Thanks. It's just that not all places have intel_dp. Not all places have intel_dig_port either. Etc. I opted for the slight bit of manual work to get the job done instead of trying to come up with the perfect semantic patch.
BR,
Jani.
Quoted 1,089 lines
@@
identifier func, T;
@@func(struct intel_dp *T,...){
+ structdrm_i915_private*i915 =dp_to_i915(T);
<+...
((quoted diff) +1
-1-WARN_ON( +drm_WARN_ON(&i915->drm,...)
|(quoted diff) +1
-1-WARN_ON_ONCE( +drm_WARN_ON_ONCE(&i915->drm,...)
)
...+>}
@@
identifier func, T;
@@
func(...) {
...
structintel_dp*T = ...;
+ structdrm_i915_private*i915 =dp_to_i915(T);
<+...
((quoted diff) +1
-1-WARN_ON( +drm_WARN_ON(&i915->drm,...)
|(quoted diff) +1
-1-WARN_ON_ONCE( +drm_WARN_ON_ONCE(&i915->drm,...)
)
...+>}
Thanks,
PankajQuoted 1,044 lines
}
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 333 +++++++++++++++--------- 1 file changed, 213 insertions(+), 120 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +213
-120@@ -463,6 +463,7 @@ static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp,int intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp,int link_rate,u8 lane_count) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int index; index = intel_dp_rate_index(intel_dp->common_rates,@@ -473,7 +474,8 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, !intel_dp_can_link_train_fallback_for_edp(intel_dp, intel_dp->common_rates[index - 1], lane_count)) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); +drm_dbg_kms (&i915->drm, +"Retrying Link training for eDP with same parameters\n" );return 0 ; } intel_dp->max_link_rate = intel_dp->common_rates[index -1 ];@@ -483,13 +485,14 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, !intel_dp_can_link_train_fallback_for_edp(intel_dp, intel_dp_max_common_rate(intel_dp), lane_count >> 1)) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); +drm_dbg_kms (&i915->drm, +"Retrying Link training for eDP with same parameters\n" );return 0 ; } intel_dp->max_link_rate =intel_dp_max_common_rate (intel_dp); intel_dp->max_link_lane_count = lane_count >>1 ; }else { -DRM_ERROR ("Link Training Unsuccessful\n" ); +drm_err (&i915->drm,"Link Training Unsuccessful\n" );return -1 ; }@@ -564,6 +567,7 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock,int mode_hdisplay) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 min_slice_count, i;int max_slice_width;@@ -576,8 +580,9 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp, max_slice_width =drm_dp_dsc_sink_max_slice_width (intel_dp->dsc_dpcd);if (max_slice_width <DP_DSC_MIN_SLICE_WIDTH_VALUE ) { -DRM_DEBUG_KMS ("Unsupported slice width %d by DP DSC Sink device\n" , - max_slice_width); +drm_dbg_kms (&i915->drm, +"Unsupported slice width %d by DP DSC Sink device\n" , + max_slice_width);return 0 ; }/* Also take into account max slice width */ @@ -595,7 +600,8 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,return valid_dsc_slicecount[i]; } -DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count); +drm_dbg_kms (&i915->drm,"Unsupported Slice Count %d\n" , + min_slice_count);return 0 ; }@@ -1843,6 +1849,7 @@ static void snprintf_int_array(char *str, size_t len,static void intel_dp_print_rates (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);char str[128 ];/* FIXME: too big for stack? */ if (!drm_debug_enabled (DRM_UT_KMS ))@@ -1850,15 +1857,15 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp)snprintf_int_array (str,sizeof (str), intel_dp->source_rates, intel_dp->num_source_rates); -DRM_DEBUG_KMS ("source rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"source rates: %s\n" , str);snprintf_int_array (str,sizeof (str), intel_dp->sink_rates, intel_dp->num_sink_rates); -DRM_DEBUG_KMS ("sink rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"sink rates: %s\n" , str);snprintf_int_array (str,sizeof (str), intel_dp->common_rates, intel_dp->num_common_rates); -DRM_DEBUG_KMS ("common rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"common rates: %s\n" , str); }int @@ -1965,6 +1972,8 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp,struct intel_crtc_state *pipe_config, struct link_config_limits *limits) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp); +/* For DP Compliance we override the computed bpp for the pipe */ if (intel_dp->compliance.test_data.bpc !=0 ) {int bpp =3 * intel_dp->compliance.test_data.bpc;@@ -1972,7 +1981,7 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp, limits->min_bpp = limits->max_bpp = bpp; pipe_config->dither_force_disable = bpp ==6 *3 ; -DRM_DEBUG_KMS ("Setting pipe_bpp to %d\n" , bpp); +drm_dbg_kms (&i915->drm,"Setting pipe_bpp to %d\n" , bpp); }/* Use values requested by Compliance Test Request */ @@ -2066,6 +2075,7 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 dsc_max_bpc)static int intel_dp_dsc_compute_params (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (encoder);struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config;u8 line_buf_depth;@@ -2100,7 +2110,8 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder, line_buf_depth =drm_dp_dsc_sink_line_buf_depth (intel_dp->dsc_dpcd);if (!line_buf_depth) { -DRM_DEBUG_KMS ("DSC Sink Line Buffer Depth invalid\n" ); +drm_dbg_kms (&i915->drm, +"DSC Sink Line Buffer Depth invalid\n" );return -EINVAL ; }@@ -2241,6 +2252,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);@@ -2277,11 +2289,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,intel_dp_adjust_compliance_config (intel_dp, pipe_config, &limits); -DRM_DEBUG_KMS ("DP link computation with max lane count %i " -"max rate %d max bpp %d pixel clock %iKHz\n" , - limits.max_lane_count, - intel_dp->common_rates[limits.max_clock], - limits.max_bpp, adjusted_mode->crtc_clock); +drm_dbg_kms (&i915->drm,"DP link computation with max lane count %i " +"max rate %d max bpp %d pixel clock %iKHz\n" , + limits.max_lane_count, + intel_dp->common_rates[limits.max_clock], + limits.max_bpp, adjusted_mode->crtc_clock);/* * Optimize for slow and wide. This is the place to add alternative @@ -2290,7 +2302,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, ret =intel_dp_compute_link_config_wide (intel_dp, pipe_config, &limits);/* enable compression if the mode doesn't fit available BW */ -DRM_DEBUG_KMS ("Force DSC en = %d\n" , intel_dp->force_dsc_en); +drm_dbg_kms (&i915->drm,"Force DSC en = %d\n" , intel_dp->force_dsc_en);if (ret || intel_dp->force_dsc_en) { ret =intel_dp_dsc_compute_config (intel_dp, pipe_config, conn_state, &limits);@@ -2299,26 +2311,29 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, }if (pipe_config->dsc.compression_enable) { -DRM_DEBUG_KMS ("DP lane count %d clock %d Input bpp %d Compressed bpp %d\n" , - pipe_config->lane_count, pipe_config->port_clock, - pipe_config->pipe_bpp, - pipe_config->dsc.compressed_bpp); - -DRM_DEBUG_KMS ("DP link rate required %i available %i\n" , -intel_dp_link_required (adjusted_mode->crtc_clock, - pipe_config->dsc.compressed_bpp), -intel_dp_max_data_rate (pipe_config->port_clock, - pipe_config->lane_count)); +drm_dbg_kms (&i915->drm, +"DP lane count %d clock %d Input bpp %d Compressed bpp %d\n" , + pipe_config->lane_count, pipe_config->port_clock, + pipe_config->pipe_bpp, + pipe_config->dsc.compressed_bpp); + +drm_dbg_kms (&i915->drm, +"DP link rate required %i available %i\n" , +intel_dp_link_required (adjusted_mode->crtc_clock, + pipe_config->dsc.compressed_bpp), +intel_dp_max_data_rate (pipe_config->port_clock, + pipe_config->lane_count)); }else { -DRM_DEBUG_KMS ("DP lane count %d clock %d bpp %d\n" , - pipe_config->lane_count, pipe_config->port_clock, - pipe_config->pipe_bpp); +drm_dbg_kms (&i915->drm,"DP lane count %d clock %d bpp %d\n" , + pipe_config->lane_count, pipe_config->port_clock, + pipe_config->pipe_bpp); -DRM_DEBUG_KMS ("DP link rate required %i available %i\n" , -intel_dp_link_required (adjusted_mode->crtc_clock, - pipe_config->pipe_bpp), -intel_dp_max_data_rate (pipe_config->port_clock, - pipe_config->lane_count)); +drm_dbg_kms (&i915->drm, +"DP link rate required %i available %i\n" , +intel_dp_link_required (adjusted_mode->crtc_clock, + pipe_config->pipe_bpp), +intel_dp_max_data_rate (pipe_config->port_clock, + pipe_config->lane_count)); }return 0 ; }@@ -2328,6 +2343,7 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,struct drm_connector *connector, struct intel_crtc_state *crtc_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp);const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;@@ -2344,7 +2360,8 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,/* YCBCR 420 output conversion needs a scaler */ ret =skl_update_scaler_crtc (crtc_state);if (ret) { -DRM_DEBUG_KMS ("Scaler allocation for output failed\n" ); +drm_dbg_kms (&i915->drm, +"Scaler allocation for output failed\n" );return ret; }@@ -2770,22 +2787,27 @@ static void wait_panel_status(struct intel_dp *intel_dp,static void wait_panel_on (struct intel_dp *intel_dp) { -DRM_DEBUG_KMS ("Wait for panel power on\n" ); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); + +drm_dbg_kms (&i915->drm,"Wait for panel power on\n" );wait_panel_status (intel_dp,IDLE_ON_MASK ,IDLE_ON_VALUE ); }static void wait_panel_off (struct intel_dp *intel_dp) { -DRM_DEBUG_KMS ("Wait for panel power off time\n" ); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); + +drm_dbg_kms (&i915->drm,"Wait for panel power off time\n" );wait_panel_status (intel_dp,IDLE_OFF_MASK ,IDLE_OFF_VALUE ); }static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);ktime_t panel_power_on_time;s64 panel_power_off_duration; -DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +drm_dbg_kms (&i915->drm,"Wait for panel power cycle\n" );/* take the difference of currrent time and panel power off time * and then make panel wait for t11_t12 if needed. */ @@ -3149,11 +3171,12 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (conn_state->best_encoder)); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_dp_is_edp (intel_dp))return ; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );intel_panel_enable_backlight (crtc_state, conn_state);_intel_edp_backlight_on (intel_dp);@@ -3187,11 +3210,12 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp)void intel_edp_backlight_off (const struct drm_connector_state *old_conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (old_conn_state->best_encoder)); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_dp_is_edp (intel_dp))return ; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );_intel_edp_backlight_off (intel_dp);intel_panel_disable_backlight (old_conn_state);@@ -3204,6 +3228,7 @@ void intel_edp_backlight_off(const struct drm_connector_state *old_conn_state)static void intel_edp_backlight_power (struct intel_connector *connector,bool enable) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_dp *intel_dp =intel_attached_dp (connector);intel_wakeref_t wakeref;bool is_enabled;@@ -3214,8 +3239,8 @@ static void intel_edp_backlight_power(struct intel_connector *connector,if (is_enabled == enable)return ; -DRM_DEBUG_KMS ("panel power control backlight %s\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"panel power control backlight %s\n" , + enable ?"enable" :"disable" );if (enable)_intel_edp_backlight_on (intel_dp);@@ -3325,6 +3350,7 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state, bool enable) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int ret;if (!crtc_state->dsc.compression_enable)@@ -3333,13 +3359,15 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, ret =drm_dp_dpcd_writeb (&intel_dp->aux,DP_DSC_ENABLE , enable ?DP_DECOMPRESSION_EN :0 );if (ret <0 ) -DRM_DEBUG_KMS ("Failed to %s sink decompression state\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm, +"Failed to %s sink decompression state\n" , + enable ?"enable" :"disable" ); }/* If the sink supports it, try to set the power state appropriately */ void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int ret, i;/* Should have a valid DPCD by this point */ @@ -3372,8 +3400,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode) }if (ret !=1 ) -DRM_DEBUG_KMS ("failed to %s sink power state\n" , - mode ==DRM_MODE_DPMS_ON ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"failed to %s sink power state\n" , + mode ==DRM_MODE_DPMS_ON ?"enable" :"disable" ); } static bool cpt_dp_port_selected(struct drm_i915_private *dev_priv,@@ -4456,6 +4484,7 @@ intel_dp_link_down(struct intel_encoder *encoder,static void intel_dp_extended_receiver_capabilities (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 dpcd_ext[6 ];/* @@ -4471,20 +4500,22 @@ intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp)if (drm_dp_dpcd_read (&intel_dp->aux,DP_DP13_DPCD_REV , &dpcd_ext,sizeof (dpcd_ext)) !=sizeof (dpcd_ext)) { -DRM_ERROR ("DPCD failed read at extended capabilities\n" ); +drm_err (&i915->drm, +"DPCD failed read at extended capabilities\n" );return ; }if (intel_dp->dpcd[DP_DPCD_REV ] > dpcd_ext[DP_DPCD_REV ]) { -DRM_DEBUG_KMS ("DPCD extended DPCD rev less than base DPCD rev\n" ); +drm_dbg_kms (&i915->drm, +"DPCD extended DPCD rev less than base DPCD rev\n" );return ; }if (!memcmp (intel_dp->dpcd, dpcd_ext,sizeof (dpcd_ext)))return ; -DRM_DEBUG_KMS ("Base DPCD: %*ph\n" , - (int )sizeof (intel_dp->dpcd), intel_dp->dpcd); +drm_dbg_kms (&i915->drm,"Base DPCD: %*ph\n" , + (int )sizeof (intel_dp->dpcd), intel_dp->dpcd);memcpy (intel_dp->dpcd, dpcd_ext,sizeof (dpcd_ext)); }@@ -4492,13 +4523,16 @@ intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp)bool intel_dp_read_dpcd (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +if (drm_dp_dpcd_read (&intel_dp->aux,0x000 , intel_dp->dpcd,sizeof (intel_dp->dpcd)) <0 )return false;/* aux transfer failed */ intel_dp_extended_receiver_capabilities (intel_dp); -DRM_DEBUG_KMS ("DPCD: %*ph\n" , (int )sizeof (intel_dp->dpcd), intel_dp->dpcd); +drm_dbg_kms (&i915->drm,"DPCD: %*ph\n" , (int )sizeof (intel_dp->dpcd), + intel_dp->dpcd);return intel_dp->dpcd[DP_DPCD_REV ] !=0 ; }@@ -4515,6 +4549,8 @@ bool intel_dp_get_colorimetry_status(struct intel_dp *intel_dp)static void intel_dp_get_dsc_sink_cap (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +/* * Clear the cached register set to avoid using stale values * for the sinks that do not support DSC. @@ -4530,20 +4566,23 @@ static void intel_dp_get_dsc_sink_cap(struct intel_dp *intel_dp)if (drm_dp_dpcd_read (&intel_dp->aux,DP_DSC_SUPPORT , intel_dp->dsc_dpcd,sizeof (intel_dp->dsc_dpcd)) <0 ) -DRM_ERROR ("Failed to read DPCD register 0x%x\n" , -DP_DSC_SUPPORT ); +drm_err (&i915->drm, +"Failed to read DPCD register 0x%x\n" , +DP_DSC_SUPPORT ); -DRM_DEBUG_KMS ("DSC DPCD: %*ph\n" , - (int )sizeof (intel_dp->dsc_dpcd), - intel_dp->dsc_dpcd); +drm_dbg_kms (&i915->drm,"DSC DPCD: %*ph\n" , + (int )sizeof (intel_dp->dsc_dpcd), + intel_dp->dsc_dpcd);/* FEC is supported only on DP 1.4 */ if (!intel_dp_is_edp (intel_dp) &&drm_dp_dpcd_readb (&intel_dp->aux,DP_FEC_CAPABILITY , &intel_dp->fec_capable) <0 ) -DRM_ERROR ("Failed to read FEC DPCD register\n" ); +drm_err (&i915->drm, +"Failed to read FEC DPCD register\n" ); -DRM_DEBUG_KMS ("FEC CAPABILITY: %x\n" , intel_dp->fec_capable); +drm_dbg_kms (&i915->drm,"FEC CAPABILITY: %x\n" , + intel_dp->fec_capable); } }@@ -4717,14 +4756,16 @@ intel_dp_can_mst(struct intel_dp *intel_dp)static void intel_dp_configure_mst (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base;bool sink_can_mst =intel_dp_sink_can_mst (intel_dp); -DRM_DEBUG_KMS ("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n" , - encoder->base.base.id, encoder->base.name, -yesno (intel_dp->can_mst),yesno (sink_can_mst), -yesno (i915_modparams.enable_dp_mst)); +drm_dbg_kms (&i915->drm, +"[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n" , + encoder->base.base.id, encoder->base.name, +yesno (intel_dp->can_mst),yesno (sink_can_mst), +yesno (i915_modparams.enable_dp_mst));if (!intel_dp->can_mst)return ;@@ -5098,6 +5139,7 @@ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp);struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct dp_sdp infoframe_sdp = {};struct hdmi_drm_infoframe drm_infoframe = {};@@ -5108,18 +5150,20 @@ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp, ret =drm_hdmi_infoframe_set_hdr_metadata (&drm_infoframe, conn_state);if (ret) { -DRM_DEBUG_KMS ("couldn't set HDR metadata in infoframe\n" ); +drm_dbg_kms (&i915->drm, +"couldn't set HDR metadata in infoframe\n" );return ; } len =hdmi_drm_infoframe_pack_only (&drm_infoframe, buf,sizeof (buf));if (len <0 ) { -DRM_DEBUG_KMS ("buffer size is smaller than hdr metadata infoframe\n" ); +drm_dbg_kms (&i915->drm, +"buffer size is smaller than hdr metadata infoframe\n" );return ; }if (len != infoframe_size) { -DRM_DEBUG_KMS ("wrong static hdr metadata size\n" ); +drm_dbg_kms (&i915->drm,"wrong static hdr metadata size\n" );return ; }@@ -5197,6 +5241,7 @@ void intel_dp_hdr_metadata_enable(struct intel_dp *intel_dp,static u8 intel_dp_autotest_link_training (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int status =0 ;int test_link_rate;u8 test_lane_count, test_link_bw;@@ -5208,7 +5253,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp) &test_lane_count);if (status <=0 ) { -DRM_DEBUG_KMS ("Lane count read failed\n" ); +drm_dbg_kms (&i915->drm,"Lane count read failed\n" );return DP_TEST_NAK ; } test_lane_count &=DP_MAX_LANE_COUNT_MASK ;@@ -5216,7 +5261,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp) status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_LINK_RATE , &test_link_bw);if (status <=0 ) { -DRM_DEBUG_KMS ("Link Rate read failed\n" ); +drm_dbg_kms (&i915->drm,"Link Rate read failed\n" );return DP_TEST_NAK ; } test_link_rate =drm_dp_bw_code_to_link_rate (test_link_bw);@@ -5234,6 +5279,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp)static u8 intel_dp_autotest_video_pattern (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 test_pattern;u8 test_misc;__be16 h_width, v_height;@@ -5243,7 +5289,7 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_PATTERN , &test_pattern);if (status <=0 ) { -DRM_DEBUG_KMS ("Test pattern read failed\n" ); +drm_dbg_kms (&i915->drm,"Test pattern read failed\n" );return DP_TEST_NAK ; }if (test_pattern !=DP_COLOR_RAMP )@@ -5252,21 +5298,21 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_H_WIDTH_HI , &h_width,2 );if (status <=0 ) { -DRM_DEBUG_KMS ("H Width read failed\n" ); +drm_dbg_kms (&i915->drm,"H Width read failed\n" );return DP_TEST_NAK ; } status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_V_HEIGHT_HI , &v_height,2 );if (status <=0 ) { -DRM_DEBUG_KMS ("V Height read failed\n" ); +drm_dbg_kms (&i915->drm,"V Height read failed\n" );return DP_TEST_NAK ; } status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_MISC0 , &test_misc);if (status <=0 ) { -DRM_DEBUG_KMS ("TEST MISC read failed\n" ); +drm_dbg_kms (&i915->drm,"TEST MISC read failed\n" );return DP_TEST_NAK ; }if ((test_misc &DP_TEST_COLOR_FORMAT_MASK ) !=DP_COLOR_FORMAT_RGB )@@ -5295,6 +5341,7 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp)static u8 intel_dp_autotest_edid (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 test_result =DP_TEST_ACK ;struct intel_connector *intel_connector = intel_dp->attached_connector;struct drm_connector *connector = &intel_connector->base;@@ -5311,9 +5358,10 @@ static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)*/ if (intel_dp->aux.i2c_nack_count >0 || intel_dp->aux.i2c_defer_count >0 ) -DRM_DEBUG_KMS ("EDID read had %d NACKs, %d DEFERs\n" , - intel_dp->aux.i2c_nack_count, - intel_dp->aux.i2c_defer_count); +drm_dbg_kms (&i915->drm, +"EDID read had %d NACKs, %d DEFERs\n" , + intel_dp->aux.i2c_nack_count, + intel_dp->aux.i2c_defer_count); intel_dp->compliance.test_data.edid =INTEL_DP_RESOLUTION_FAILSAFE ; }else {struct edid *block = intel_connector->detect_edid;@@ -5325,7 +5373,8 @@ static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_EDID_CHECKSUM , block->checksum) <=0 ) -DRM_DEBUG_KMS ("Failed to write EDID checksum\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write EDID checksum\n" ); test_result =DP_TEST_ACK |DP_TEST_EDID_CHECKSUM_WRITE ; intel_dp->compliance.test_data.edid =INTEL_DP_RESOLUTION_PREFERRED ;@@ -5345,35 +5394,38 @@ static u8 intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)static void intel_dp_handle_test_request (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 response =DP_TEST_NAK ;u8 request =0 ;int status; status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_REQUEST , &request);if (status <=0 ) { -DRM_DEBUG_KMS ("Could not read test request from sink\n" ); +drm_dbg_kms (&i915->drm, +"Could not read test request from sink\n" ); goto update_status; }switch (request) {case DP_TEST_LINK_TRAINING : -DRM_DEBUG_KMS ("LINK_TRAINING test requested\n" ); +drm_dbg_kms (&i915->drm,"LINK_TRAINING test requested\n" ); response =intel_dp_autotest_link_training (intel_dp);break ;case DP_TEST_LINK_VIDEO_PATTERN : -DRM_DEBUG_KMS ("TEST_PATTERN test requested\n" ); +drm_dbg_kms (&i915->drm,"TEST_PATTERN test requested\n" ); response =intel_dp_autotest_video_pattern (intel_dp);break ;case DP_TEST_LINK_EDID_READ : -DRM_DEBUG_KMS ("EDID test requested\n" ); +drm_dbg_kms (&i915->drm,"EDID test requested\n" ); response =intel_dp_autotest_edid (intel_dp);break ;case DP_TEST_LINK_PHY_TEST_PATTERN : -DRM_DEBUG_KMS ("PHY_PATTERN test requested\n" ); +drm_dbg_kms (&i915->drm,"PHY_PATTERN test requested\n" ); response =intel_dp_autotest_phy_pattern (intel_dp);break ;default : -DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , request); +drm_dbg_kms (&i915->drm,"Invalid test request '%02x'\n" , + request);break ; }@@ -5383,12 +5435,14 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp) update_status: status =drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_RESPONSE , response);if (status <=0 ) -DRM_DEBUG_KMS ("Could not write test response to sink\n" ); +drm_dbg_kms (&i915->drm, +"Could not write test response to sink\n" ); }static int intel_dp_check_mst_status (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);bool bret;if (intel_dp->is_mst) {@@ -5405,12 +5459,13 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)/* check link status - esi[10] = 0x200c */ if (intel_dp->active_mst_links >0 && !drm_dp_channel_eq_ok (&esi[10 ], intel_dp->lane_count)) { -DRM_DEBUG_KMS ("channel EQ not ok, retraining\n" ); +drm_dbg_kms (&i915->drm, +"channel EQ not ok, retraining\n" );intel_dp_start_link_train (intel_dp);intel_dp_stop_link_train (intel_dp); } -DRM_DEBUG_KMS ("got esi %3ph\n" , esi); +drm_dbg_kms (&i915->drm,"got esi %3ph\n" , esi); ret =drm_dp_mst_hpd_irq (&intel_dp->mst_mgr, esi, &handled);if (handled) {@@ -5426,7 +5481,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) bret =intel_dp_get_sink_irq_esi (intel_dp, esi);if (bret == true) { -DRM_DEBUG_KMS ("got esi2 %3ph\n" , esi); +drm_dbg_kms (&i915->drm, +"got esi2 %3ph\n" , esi); goto go_again; } }else @@ -5434,7 +5490,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)return ret; }else { -DRM_DEBUG_KMS ("failed to get ESI - device may have failed\n" ); +drm_dbg_kms (&i915->drm, +"failed to get ESI - device may have failed\n" ); intel_dp->is_mst = false;drm_dp_mst_topology_mgr_set_mst (&intel_dp->mst_mgr, intel_dp->is_mst);@@ -5595,6 +5652,7 @@ intel_dp_hotplug(struct intel_encoder *encoder,static void intel_dp_check_service_irq (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 val;if (intel_dp->dpcd[DP_DPCD_REV ] <0x11 )@@ -5613,7 +5671,7 @@ static void intel_dp_check_service_irq(struct intel_dp *intel_dp)intel_hdcp_handle_cp_irq (intel_dp->attached_connector);if (val &DP_SINK_SPECIFIC_IRQ ) -DRM_DEBUG_DRIVER ("Sink specific irq unhandled\n" ); +drm_dbg_kms (&i915->drm,"Sink specific irq unhandled\n" ); }/* @@ -5680,6 +5738,7 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)static enum drm_connector_status intel_dp_detect_dpcd (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_lspcon *lspcon =dp_to_lspcon (intel_dp);u8 *dpcd = intel_dp->dpcd;u8 type;@@ -5727,7 +5786,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) }/* Anything else is out of spec, warn and ignore */ -DRM_DEBUG_KMS ("Broken DP branch device, ignoring\n" ); +drm_dbg_kms (&i915->drm,"Broken DP branch device, ignoring\n" );return connector_status_disconnected; }@@ -6199,6 +6258,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)static int intel_dp_connector_register (struct drm_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct intel_dp *intel_dp =intel_attached_dp (to_intel_connector (connector));int ret;@@ -6208,8 +6268,8 @@ intel_dp_connector_register(struct drm_connector *connector)intel_connector_debugfs_add (connector); -DRM_DEBUG_KMS ("registering %s bus for %s\n" , - intel_dp->aux.name, connector->kdev->kobj.name); +drm_dbg_kms (&i915->drm,"registering %s bus for %s\n" , + intel_dp->aux.name, connector->kdev->kobj.name); intel_dp->aux.dev = connector->kdev; ret =drm_dp_aux_register (&intel_dp->aux);@@ -6295,6 +6355,7 @@ staticint intel_dp_hdcp_write_an_aksv (struct intel_digital_port *intel_dig_port,u8 *an) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (&intel_dig_port->base.base));static const struct drm_dp_aux_msg msg = { .request =DP_AUX_NATIVE_WRITE ,@@ -6309,8 +6370,9 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, dpcd_ret =drm_dp_dpcd_write (&intel_dig_port->dp.aux,DP_AUX_HDCP_AN , an,DRM_HDCP_AN_LEN );if (dpcd_ret !=DRM_HDCP_AN_LEN ) { -DRM_DEBUG_KMS ("Failed to write An over DP/AUX (%zd)\n" , - dpcd_ret); +drm_dbg_kms (&i915->drm, +"Failed to write An over DP/AUX (%zd)\n" , + dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret; }@@ -6326,17 +6388,19 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, rxbuf,sizeof (rxbuf), DP_AUX_CH_CTL_AUX_AKSV_SELECT);if (ret <0 ) { -DRM_DEBUG_KMS ("Write Aksv over DP/AUX failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm, +"Write Aksv over DP/AUX failed (%d)\n" , ret);return ret; }else if (ret ==0 ) { -DRM_DEBUG_KMS ("Aksv write over DP/AUX was empty\n" ); +drm_dbg_kms (&i915->drm,"Aksv write over DP/AUX was empty\n" );return -EIO ; } reply = (rxbuf[0 ] >>4 ) &DP_AUX_NATIVE_REPLY_MASK ;if (reply !=DP_AUX_NATIVE_REPLY_ACK ) { -DRM_DEBUG_KMS ("Aksv write: no DP_AUX_NATIVE_REPLY_ACK %x\n" , - reply); +drm_dbg_kms (&i915->drm, +"Aksv write: no DP_AUX_NATIVE_REPLY_ACK %x\n" , + reply);return -EIO ; }return 0 ;@@ -6345,11 +6409,14 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,static int intel_dp_hdcp_read_bksv (struct intel_digital_port *intel_dig_port,u8 *bksv) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret !=DRM_HDCP_KSV_LEN ) { -DRM_DEBUG_KMS ("Read Bksv from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read Bksv from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6358,7 +6425,9 @@ static int intel_dp_hdcp_read_bksv(struct intel_digital_port *intel_dig_port,static int intel_dp_hdcp_read_bstatus (struct intel_digital_port *intel_dig_port,u8 *bstatus) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; +/* * For some reason the HDMI and DP HDCP specs call this register * definition by different names. In the HDMI spec, it's called BSTATUS, @@ -6367,7 +6436,8 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *intel_dig_port, ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BINFO , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret !=DRM_HDCP_BSTATUS_LEN ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6377,12 +6447,14 @@ staticint intel_dp_hdcp_read_bcaps (struct intel_digital_port *intel_dig_port,u8 *bcaps) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BCAPS , bcaps,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bcaps from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bcaps from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -6408,11 +6480,14 @@ staticint intel_dp_hdcp_read_ri_prime (struct intel_digital_port *intel_dig_port,u8 *ri_prime) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret !=DRM_HDCP_RI_LEN ) { -DRM_DEBUG_KMS ("Read Ri' from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm,"Read Ri' from DP/AUX failed (%zd)\n" , + ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6422,12 +6497,15 @@ staticint intel_dp_hdcp_read_ksv_ready (struct intel_digital_port *intel_dig_port,bool *ksv_ready) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;u8 bstatus; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; } *ksv_ready = bstatus &DP_BSTATUS_READY ;@@ -6438,6 +6516,7 @@ staticint intel_dp_hdcp_read_ksv_fifo (struct intel_digital_port *intel_dig_port,int num_downstream,u8 *ksv_fifo) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;int i;@@ -6449,8 +6528,9 @@ int intel_dp_hdcp_read_ksv_fifo(struct intel_digital_port *intel_dig_port, ksv_fifo + i *DRM_HDCP_KSV_LEN , len);if (ret != len) { -DRM_DEBUG_KMS ("Read ksv[%d] from DP/AUX failed (%zd)\n" , - i, ret); +drm_dbg_kms (&i915->drm, +"Read ksv[%d] from DP/AUX failed (%zd)\n" , + i, ret);return ret >=0 ? -EIO : ret; } }@@ -6461,6 +6541,7 @@ staticint intel_dp_hdcp_read_v_prime_part (struct intel_digital_port *intel_dig_port,int i,u32 *part) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )@@ -6470,7 +6551,8 @@ int intel_dp_hdcp_read_v_prime_part(struct intel_digital_port *intel_dig_port,DP_AUX_HDCP_V_PRIME (i), part, DRM_HDCP_V_PRIME_PART_LEN);if (ret !=DRM_HDCP_V_PRIME_PART_LEN ) { -DRM_DEBUG_KMS ("Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret); +drm_dbg_kms (&i915->drm, +"Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6487,13 +6569,15 @@ int intel_dp_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port,static bool intel_dp_hdcp_check_link (struct intel_digital_port *intel_dig_port) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return false; }@@ -6568,13 +6652,15 @@ static inlineint intel_dp_hdcp2_read_rx_status (struct intel_digital_port *intel_dig_port,u8 *rx_status) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_HDCP_2_2_REG_RXSTATUS_OFFSET , rx_status,HDCP_2_2_DP_RXSTATUS_LEN );if (ret !=HDCP_2_2_DP_RXSTATUS_LEN ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -6618,6 +6704,7 @@ static ssize_t intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, const struct hdcp2_dp_msg_data *hdcp2_msg_data) { + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);struct intel_dp *dp = &intel_dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;u8 msg_id = hdcp2_msg_data->msg_id;@@ -6649,8 +6736,9 @@ intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, }if (ret) -DRM_DEBUG_KMS ("msg_id %d, ret %d, timeout(mSec): %d\n" , - hdcp2_msg_data->msg_id, ret, timeout); +drm_dbg_kms (&i915->drm, +"msg_id %d, ret %d, timeout(mSec): %d\n" , + hdcp2_msg_data->msg_id, ret, timeout);return ret; }@@ -6736,6 +6824,7 @@ staticint intel_dp_hdcp2_read_msg (struct intel_digital_port *intel_dig_port,u8 msg_id,void *buf,size_t size) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);unsigned int offset;u8 *byte = buf;ssize_t ret, bytes_to_recv, len;@@ -6769,7 +6858,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *intel_dig_port, ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux, offset, (void *)byte, len);if (ret <0 ) { -DRM_DEBUG_KMS ("msg_id %d, ret %zd\n" , msg_id, ret); +drm_dbg_kms (&i915->drm,"msg_id %d, ret %zd\n" , + msg_id, ret);return ret; }@@ -7115,6 +7205,7 @@ static bool intel_edp_have_power(struct intel_dp *intel_dp)enum irqreturn intel_dp_hpd_pulse (struct intel_digital_port *intel_dig_port,bool long_hpd) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_dp *intel_dp = &intel_dig_port->dp; if (intel_dig_port->base.type == INTEL_OUTPUT_EDP &&@@ -7125,17 +7216,18 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* would end up in an endless cycle of * "vdd off -> long/short hpd -> vdd on -> detect -> vdd off -> ..." */ -DRM_DEBUG_KMS ("ignoring %s hpd on eDP [ENCODER:%d:%s]\n" , - long_hpd ?"long" :"short" , - intel_dig_port->base.base.base.id, - intel_dig_port->base.base.name); +drm_dbg_kms (&i915->drm, +"ignoring %s hpd on eDP [ENCODER:%d:%s]\n" , + long_hpd ?"long" :"short" , + intel_dig_port->base.base.base.id, + intel_dig_port->base.base.name);return IRQ_HANDLED ; } -DRM_DEBUG_KMS ("got hpd irq on [ENCODER:%d:%s] - %s\n" , - intel_dig_port->base.base.base.id, - intel_dig_port->base.base.name, - long_hpd ?"long" :"short" ); +drm_dbg_kms (&i915->drm,"got hpd irq on [ENCODER:%d:%s] - %s\n" , + intel_dig_port->base.base.base.id, + intel_dig_port->base.base.name, + long_hpd ?"long" :"short" );if (long_hpd) { intel_dp->reset_link_params = true;@@ -7148,8 +7240,9 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* If we were in MST mode, and device is not * there, get out of MST mode */ -DRM_DEBUG_KMS ("MST device may have disappeared %d vs %d\n" , - intel_dp->is_mst, intel_dp->mst_mgr.mst_state); +drm_dbg_kms (&i915->drm, +"MST device may have disappeared %d vs %d\n" , + intel_dp->is_mst, intel_dp->mst_mgr.mst_state); intel_dp->is_mst = false;drm_dp_mst_topology_mgr_set_mst (&intel_dp->mst_mgr, intel_dp->is_mst);Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 04/17] drm/i915/dp: use struct drm_device based logging
In reply to Jani NikulaQuoted 1,110 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>---
drivers/gpu/drm/i915/display/intel_dp.c| 333 +++++++++++++++---------1 file changed, 213 insertions(+), 120 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +16
-9@@ -463,6 +463,7 @@ static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp,int intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp,int link_rate,u8 lane_count) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int index; index = intel_dp_rate_index(intel_dp->common_rates,@@ -473,7 +474,8 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, !intel_dp_can_link_train_fallback_for_edp(intel_dp, intel_dp->common_rates[index - 1], lane_count)) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); +drm_dbg_kms (&i915->drm, +"Retrying Link training for eDP with same parameters\n" );return 0 ; } intel_dp->max_link_rate = intel_dp->common_rates[index -1 ];@@ -483,13 +485,14 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, !intel_dp_can_link_train_fallback_for_edp(intel_dp, intel_dp_max_common_rate(intel_dp), lane_count >> 1)) { -DRM_DEBUG_KMS ("Retrying Link training for eDP with same parameters\n" ); +drm_dbg_kms (&i915->drm, +"Retrying Link training for eDP with same parameters\n" );return 0 ; } intel_dp->max_link_rate =intel_dp_max_common_rate (intel_dp); intel_dp->max_link_lane_count = lane_count >>1 ; }else { -DRM_ERROR ("Link Training Unsuccessful\n" ); +drm_err (&i915->drm,"Link Training Unsuccessful\n" );return -1 ; }@@ -564,6 +567,7 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock,int mode_hdisplay) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 min_slice_count, i;int max_slice_width;@@ -576,8 +580,9 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp, max_slice_width =drm_dp_dsc_sink_max_slice_width (intel_dp->dsc_dpcd);if (max_slice_width <DP_DSC_MIN_SLICE_WIDTH_VALUE ) { -DRM_DEBUG_KMS ("Unsupported slice width %d by DP DSC Sink device\n" , - max_slice_width); +drm_dbg_kms (&i915->drm, +"Unsupported slice width %d by DP DSC Sink device\n" , + max_slice_width);return 0 ; }/* Also take into account max slice width */ @@ -595,7 +600,8 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,return valid_dsc_slicecount[i]; } -DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count); +drm_dbg_kms (&i915->drm,"Unsupported Slice Count %d\n" , + min_slice_count);return 0 ; }@@ -1843,6 +1849,7 @@ static void snprintf_int_array(char *str, size_t len,static void intel_dp_print_rates (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);char str[128 ];/* FIXME: too big for stack? */ if (!drm_debug_enabled (DRM_UT_KMS ))@@ -1850,15 +1857,15 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp)snprintf_int_array (str,sizeof (str), intel_dp->source_rates, intel_dp->num_source_rates); -DRM_DEBUG_KMS ("source rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"source rates: %s\n" , str);snprintf_int_array (str,sizeof (str), intel_dp->sink_rates, intel_dp->num_sink_rates); -DRM_DEBUG_KMS ("sink rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"sink rates: %s\n" , str);snprintf_int_array (str,sizeof (str), intel_dp->common_rates, intel_dp->num_common_rates); -DRM_DEBUG_KMS ("common rates: %s\n" , str); +drm_dbg_kms (&i915->drm,"common rates: %s\n" , str); }int
drivers/gpu/drm/i915/display/intel_dp.c +59
-38@@ -1965,6 +1972,8 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp,struct intel_crtc_state *pipe_config, struct link_config_limits *limits) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp); +/* For DP Compliance we override the computed bpp for the pipe */ if (intel_dp->compliance.test_data.bpc !=0 ) {int bpp =3 * intel_dp->compliance.test_data.bpc;@@ -1972,7 +1981,7 @@ intel_dp_adjust_compliance_config(struct intel_dp *intel_dp, limits->min_bpp = limits->max_bpp = bpp; pipe_config->dither_force_disable = bpp ==6 *3 ; -DRM_DEBUG_KMS ("Setting pipe_bpp to %d\n" , bpp); +drm_dbg_kms (&i915->drm,"Setting pipe_bpp to %d\n" , bpp); }/* Use values requested by Compliance Test Request */ @@ -2066,6 +2075,7 @@ static int intel_dp_dsc_compute_bpp(struct intel_dp *intel_dp, u8 dsc_max_bpc)static int intel_dp_dsc_compute_params (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (encoder);struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config;u8 line_buf_depth;@@ -2100,7 +2110,8 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder, line_buf_depth =drm_dp_dsc_sink_line_buf_depth (intel_dp->dsc_dpcd);if (!line_buf_depth) { -DRM_DEBUG_KMS ("DSC Sink Line Buffer Depth invalid\n" ); +drm_dbg_kms (&i915->drm, +"DSC Sink Line Buffer Depth invalid\n" );return -EINVAL ; }@@ -2241,6 +2252,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (encoder);@@ -2277,11 +2289,11 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,intel_dp_adjust_compliance_config (intel_dp, pipe_config, &limits); -DRM_DEBUG_KMS ("DP link computation with max lane count %i " -"max rate %d max bpp %d pixel clock %iKHz\n" , - limits.max_lane_count, - intel_dp->common_rates[limits.max_clock], - limits.max_bpp, adjusted_mode->crtc_clock); +drm_dbg_kms (&i915->drm,"DP link computation with max lane count %i " +"max rate %d max bpp %d pixel clock %iKHz\n" , + limits.max_lane_count, + intel_dp->common_rates[limits.max_clock], + limits.max_bpp, adjusted_mode->crtc_clock);/* * Optimize for slow and wide. This is the place to add alternative @@ -2290,7 +2302,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, ret =intel_dp_compute_link_config_wide (intel_dp, pipe_config, &limits);/* enable compression if the mode doesn't fit available BW */ -DRM_DEBUG_KMS ("Force DSC en = %d\n" , intel_dp->force_dsc_en); +drm_dbg_kms (&i915->drm,"Force DSC en = %d\n" , intel_dp->force_dsc_en);if (ret || intel_dp->force_dsc_en) { ret =intel_dp_dsc_compute_config (intel_dp, pipe_config, conn_state, &limits);@@ -2299,26 +2311,29 @@ intel_dp_compute_link_config(struct intel_encoder *encoder, }if (pipe_config->dsc.compression_enable) { -DRM_DEBUG_KMS ("DP lane count %d clock %d Input bpp %d Compressed bpp %d\n" , - pipe_config->lane_count, pipe_config->port_clock, - pipe_config->pipe_bpp, - pipe_config->dsc.compressed_bpp); - -DRM_DEBUG_KMS ("DP link rate required %i available %i\n" , -intel_dp_link_required (adjusted_mode->crtc_clock, - pipe_config->dsc.compressed_bpp), -intel_dp_max_data_rate (pipe_config->port_clock, - pipe_config->lane_count)); +drm_dbg_kms (&i915->drm, +"DP lane count %d clock %d Input bpp %d Compressed bpp %d\n" , + pipe_config->lane_count, pipe_config->port_clock, + pipe_config->pipe_bpp, + pipe_config->dsc.compressed_bpp); + +drm_dbg_kms (&i915->drm, +"DP link rate required %i available %i\n" , +intel_dp_link_required (adjusted_mode->crtc_clock, + pipe_config->dsc.compressed_bpp), +intel_dp_max_data_rate (pipe_config->port_clock, + pipe_config->lane_count)); }else { -DRM_DEBUG_KMS ("DP lane count %d clock %d bpp %d\n" , - pipe_config->lane_count, pipe_config->port_clock, - pipe_config->pipe_bpp); +drm_dbg_kms (&i915->drm,"DP lane count %d clock %d bpp %d\n" , + pipe_config->lane_count, pipe_config->port_clock, + pipe_config->pipe_bpp); -DRM_DEBUG_KMS ("DP link rate required %i available %i\n" , -intel_dp_link_required (adjusted_mode->crtc_clock, - pipe_config->pipe_bpp), -intel_dp_max_data_rate (pipe_config->port_clock, - pipe_config->lane_count)); +drm_dbg_kms (&i915->drm, +"DP link rate required %i available %i\n" , +intel_dp_link_required (adjusted_mode->crtc_clock, + pipe_config->pipe_bpp), +intel_dp_max_data_rate (pipe_config->port_clock, + pipe_config->lane_count)); }return 0 ; }@@ -2328,6 +2343,7 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,struct drm_connector *connector, struct intel_crtc_state *crtc_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp);const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;@@ -2344,7 +2360,8 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp,/* YCBCR 420 output conversion needs a scaler */ ret =skl_update_scaler_crtc (crtc_state);if (ret) { -DRM_DEBUG_KMS ("Scaler allocation for output failed\n" ); +drm_dbg_kms (&i915->drm, +"Scaler allocation for output failed\n" );return ret; }@@ -2770,22 +2787,27 @@ static void wait_panel_status(struct intel_dp *intel_dp,static void wait_panel_on (struct intel_dp *intel_dp) { -DRM_DEBUG_KMS ("Wait for panel power on\n" ); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); + +drm_dbg_kms (&i915->drm,"Wait for panel power on\n" );wait_panel_status (intel_dp,IDLE_ON_MASK ,IDLE_ON_VALUE ); }static void wait_panel_off (struct intel_dp *intel_dp) { -DRM_DEBUG_KMS ("Wait for panel power off time\n" ); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); + +drm_dbg_kms (&i915->drm,"Wait for panel power off time\n" );wait_panel_status (intel_dp,IDLE_OFF_MASK ,IDLE_OFF_VALUE ); }static void wait_panel_power_cycle (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);ktime_t panel_power_on_time;s64 panel_power_off_duration; -DRM_DEBUG_KMS ("Wait for panel power cycle\n" ); +drm_dbg_kms (&i915->drm,"Wait for panel power cycle\n" );/* take the difference of currrent time and panel power off time * and then make panel wait for t11_t12 if needed. */ @@ -3149,11 +3171,12 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (conn_state->best_encoder)); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_dp_is_edp (intel_dp))return ; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );intel_panel_enable_backlight (crtc_state, conn_state);_intel_edp_backlight_on (intel_dp);@@ -3187,11 +3210,12 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp)void intel_edp_backlight_off (const struct drm_connector_state *old_conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (old_conn_state->best_encoder)); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_dp_is_edp (intel_dp))return ; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );_intel_edp_backlight_off (intel_dp);intel_panel_disable_backlight (old_conn_state);@@ -3204,6 +3228,7 @@ void intel_edp_backlight_off(const struct drm_connector_state *old_conn_state)static void intel_edp_backlight_power (struct intel_connector *connector,bool enable) { +struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_dp *intel_dp =intel_attached_dp (connector);intel_wakeref_t wakeref;bool is_enabled;@@ -3214,8 +3239,8 @@ static void intel_edp_backlight_power(struct intel_connector *connector,if (is_enabled == enable)return ; -DRM_DEBUG_KMS ("panel power control backlight %s\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"panel power control backlight %s\n" , + enable ?"enable" :"disable" );if (enable)_intel_edp_backlight_on (intel_dp);@@ -3325,6 +3350,7 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state, bool enable) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int ret;if (!crtc_state->dsc.compression_enable)@@ -3333,13 +3359,15 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, ret =drm_dp_dpcd_writeb (&intel_dp->aux,DP_DSC_ENABLE , enable ?DP_DECOMPRESSION_EN :0 );if (ret <0 ) -DRM_DEBUG_KMS ("Failed to %s sink decompression state\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm, +"Failed to %s sink decompression state\n" , + enable ?"enable" :"disable" ); }/* If the sink supports it, try to set the power state appropriately */ void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int ret, i;/* Should have a valid DPCD by this point */ @@ -3372,8 +3400,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode) }if (ret !=1 ) -DRM_DEBUG_KMS ("failed to %s sink power state\n" , - mode ==DRM_MODE_DPMS_ON ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"failed to %s sink power state\n" , + mode ==DRM_MODE_DPMS_ON ?"enable" :"disable" ); } static bool cpt_dp_port_selected(struct drm_i915_private *dev_priv,@@ -4456,6 +4484,7 @@ intel_dp_link_down(struct intel_encoder *encoder,static void
intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp){drivers/gpu/drm/i915/display/intel_dp.c +1
-0+struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 dpcd_ext[6]; /*drivers/gpu/drm/i915/display/intel_dp.c +6
-4@@ -4471,20 +4500,22 @@ intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp)if (drm_dp_dpcd_read (&intel_dp->aux,DP_DP13_DPCD_REV , &dpcd_ext,sizeof (dpcd_ext)) !=sizeof (dpcd_ext)) { -DRM_ERROR ("DPCD failed read at extended capabilities\n" ); +drm_err (&i915->drm, +"DPCD failed read at extended capabilities\n" );return ; }if (intel_dp->dpcd[DP_DPCD_REV ] > dpcd_ext[DP_DPCD_REV ]) { -DRM_DEBUG_KMS ("DPCD extended DPCD rev less than base DPCD rev\n" ); +drm_dbg_kms (&i915->drm, +"DPCD extended DPCD rev less than base DPCD rev\n" );return ; }if (!memcmp (intel_dp->dpcd, dpcd_ext,sizeof (dpcd_ext)))return ; -DRM_DEBUG_KMS ("Base DPCD: %*ph\n" , - (int )sizeof (intel_dp->dpcd), intel_dp->dpcd); +drm_dbg_kms (&i915->drm,"Base DPCD: %*ph\n" , + (int )sizeof (intel_dp->dpcd), intel_dp->dpcd);memcpy (intel_dp->dpcd, dpcd_ext,sizeof (dpcd_ext)); }@@ -4492,13 +4523,16 @@ intel_dp_extended_receiver_capabilities(struct intel_dp *intel_dp)bool
intel_dp_read_dpcd(struct intel_dp *intel_dp)
{drivers/gpu/drm/i915/display/intel_dp.c +2
-0+struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +if (drm_dp_dpcd_read(&intel_dp->aux, 0x000, intel_dp->dpcd, sizeof(intel_dp->dpcd)) < 0) return false; /* aux transfer failed */ intel_dp_extended_receiver_capabilities(intel_dp);drivers/gpu/drm/i915/display/intel_dp.c +2
-1-DRM_DEBUG_KMS ("DPCD: %*ph\n" , (int )sizeof (intel_dp->dpcd), intel_dp->dpcd); +drm_dbg_kms (&i915->drm,"DPCD: %*ph\n" , (int )sizeof (intel_dp->dpcd), + intel_dp->dpcd);return intel_dp->dpcd[DP_DPCD_REV] != 0; }drivers/gpu/drm/i915/display/intel_dp.c +12
-7@@ -4515,6 +4549,8 @@ bool intel_dp_get_colorimetry_status(struct intel_dp *intel_dp)static void intel_dp_get_dsc_sink_cap (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +/* * Clear the cached register set to avoid using stale values * for the sinks that do not support DSC. @@ -4530,20 +4566,23 @@ static void intel_dp_get_dsc_sink_cap(struct intel_dp *intel_dp)if (drm_dp_dpcd_read (&intel_dp->aux,DP_DSC_SUPPORT , intel_dp->dsc_dpcd,sizeof (intel_dp->dsc_dpcd)) <0 ) -DRM_ERROR ("Failed to read DPCD register 0x%x\n" , -DP_DSC_SUPPORT ); +drm_err (&i915->drm, +"Failed to read DPCD register 0x%x\n" , +DP_DSC_SUPPORT ); -DRM_DEBUG_KMS ("DSC DPCD: %*ph\n" , - (int )sizeof (intel_dp->dsc_dpcd), - intel_dp->dsc_dpcd); +drm_dbg_kms (&i915->drm,"DSC DPCD: %*ph\n" , + (int )sizeof (intel_dp->dsc_dpcd), + intel_dp->dsc_dpcd);/* FEC is supported only on DP 1.4 */ if (!intel_dp_is_edp (intel_dp) &&drm_dp_dpcd_readb (&intel_dp->aux,DP_FEC_CAPABILITY , &intel_dp->fec_capable) <0 ) -DRM_ERROR ("Failed to read FEC DPCD register\n" ); +drm_err (&i915->drm, +"Failed to read FEC DPCD register\n" ); -DRM_DEBUG_KMS ("FEC CAPABILITY: %x\n" , intel_dp->fec_capable); +drm_dbg_kms (&i915->drm,"FEC CAPABILITY: %x\n" , + intel_dp->fec_capable); } }@@ -4717,14 +4756,16 @@ intel_dp_can_mst(struct intel_dp *intel_dp)static void
intel_dp_configure_mst(struct intel_dp *intel_dp)
{drivers/gpu/drm/i915/display/intel_dp.c +1
-0+struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; bool sink_can_mst = intel_dp_sink_can_mst(intel_dp);drivers/gpu/drm/i915/display/intel_dp.c +5
-4-DRM_DEBUG_KMS ("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n" , - encoder->base.base.id, encoder->base.name, -yesno (intel_dp->can_mst),yesno (sink_can_mst), -yesno (i915_modparams.enable_dp_mst)); +drm_dbg_kms (&i915->drm, +"[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n" , + encoder->base.base.id, encoder->base.name, +yesno (intel_dp->can_mst),yesno (sink_can_mst), +yesno (i915_modparams.enable_dp_mst));if (!intel_dp->can_mst) return;drivers/gpu/drm/i915/display/intel_dp.c +30
-19@@ -5098,6 +5139,7 @@ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp);struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct dp_sdp infoframe_sdp = {};struct hdmi_drm_infoframe drm_infoframe = {};@@ -5108,18 +5150,20 @@ intel_dp_setup_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp, ret =drm_hdmi_infoframe_set_hdr_metadata (&drm_infoframe, conn_state);if (ret) { -DRM_DEBUG_KMS ("couldn't set HDR metadata in infoframe\n" ); +drm_dbg_kms (&i915->drm, +"couldn't set HDR metadata in infoframe\n" );return ; } len =hdmi_drm_infoframe_pack_only (&drm_infoframe, buf,sizeof (buf));if (len <0 ) { -DRM_DEBUG_KMS ("buffer size is smaller than hdr metadata infoframe\n" ); +drm_dbg_kms (&i915->drm, +"buffer size is smaller than hdr metadata infoframe\n" );return ; }if (len != infoframe_size) { -DRM_DEBUG_KMS ("wrong static hdr metadata size\n" ); +drm_dbg_kms (&i915->drm,"wrong static hdr metadata size\n" );return ; }@@ -5197,6 +5241,7 @@ void intel_dp_hdr_metadata_enable(struct intel_dp *intel_dp,static u8 intel_dp_autotest_link_training (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);int status =0 ;int test_link_rate;u8 test_lane_count, test_link_bw;@@ -5208,7 +5253,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp) &test_lane_count);if (status <=0 ) { -DRM_DEBUG_KMS ("Lane count read failed\n" ); +drm_dbg_kms (&i915->drm,"Lane count read failed\n" );return DP_TEST_NAK ; } test_lane_count &=DP_MAX_LANE_COUNT_MASK ;@@ -5216,7 +5261,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp) status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_LINK_RATE , &test_link_bw);if (status <=0 ) { -DRM_DEBUG_KMS ("Link Rate read failed\n" ); +drm_dbg_kms (&i915->drm,"Link Rate read failed\n" );return DP_TEST_NAK ; } test_link_rate =drm_dp_bw_code_to_link_rate (test_link_bw);@@ -5234,6 +5279,7 @@ static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp)static u8 intel_dp_autotest_video_pattern (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 test_pattern;u8 test_misc;__be16 h_width, v_height;@@ -5243,7 +5289,7 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_PATTERN , &test_pattern);if (status <=0 ) { -DRM_DEBUG_KMS ("Test pattern read failed\n" ); +drm_dbg_kms (&i915->drm,"Test pattern read failed\n" );return DP_TEST_NAK ; }if (test_pattern !=DP_COLOR_RAMP )@@ -5252,21 +5298,21 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_H_WIDTH_HI , &h_width,2 );if (status <=0 ) { -DRM_DEBUG_KMS ("H Width read failed\n" ); +drm_dbg_kms (&i915->drm,"H Width read failed\n" );return DP_TEST_NAK ; } status =drm_dp_dpcd_read (&intel_dp->aux,DP_TEST_V_HEIGHT_HI , &v_height,2 );if (status <=0 ) { -DRM_DEBUG_KMS ("V Height read failed\n" ); +drm_dbg_kms (&i915->drm,"V Height read failed\n" );return DP_TEST_NAK ; } status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_MISC0 , &test_misc);if (status <=0 ) { -DRM_DEBUG_KMS ("TEST MISC read failed\n" ); +drm_dbg_kms (&i915->drm,"TEST MISC read failed\n" );return DP_TEST_NAK ; }if ((test_misc &DP_TEST_COLOR_FORMAT_MASK ) !=DP_COLOR_FORMAT_RGB )@@ -5295,6 +5341,7 @@ static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp)static u8 intel_dp_autotest_edid (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 test_result =DP_TEST_ACK ;struct intel_connector *intel_connector = intel_dp->attached_connector;struct drm_connector *connector = &intel_connector->base;@@ -5311,9 +5358,10 @@ static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)*/ if (intel_dp->aux.i2c_nack_count >0 || intel_dp->aux.i2c_defer_count >0 ) -DRM_DEBUG_KMS ("EDID read had %d NACKs, %d DEFERs\n" , - intel_dp->aux.i2c_nack_count, - intel_dp->aux.i2c_defer_count); +drm_dbg_kms (&i915->drm, +"EDID read had %d NACKs, %d DEFERs\n" , + intel_dp->aux.i2c_nack_count, + intel_dp->aux.i2c_defer_count); intel_dp->compliance.test_data.edid =INTEL_DP_RESOLUTION_FAILSAFE ; }else {struct edid *block = intel_connector->detect_edid;@@ -5325,7 +5373,8 @@ static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_TEST_EDID_CHECKSUM , block->checksum) <=0 ) -DRM_DEBUG_KMS ("Failed to write EDID checksum\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write EDID checksum\n" ); test_result =DP_TEST_ACK |DP_TEST_EDID_CHECKSUM_WRITE ; intel_dp->compliance.test_data.edid =INTEL_DP_RESOLUTION_PREFERRED ;@@ -5345,35 +5394,38 @@ static u8 intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)static void intel_dp_handle_test_request (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 response =DP_TEST_NAK ;u8 request =0 ;int status; status =drm_dp_dpcd_readb (&intel_dp->aux,DP_TEST_REQUEST , &request);if (status <=0 ) { -DRM_DEBUG_KMS ("Could not read test request from sink\n" ); +drm_dbg_kms (&i915->drm, +"Could not read test request from sink\n" ); goto update_status; }switch (request) {case DP_TEST_LINK_TRAINING : -DRM_DEBUG_KMS ("LINK_TRAINING test requested\n" ); +drm_dbg_kms (&i915->drm,"LINK_TRAINING test requested\n" ); response =intel_dp_autotest_link_training (intel_dp);break ;case DP_TEST_LINK_VIDEO_PATTERN : -DRM_DEBUG_KMS ("TEST_PATTERN test requested\n" ); +drm_dbg_kms (&i915->drm,"TEST_PATTERN test requested\n" ); response =intel_dp_autotest_video_pattern (intel_dp);break ;case DP_TEST_LINK_EDID_READ : -DRM_DEBUG_KMS ("EDID test requested\n" ); +drm_dbg_kms (&i915->drm,"EDID test requested\n" ); response =intel_dp_autotest_edid (intel_dp);break ;case DP_TEST_LINK_PHY_TEST_PATTERN : -DRM_DEBUG_KMS ("PHY_PATTERN test requested\n" ); +drm_dbg_kms (&i915->drm,"PHY_PATTERN test requested\n" ); response =intel_dp_autotest_phy_pattern (intel_dp);break ;default : -DRM_DEBUG_KMS ("Invalid test request '%02x'\n" , request); +drm_dbg_kms (&i915->drm,"Invalid test request '%02x'\n" , + request);break ; }@@ -5383,12 +5435,14 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp)
update_status:status = drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_RESPONSE, response); if (status <= 0)drivers/gpu/drm/i915/display/intel_dp.c +2
-1-DRM_DEBUG_KMS ("Could not write test response to sink\n" ); +drm_dbg_kms (&i915->drm, +"Could not write test response to sink\n" );}
static int
intel_dp_check_mst_status(struct intel_dp *intel_dp){drivers/gpu/drm/i915/display/intel_dp.c +1
-0+struct drm_i915_private *i915 =dp_to_i915 (intel_dp);bool bret; if (intel_dp->is_mst) {drivers/gpu/drm/i915/display/intel_dp.c +9
-5@@ -5405,12 +5459,13 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)/* check link status - esi[10] = 0x200c */ if (intel_dp->active_mst_links >0 && !drm_dp_channel_eq_ok (&esi[10 ], intel_dp->lane_count)) { -DRM_DEBUG_KMS ("channel EQ not ok, retraining\n" ); +drm_dbg_kms (&i915->drm, +"channel EQ not ok, retraining\n" );intel_dp_start_link_train (intel_dp);intel_dp_stop_link_train (intel_dp); } -DRM_DEBUG_KMS ("got esi %3ph\n" , esi); +drm_dbg_kms (&i915->drm,"got esi %3ph\n" , esi); ret =drm_dp_mst_hpd_irq (&intel_dp->mst_mgr, esi, &handled);if (handled) {@@ -5426,7 +5481,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) bret =intel_dp_get_sink_irq_esi (intel_dp, esi);if (bret == true) { -DRM_DEBUG_KMS ("got esi2 %3ph\n" , esi); +drm_dbg_kms (&i915->drm, +"got esi2 %3ph\n" , esi); goto go_again; } }else @@ -5434,7 +5490,8 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)return ret; }else { -DRM_DEBUG_KMS ("failed to get ESI - device may have failed\n" ); +drm_dbg_kms (&i915->drm, +"failed to get ESI - device may have failed\n" ); intel_dp->is_mst = false;drm_dp_mst_topology_mgr_set_mst (&intel_dp->mst_mgr, intel_dp->is_mst);@@ -5595,6 +5652,7 @@ intel_dp_hotplug(struct intel_encoder *encoder,static void intel_dp_check_service_irq (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 val;if (intel_dp->dpcd[DP_DPCD_REV ] <0x11 )@@ -5613,7 +5671,7 @@ static void intel_dp_check_service_irq(struct intel_dp *intel_dp)intel_hdcp_handle_cp_irq (intel_dp->attached_connector);if (val &DP_SINK_SPECIFIC_IRQ ) -DRM_DEBUG_DRIVER ("Sink specific irq unhandled\n" ); +drm_dbg_kms (&i915->drm,"Sink specific irq unhandled\n" ); }/* @@ -5680,6 +5738,7 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)static enum
drm_connector_statusintel_dp_detect_dpcd(struct intel_dp *intel_dp)
{drivers/gpu/drm/i915/display/intel_dp.c +1
-0+struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); u8 *dpcd = intel_dp->dpcd; u8 type;drivers/gpu/drm/i915/display/intel_dp.c +1
-1@@ -5727,7 +5786,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) }/* Anything else is out of spec, warn and ignore */ -DRM_DEBUG_KMS ("Broken DP branch device, ignoring\n" ); +drm_dbg_kms (&i915->drm,"Broken DP branch device, ignoring\n" );return connector_status_disconnected; }@@ -6199,6 +6258,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)static int
intel_dp_connector_register(struct drm_connector *connector){drivers/gpu/drm/i915/display/intel_dp.c +1
-0+struct drm_i915_private *i915 =to_i915 (connector->dev);struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector)); int ret;drivers/gpu/drm/i915/display/intel_dp.c +38
-16@@ -6208,8 +6268,8 @@ intel_dp_connector_register(struct drm_connector *connector)intel_connector_debugfs_add (connector); -DRM_DEBUG_KMS ("registering %s bus for %s\n" , - intel_dp->aux.name, connector->kdev->kobj.name); +drm_dbg_kms (&i915->drm,"registering %s bus for %s\n" , + intel_dp->aux.name, connector->kdev->kobj.name); intel_dp->aux.dev = connector->kdev; ret =drm_dp_aux_register (&intel_dp->aux);@@ -6295,6 +6355,7 @@ staticint intel_dp_hdcp_write_an_aksv (struct intel_digital_port *intel_dig_port,u8 *an) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (to_intel_encoder (&intel_dig_port->base.base));static const struct drm_dp_aux_msg msg = { .request =DP_AUX_NATIVE_WRITE ,@@ -6309,8 +6370,9 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, dpcd_ret =drm_dp_dpcd_write (&intel_dig_port->dp.aux,DP_AUX_HDCP_AN , an,DRM_HDCP_AN_LEN );if (dpcd_ret !=DRM_HDCP_AN_LEN ) { -DRM_DEBUG_KMS ("Failed to write An over DP/AUX (%zd)\n" , - dpcd_ret); +drm_dbg_kms (&i915->drm, +"Failed to write An over DP/AUX (%zd)\n" , + dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret; }@@ -6326,17 +6388,19 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, rxbuf,sizeof (rxbuf), DP_AUX_CH_CTL_AUX_AKSV_SELECT);if (ret <0 ) { -DRM_DEBUG_KMS ("Write Aksv over DP/AUX failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm, +"Write Aksv over DP/AUX failed (%d)\n" , ret);return ret; }else if (ret ==0 ) { -DRM_DEBUG_KMS ("Aksv write over DP/AUX was empty\n" ); +drm_dbg_kms (&i915->drm,"Aksv write over DP/AUX was empty\n" );return -EIO ; } reply = (rxbuf[0 ] >>4 ) &DP_AUX_NATIVE_REPLY_MASK ;if (reply !=DP_AUX_NATIVE_REPLY_ACK ) { -DRM_DEBUG_KMS ("Aksv write: no DP_AUX_NATIVE_REPLY_ACK %x\n" , - reply); +drm_dbg_kms (&i915->drm, +"Aksv write: no DP_AUX_NATIVE_REPLY_ACK %x\n" , + reply);return -EIO ; }return 0 ;@@ -6345,11 +6409,14 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,static int intel_dp_hdcp_read_bksv (struct intel_digital_port *intel_dig_port,u8 *bksv) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret !=DRM_HDCP_KSV_LEN ) { -DRM_DEBUG_KMS ("Read Bksv from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read Bksv from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6358,7 +6425,9 @@ static int intel_dp_hdcp_read_bksv(struct intel_digital_port *intel_dig_port,static int intel_dp_hdcp_read_bstatus (struct intel_digital_port *intel_dig_port,u8 *bstatus) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; +/* * For some reason the HDMI and DP HDCP specs call this register * definition by different names. In the HDMI spec, it's called BSTATUS, @@ -6367,7 +6436,8 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *intel_dig_port, ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BINFO , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret !=DRM_HDCP_BSTATUS_LEN ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6377,12 +6447,14 @@ staticint intel_dp_hdcp_read_bcaps (struct intel_digital_port *intel_dig_port,u8 *bcaps) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BCAPS , bcaps,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bcaps from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bcaps from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -6408,11 +6480,14 @@ staticint intel_dp_hdcp_read_ri_prime (struct intel_digital_port *intel_dig_port,u8 *ri_prime) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret !=DRM_HDCP_RI_LEN ) { -DRM_DEBUG_KMS ("Read Ri' from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm,"Read Ri' from DP/AUX failed (%zd)\n" , + ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6422,12 +6497,15 @@ staticint intel_dp_hdcp_read_ksv_ready (struct intel_digital_port *intel_dig_port,bool *ksv_ready) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;u8 bstatus; + ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; } *ksv_ready = bstatus &DP_BSTATUS_READY ;@@ -6438,6 +6516,7 @@ staticint intel_dp_hdcp_read_ksv_fifo (struct intel_digital_port *intel_dig_port,int num_downstream,u8 *ksv_fifo) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;int i;@@ -6449,8 +6528,9 @@ int intel_dp_hdcp_read_ksv_fifo(struct intel_digital_port *intel_dig_port, ksv_fifo + i *DRM_HDCP_KSV_LEN , len);if (ret != len) { -DRM_DEBUG_KMS ("Read ksv[%d] from DP/AUX failed (%zd)\n" , - i, ret); +drm_dbg_kms (&i915->drm, +"Read ksv[%d] from DP/AUX failed (%zd)\n" , + i, ret);return ret >=0 ? -EIO : ret; } }@@ -6461,6 +6541,7 @@ staticint intel_dp_hdcp_read_v_prime_part (struct intel_digital_port *intel_dig_port,int i,u32 *part) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )@@ -6470,7 +6551,8 @@ int intel_dp_hdcp_read_v_prime_part(struct intel_digital_port *intel_dig_port,DP_AUX_HDCP_V_PRIME (i), part, DRM_HDCP_V_PRIME_PART_LEN);if (ret !=DRM_HDCP_V_PRIME_PART_LEN ) { -DRM_DEBUG_KMS ("Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret); +drm_dbg_kms (&i915->drm, +"Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret; }return 0 ;@@ -6487,13 +6569,15 @@ int intel_dp_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port,static
boolintel_dp_hdcp_check_link(struct intel_digital_port *intel_dig_port){drivers/gpu/drm/i915/display/intel_dp.c +1
-0+struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; u8 bstatus; ret = drm_dp_dpcd_read(&intel_dig_port->dp.aux, DP_AUX_HDCP_BSTATUS, &bstatus, 1); if (ret != 1) {drivers/gpu/drm/i915/display/intel_dp.c +2
-1-DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return false; }drivers/gpu/drm/i915/display/intel_dp.c +10
-4@@ -6568,13 +6652,15 @@ static inlineint intel_dp_hdcp2_read_rx_status (struct intel_digital_port *intel_dig_port,u8 *rx_status) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);ssize_t ret; ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux,DP_HDCP_2_2_REG_RXSTATUS_OFFSET , rx_status,HDCP_2_2_DP_RXSTATUS_LEN );if (ret !=HDCP_2_2_DP_RXSTATUS_LEN ) { -DRM_DEBUG_KMS ("Read bstatus from DP/AUX failed (%zd)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -6618,6 +6704,7 @@ static ssize_t intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, const struct hdcp2_dp_msg_data *hdcp2_msg_data) { + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);struct intel_dp *dp = &intel_dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;u8 msg_id = hdcp2_msg_data->msg_id;@@ -6649,8 +6736,9 @@ intel_dp_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, }if (ret) -DRM_DEBUG_KMS ("msg_id %d, ret %d, timeout(mSec): %d\n" , - hdcp2_msg_data->msg_id, ret, timeout); +drm_dbg_kms (&i915->drm, +"msg_id %d, ret %d, timeout(mSec): %d\n" , + hdcp2_msg_data->msg_id, ret, timeout);return ret; }@@ -6736,6 +6824,7 @@ staticint intel_dp_hdcp2_read_msg (struct intel_digital_port *intel_dig_port,u8 msg_id,void *buf,size_t size) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);unsigned int offset;u8 *byte = buf;ssize_t ret, bytes_to_recv, len;@@ -6769,7 +6858,8 @@ int intel_dp_hdcp2_read_msg(struct intel_digital_port *intel_dig_port, ret =drm_dp_dpcd_read (&intel_dig_port->dp.aux, offset, (void *)byte, len);if (ret <0 ) { -DRM_DEBUG_KMS ("msg_id %d, ret %zd\n" , msg_id, ret); +drm_dbg_kms (&i915->drm,"msg_id %d, ret %zd\n" , + msg_id, ret);return ret; }@@ -7115,6 +7205,7 @@ static bool intel_edp_have_power(struct intel_dp *intel_dp)enum irqreturn
intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd){drivers/gpu/drm/i915/display/intel_dp.c +1
-0+struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_dp *intel_dp = &intel_dig_port->dp; if (intel_dig_port->base.type == INTEL_OUTPUT_EDP &&drivers/gpu/drm/i915/display/intel_dp.c +9
-8@@ -7125,17 +7216,18 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* would end up in an endless cycle of * "vdd off -> long/short hpd -> vdd on -> detect -> vdd off -> ..." */ -DRM_DEBUG_KMS ("ignoring %s hpd on eDP [ENCODER:%d:%s]\n" , - long_hpd ?"long" :"short" , - intel_dig_port->base.base.base.id, - intel_dig_port->base.base.name); +drm_dbg_kms (&i915->drm, +"ignoring %s hpd on eDP [ENCODER:%d:%s]\n" , + long_hpd ?"long" :"short" , + intel_dig_port->base.base.base.id, + intel_dig_port->base.base.name);return IRQ_HANDLED ; } -DRM_DEBUG_KMS ("got hpd irq on [ENCODER:%d:%s] - %s\n" , - intel_dig_port->base.base.base.id, - intel_dig_port->base.base.name, - long_hpd ?"long" :"short" ); +drm_dbg_kms (&i915->drm,"got hpd irq on [ENCODER:%d:%s] - %s\n" , + intel_dig_port->base.base.base.id, + intel_dig_port->base.base.name, + long_hpd ?"long" :"short" );if (long_hpd) { intel_dp->reset_link_params = true;
drivers/gpu/drm/i915/display/intel_dp.c intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) · line 7245
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp.c +3
-2@@ -7148,8 +7240,9 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* If we were in MST mode, and device is not * there, get out of MST mode */ -DRM_DEBUG_KMS ("MST device may have disappeared %d vs %d\n" , - intel_dp->is_mst, intel_dp->mst_mgr.mst_state); +drm_dbg_kms (&i915->drm, +"MST device may have disappeared %d vs %d\n" , + intel_dp->is_mst, intel_dp->mst_mgr.mst_state);
I think intel_dp->mst_mgr.mst_state can go on the next line to fix the checkpatch warning on this line.
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp.c +0
-0intel_dp->is_mst = false;drm_dp_mst_topology_mgr_set_mst (&intel_dp->mst_mgr, intel_dp->is_mst);Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/17 drm/i915/crt: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
--- drivers/gpu/drm/i915/display/intel_crt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_crt.c +2 -1
@@ -594,7 +594,8 @@ static struct edid *intel_crt_get_edid(struct drm_connector *connector, edid =drm_get_edid (connector, i2c);if (!edid && !intel_gmbus_is_forced_bit (i2c)) { -DRM_DEBUG_KMS ("CRT GMBUS EDID read failed, retry using GPIO bit-banging\n" ); +drm_dbg_kms (connector->dev, +"CRT GMBUS EDID read failed, retry using GPIO bit-banging\n" );intel_gmbus_force_bit (i2c, true); edid =drm_get_edid (connector, i2c);intel_gmbus_force_bit (i2c, false);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 05/17] drm/i915/crt: use struct drm_device based logging
Quoted 7 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 22 lines
---
drivers/gpu/drm/i915/display/intel_crt.c| 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_crt.c +2
-1@@ -594,7 +594,8 @@ static struct edid *intel_crt_get_edid(struct drm_connector *connector, edid =drm_get_edid (connector, i2c);if (!edid && !intel_gmbus_is_forced_bit (i2c)) { -DRM_DEBUG_KMS ("CRT GMBUS EDID read failed, retry using GPIO bit-banging\n" ); +drm_dbg_kms (connector->dev, +"CRT GMBUS EDID read failed, retry using GPIO bit-banging\n" );intel_gmbus_force_bit (i2c, true); edid =drm_get_edid (connector, i2c);intel_gmbus_force_bit (i2c, false);Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/17 drm/i915/debugfs: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -741,7 +741,7 @@ i915_error_state_write(struct file *filp,if (!error)return 0 ; -DRM_DEBUG_DRIVER ("Resetting error state\n" ); +drm_dbg (&error->i915->drm,"Resetting error state\n" );i915_reset_error_state (error->i915);return cnt;
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/17] drm/i915/debugfs: use struct drm_device based logging
Quoted 7 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 21 lines
---
drivers/gpu/drm/i915/i915_debugfs.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -741,7 +741,7 @@ i915_error_state_write(struct file *filp,if (!error)return 0 ; -DRM_DEBUG_DRIVER ("Resetting error state\n" ); +drm_dbg (&error->i915->drm,"Resetting error state\n" );i915_reset_error_state (error->i915);return cnt;Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/17 drm/i915/bw: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
--- drivers/gpu/drm/i915/display/intel_bw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +5 -4
@@ -338,16 +338,17 @@ void intel_bw_crtc_update(struct intel_bw_state *bw_state, const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +struct drm_i915_private *i915 =to_i915 (crtc->base.dev); bw_state->data_rate[crtc->pipe] =intel_bw_crtc_data_rate (crtc_state); bw_state->num_active_planes[crtc->pipe] =intel_bw_crtc_num_active_planes (crtc_state); -DRM_DEBUG_KMS ("pipe %c data rate %u num active planes %u\n" , -pipe_name (crtc->pipe), - bw_state->data_rate[crtc->pipe], - bw_state->num_active_planes[crtc->pipe]); +drm_dbg_kms (&i915->drm,"pipe %c data rate %u num active planes %u\n" , +pipe_name (crtc->pipe), + bw_state->data_rate[crtc->pipe], + bw_state->num_active_planes[crtc->pipe]); } static unsigned int intel_bw_num_active_planes(struct drm_i915_private *dev_priv,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 07/17] drm/i915/bw: use struct drm_device based logging
Quoted 7 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 34 lines
---
drivers/gpu/drm/i915/display/intel_bw.c| 9 +++++----1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_bw.c +5
-4@@ -338,16 +338,17 @@ void intel_bw_crtc_update(struct intel_bw_state *bw_state, const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +struct drm_i915_private *i915 =to_i915 (crtc->base.dev); bw_state->data_rate[crtc->pipe] =intel_bw_crtc_data_rate (crtc_state); bw_state->num_active_planes[crtc->pipe] =intel_bw_crtc_num_active_planes (crtc_state); -DRM_DEBUG_KMS ("pipe %c data rate %u num active planes %u\n" , -pipe_name (crtc->pipe), - bw_state->data_rate[crtc->pipe], - bw_state->num_active_planes[crtc->pipe]); +drm_dbg_kms (&i915->drm,"pipe %c data rate %u num active planes %u\n" , +pipe_name (crtc->pipe), + bw_state->data_rate[crtc->pipe], + bw_state->num_active_planes[crtc->pipe]); } static unsigned int intel_bw_num_active_planes(struct drm_i915_private *dev_priv,Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/17 drm/i915/state: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
--- drivers/gpu/drm/i915/display/intel_global_state.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_global_state.c +3 -2
@@ -71,6 +71,7 @@ struct intel_global_state * intel_atomic_get_global_obj_state(struct intel_atomic_state *state, struct intel_global_obj *obj) { + struct drm_i915_private *i915 = to_i915(state->base.dev);int index, num_objs, i;size_t size;struct __intel_global_objs_state *arr;
@@ -106,8 +107,8 @@ intel_atomic_get_global_obj_state(struct intel_atomic_state *state, state->num_global_objs = num_objs; -DRM_DEBUG_ATOMIC ("Added new global object %p state %p to %p\n" , - obj, obj_state, state); +drm_dbg_atomic (&i915->drm,"Added new global object %p state %p to %p\n" , + obj, obj_state, state);return obj_state; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 08/17] drm/i915/state: use struct drm_device based logging
Quoted 24 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>---
drivers/gpu/drm/i915/display/intel_global_state.c| 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_global_state.c +1
-0@@ -71,6 +71,7 @@ struct intel_global_state * intel_atomic_get_global_obj_state(struct intel_atomic_state *state, struct intel_global_obj *obj) { + struct drm_i915_private *i915 = to_i915(state->base.dev);int index, num_objs, i;size_t size;struct __intel_global_objs_state *arr;
drivers/gpu/drm/i915/display/intel_global_state.c intel_atomic_get_global_obj_state(struct intel_atomic_state *state, · line 110
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_global_state.c +1
-2@@ -106,8 +107,8 @@ intel_atomic_get_global_obj_state(struct intel_atomic_state *state, state->num_global_objs = num_objs; -DRM_DEBUG_ATOMIC ("Added new global object %p state %p to %p\n" , - obj, obj_state, state); + drm_dbg_atomic(&i915->drm, "Added new global object %p state %p to %p\n",
I think this line can be split to fix the checkpatch warning as it's over 80 characters.
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_global_state.c +1
-0+ obj, obj_state, state);return obj_state; }Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/17 drm/i915/switcheroo: use struct drm_device based logging
In reply to Jani NikulaConvert all the pr_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
--- drivers/gpu/drm/i915/i915_switcheroo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_switcheroo.c +2 -2
@@ -20,14 +20,14 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, }if (state ==VGA_SWITCHEROO_ON ) { -pr_info ("switched on\n" ); +drm_info (&i915->drm,"switched on\n" ); i915->drm.switch_power_state =DRM_SWITCH_POWER_CHANGING ;/* i915 resume handler doesn't set to D0 */ pci_set_power_state (pdev,PCI_D0 );i915_resume_switcheroo (i915); i915->drm.switch_power_state =DRM_SWITCH_POWER_ON ; }else { -pr_info ("switched off\n" ); +drm_info (&i915->drm,"switched off\n" ); i915->drm.switch_power_state =DRM_SWITCH_POWER_CHANGING ;i915_suspend_switcheroo (i915, pmm); i915->drm.switch_power_state =DRM_SWITCH_POWER_OFF ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 09/17] drm/i915/switcheroo: use struct drm_device based logging
Quoted 7 lines · Jani Nikula
Convert all the pr_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 29 lines
---
drivers/gpu/drm/i915/i915_switcheroo.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_switcheroo.c +2
-2@@ -20,14 +20,14 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, }if (state ==VGA_SWITCHEROO_ON ) { -pr_info ("switched on\n" ); +drm_info (&i915->drm,"switched on\n" ); i915->drm.switch_power_state =DRM_SWITCH_POWER_CHANGING ;/* i915 resume handler doesn't set to D0 */ pci_set_power_state (pdev,PCI_D0 );i915_resume_switcheroo (i915); i915->drm.switch_power_state =DRM_SWITCH_POWER_ON ; }else { -pr_info ("switched off\n" ); +drm_info (&i915->drm,"switched off\n" ); i915->drm.switch_power_state =DRM_SWITCH_POWER_CHANGING ;i915_suspend_switcheroo (i915, pmm); i915->drm.switch_power_state =DRM_SWITCH_POWER_OFF ;Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/17 drm/i915/uc: prefer struct drm_device based logging
In reply to Jani NikulaPrefer struct drm_device based logging over struct device based logging.
No functional changes.
--- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 12 ++++++------ drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_uc.c +6 -6
@@ -45,12 +45,12 @@ static void __confirm_options(struct intel_uc *uc) {struct drm_i915_private *i915 =uc_to_gt (uc)->i915; -DRM_DEV_DEBUG_DRIVER (i915->drm.dev, -"enable_guc=%d (guc:%s submission:%s huc:%s)\n" , - i915_modparams.enable_guc, -yesno (intel_uc_wants_guc (uc)), -yesno (intel_uc_wants_guc_submission (uc)), -yesno (intel_uc_wants_huc (uc))); +drm_dbg (&i915->drm, +"enable_guc=%d (guc:%s submission:%s huc:%s)\n" , + i915_modparams.enable_guc, +yesno (intel_uc_wants_guc (uc)), +yesno (intel_uc_wants_guc_submission (uc)), +yesno (intel_uc_wants_huc (uc)));if (i915_modparams.enable_guc ==-1 )return ;
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +5 -5
@@ -32,11 +32,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, enum intel_uc_fw_status status) { uc_fw->__status = status; -DRM_DEV_DEBUG_DRIVER (__uc_fw_to_gt (uc_fw)->i915->drm.dev, -"%s firmware -> %s\n" , -intel_uc_fw_type_repr (uc_fw->type), - status ==INTEL_UC_FIRMWARE_SELECTED ? - uc_fw->path :intel_uc_fw_status_repr (status)); +drm_dbg (&__uc_fw_to_gt (uc_fw)->i915->drm, +"%s firmware -> %s\n" , +intel_uc_fw_type_repr (uc_fw->type), + status ==INTEL_UC_FIRMWARE_SELECTED ? + uc_fw->path :intel_uc_fw_status_repr (status)); }#endif
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 10/17] drm/i915/uc: prefer struct drm_device based logging
Quoted 6 lines · Jani Nikula
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 53 lines
---
drivers/gpu/drm/i915/gt/uc/intel_uc.c| 12 ++++++------drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c| 10 +++++-----2 files changed, 11 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_uc.c +6
-6@@ -45,12 +45,12 @@ static void __confirm_options(struct intel_uc *uc) {struct drm_i915_private *i915 =uc_to_gt (uc)->i915; -DRM_DEV_DEBUG_DRIVER (i915->drm.dev, -"enable_guc=%d (guc:%s submission:%s huc:%s)\n" , - i915_modparams.enable_guc, -yesno (intel_uc_wants_guc (uc)), -yesno (intel_uc_wants_guc_submission (uc)), -yesno (intel_uc_wants_huc (uc))); +drm_dbg (&i915->drm, +"enable_guc=%d (guc:%s submission:%s huc:%s)\n" , + i915_modparams.enable_guc, +yesno (intel_uc_wants_guc (uc)), +yesno (intel_uc_wants_guc_submission (uc)), +yesno (intel_uc_wants_huc (uc)));if (i915_modparams.enable_guc ==-1 )return ;drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +5
-5@@ -32,11 +32,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, enum intel_uc_fw_status status) { uc_fw->__status = status; -DRM_DEV_DEBUG_DRIVER (__uc_fw_to_gt (uc_fw)->i915->drm.dev, -"%s firmware -> %s\n" , -intel_uc_fw_type_repr (uc_fw->type), - status ==INTEL_UC_FIRMWARE_SELECTED ? - uc_fw->path :intel_uc_fw_status_repr (status)); +drm_dbg (&__uc_fw_to_gt (uc_fw)->i915->drm, +"%s firmware -> %s\n" , +intel_uc_fw_type_repr (uc_fw->type), + status ==INTEL_UC_FIRMWARE_SELECTED ? + uc_fw->path :intel_uc_fw_status_repr (status)); }#endif Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/17 drm/i915/error: prefer struct drm_device based logging
In reply to Jani NikulaPrefer struct drm_device based logging over struct device based logging.
No functional changes.
--- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gpu_error.c +1 -1
@@ -1858,7 +1858,7 @@ void i915_error_state_store(struct i915_gpu_coredump *error)return ; i915 = error->i915; -dev_info (i915->drm.dev,"%s\n" ,error_msg (error)); +drm_info (&i915->drm,"%s\n" ,error_msg (error));if (error->simulated ||cmpxchg (&i915->gpu_error.first_error,NULL , error))
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 11/17] drm/i915/error: prefer struct drm_device based logging
Quoted 6 lines · Jani Nikula
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 21 lines
---
drivers/gpu/drm/i915/i915_gpu_error.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_gpu_error.c +1
-1@@ -1858,7 +1858,7 @@ void i915_error_state_store(struct i915_gpu_coredump *error)return ; i915 = error->i915; -dev_info (i915->drm.dev,"%s\n" ,error_msg (error)); +drm_info (&i915->drm,"%s\n" ,error_msg (error));if (error->simulated ||cmpxchg (&i915->gpu_error.first_error,NULL , error))Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/17 drm/i915/pmu: prefer struct drm_device based logging
In reply to Jani NikulaPrefer struct drm_device based logging over struct device based logging.
No functional changes.
--- drivers/gpu/drm/i915/i915_pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_pmu.c +2 -2
@@ -1115,7 +1115,7 @@ void i915_pmu_register(struct drm_i915_private *i915)int ret = -ENOMEM ;if (INTEL_GEN (i915) <=2 ) { -dev_info (i915->drm.dev,"PMU not supported for this GPU." ); +drm_info (&i915->drm,"PMU not supported for this GPU." );return ; }
@@ -1178,7 +1178,7 @@ void i915_pmu_register(struct drm_i915_private *i915)if (!is_igp (i915))kfree (pmu->name); err: -dev_notice (i915->drm.dev,"Failed to register PMU!\n" ); +drm_notice (&i915->drm,"Failed to register PMU!\n" ); }void i915_pmu_unregister (struct drm_i915_private *i915)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 12/17] drm/i915/pmu: prefer struct drm_device based logging
Quoted 6 lines · Jani Nikula
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 25 lines
---
drivers/gpu/drm/i915/i915_pmu.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_pmu.c +1
-1@@ -1115,7 +1115,7 @@ void i915_pmu_register(struct drm_i915_private *i915)int ret = -ENOMEM ;if (INTEL_GEN (i915) <=2 ) { -dev_info (i915->drm.dev,"PMU not supported for this GPU." ); +drm_info (&i915->drm,"PMU not supported for this GPU." );return ; }@@ -1178,7 +1178,7 @@ void i915_pmu_register(struct drm_i915_private *i915)if (!is_igp (i915))kfree (pmu->name);err:
drivers/gpu/drm/i915/i915_pmu.c +1
-1-dev_notice (i915->drm.dev,"Failed to register PMU!\n" ); +drm_notice (&i915->drm,"Failed to register PMU!\n" );}
Quoted 5 lines
void
i915_pmu_unregister(struct drm_i915_private *i915)Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/17 drm/i915/dram: prefer struct drm_device based logging
In reply to Jani NikulaPrefer struct drm_device based logging over struct device based logging.
No functional changes.
--- drivers/gpu/drm/i915/intel_dram.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dram.c +1 -2
@@ -495,6 +495,5 @@ void intel_dram_edram_detect(struct drm_i915_private *i915)else i915->edram_size_mb =gen9_edram_size_mb (i915, edram_cap); -dev_info (i915->drm.dev, -"Found %uMB of eDRAM\n" , i915->edram_size_mb); +drm_info (&i915->drm,"Found %uMB of eDRAM\n" , i915->edram_size_mb); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 13/17] drm/i915/dram: prefer struct drm_device based logging
Quoted 6 lines · Jani Nikula
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 20 lines
---
drivers/gpu/drm/i915/intel_dram.c| 3 +--1 file changed, 1 insertion(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dram.c +1
-2@@ -495,6 +495,5 @@ void intel_dram_edram_detect(struct drm_i915_private *i915)else i915->edram_size_mb =gen9_edram_size_mb (i915, edram_cap); -dev_info (i915->drm.dev, -"Found %uMB of eDRAM\n" , i915->edram_size_mb); +drm_info (&i915->drm,"Found %uMB of eDRAM\n" , i915->edram_size_mb); }Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/17 drm/i915/uncore: prefer struct drm_device based logging
In reply to Jani NikulaPrefer struct drm_device based logging over struct device based logging.
No functional changes.
--- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_uncore.c +1 -1
@@ -665,7 +665,7 @@ void intel_uncore_forcewake_user_put(struct intel_uncore *uncore)mmio_debug_resume (uncore->debug);if (check_for_unclaimed_mmio (uncore)) -dev_info (uncore->i915->drm.dev, +drm_info (&uncore->i915->drm,"Invalid mmio detected during user access\n" );spin_unlock (&uncore->debug->lock);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 14/17] drm/i915/uncore: prefer struct drm_device based logging
Quoted 6 lines · Jani Nikula
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 21 lines
---
drivers/gpu/drm/i915/intel_uncore.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_uncore.c +1
-1@@ -665,7 +665,7 @@ void intel_uncore_forcewake_user_put(struct intel_uncore *uncore)mmio_debug_resume (uncore->debug);if (check_for_unclaimed_mmio (uncore)) -dev_info (uncore->i915->drm.dev, +drm_info (&uncore->i915->drm,"Invalid mmio detected during user access\n" );spin_unlock (&uncore->debug->lock);Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 15/17 drm/i915/stolen: prefer struct drm_device based logging
In reply to Jani NikulaPrefer struct drm_device based logging over struct device based logging.
No functional changes.
--- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +2 -2
@@ -381,14 +381,14 @@ static int i915_gem_init_stolen(struct drm_i915_private *i915)mutex_init (&i915->mm.stolen_lock);if (intel_vgpu_active (i915)) { -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"%s, disabling use of stolen memory\n" ,"iGVT-g active" );return 0 ; }if (intel_vtd_active () &&INTEL_GEN (i915) <8 ) { -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"%s, disabling use of stolen memory\n" ,"DMAR active" );return 0 ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 15/17] drm/i915/stolen: prefer struct drm_device based logging
Quoted 6 lines · Jani Nikula
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 29 lines
---
drivers/gpu/drm/i915/gem/i915_gem_stolen.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_stolen.c +2
-2@@ -381,14 +381,14 @@ static int i915_gem_init_stolen(struct drm_i915_private *i915)mutex_init (&i915->mm.stolen_lock);if (intel_vgpu_active (i915)) { -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"%s, disabling use of stolen memory\n" ,"iGVT-g active" );return 0 ; }if (intel_vtd_active () &&INTEL_GEN (i915) <8 ) { -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"%s, disabling use of stolen memory\n" ,"DMAR active" );return 0 ;Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 16/17 drm/i915/gt: prefer struct drm_device based logging
In reply to Jani NikulaPrefer struct drm_device based logging over struct device based logging.
No functional changes.
--- drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_lrc.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_rc6.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_reset.c | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/gt/intel_ggtt.c +2 -2
@@ -1080,7 +1080,7 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) ggtt->vm.vma_ops.clear_pages = clear_pages;if (unlikely (ggtt->do_idle_maps)) -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"Applying Ironlake quirks for intel_iommu\n" );return 0 ;
@@ -1145,7 +1145,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)return ret;if (intel_vtd_active ()) -dev_info (i915->drm.dev,"VT-d active for gfx access\n" ); +drm_info (&i915->drm,"VT-d active for gfx access\n" );return 0 ; }
drivers/gpu/drm/i915/gt/intel_gt_pm.c +2 -2
@@ -204,7 +204,7 @@ int intel_gt_resume(struct intel_gt *gt)/* Only when the HW is re-initialised, can we replay the requests */ err =intel_gt_init_hw (gt);if (err) { -dev_err (gt->i915->drm.dev, +drm_err (>->i915->drm,"Failed to initialize GPU, declaring it wedged!\n" ); goto err_wedged; }
@@ -220,7 +220,7 @@ int intel_gt_resume(struct intel_gt *gt)intel_engine_pm_put (engine);if (err) { -dev_err (gt->i915->drm.dev, +drm_err (>->i915->drm,"Failed to restart %s (%d)\n" , engine->name, err); goto err_wedged;
drivers/gpu/drm/i915/gt/intel_lrc.c +2 -2
@@ -3062,7 +3062,7 @@ check_redzone(const void *vaddr, const struct intel_engine_cs *engine) vaddr += engine->context_size;if (memchr_inv (vaddr,CONTEXT_REDZONE ,I915_GTT_PAGE_SIZE )) -dev_err_once (engine->i915->drm.dev, +drm_err_once (&engine->i915->drm,"%s context redzone overwritten!\n" , engine->name); }
@@ -3558,7 +3558,7 @@ static void enable_error_interrupt(struct intel_engine_cs *engine) status =ENGINE_READ (engine,RING_ESR );if (unlikely (status)) { -dev_err (engine->i915->drm.dev, +drm_err (&engine->i915->drm,"engine '%s' resumed still in error: %08x\n" , engine->name, status);__intel_gt_reset (engine->gt, engine->mask);
drivers/gpu/drm/i915/gt/intel_rc6.c +2 -2
@@ -468,7 +468,7 @@ static bool rc6_supported(struct intel_rc6 *rc6)return false;if (IS_GEN9_LP (i915) && !bxt_check_bios_rc6_setup (rc6)) { -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"RC6 and powersaving disabled by BIOS\n" );return false; }
@@ -500,7 +500,7 @@ static bool pctx_corrupted(struct intel_rc6 *rc6)if (intel_uncore_read (rc6_to_uncore (rc6),GEN8_RC6_CTX_INFO ))return false; -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"RC6 context corruption, disabling runtime power management\n" );return true; }
drivers/gpu/drm/i915/gt/intel_reset.c +7 -7
@@ -109,7 +109,7 @@ static bool mark_guilty(struct i915_request *rq) goto out; } -dev_notice (ctx->i915->drm.dev, +drm_notice (&ctx->i915->drm,"%s context reset due to GPU hang\n" , ctx->name);
@@ -1031,7 +1031,7 @@ void intel_gt_reset(struct intel_gt *gt, goto unlock;if (reason) -dev_notice (gt->i915->drm.dev, +drm_notice (>->i915->drm,"Resetting chip for %s\n" , reason);atomic_inc (>->i915->gpu_error.reset_count);
@@ -1039,7 +1039,7 @@ void intel_gt_reset(struct intel_gt *gt,if (!intel_has_gpu_reset (gt)) {if (i915_modparams.reset) -dev_err (gt->i915->drm.dev,"GPU reset not supported\n" ); +drm_err (>->i915->drm,"GPU reset not supported\n" );else drm_dbg (>->i915->drm,"GPU reset disabled\n" ); goto error;
@@ -1049,7 +1049,7 @@ void intel_gt_reset(struct intel_gt *gt,intel_runtime_pm_disable_interrupts (gt->i915);if (do_reset (gt, stalled_mask)) { -dev_err (gt->i915->drm.dev,"Failed to reset chip\n" ); +drm_err (>->i915->drm,"Failed to reset chip\n" ); goto taint; }
@@ -1111,7 +1111,7 @@ static inline int intel_gt_reset_engine(struct intel_engine_cs *engine)/** * intel_engine_reset - reset GPU engine to recover from a hang * @engine: engine to reset -* @msg: reason for GPU reset; or NULL for no dev_notice() +* @msg: reason for GPU reset; or NULL for no drm_notice() * * Reset a specific GPU engine. Useful if a hang is detected. * Returns zero on successful reset or otherwise an error code.
@@ -1136,7 +1136,7 @@ int intel_engine_reset(struct intel_engine_cs *engine, const char *msg)reset_prepare_engine (engine);if (msg) -dev_notice (engine->i915->drm.dev, +drm_notice (&engine->i915->drm,"Resetting %s for %s\n" , engine->name, msg);atomic_inc (&engine->i915->gpu_error.reset_engine_count[engine->uabi_class]);
@@ -1381,7 +1381,7 @@ static void intel_wedge_me(struct work_struct *work) {struct intel_wedge_me *w =container_of (work,typeof (*w), work.work); -dev_err (w->gt->i915->drm.dev, +drm_err (&w->gt->i915->drm,"%s timed out, cancelling all in-flight rendering.\n" , w->name);intel_gt_set_wedged (w->gt);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 16/17] drm/i915/gt: prefer struct drm_device based logging
Quoted 6 lines · Jani Nikula
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 167 lines
---
drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_lrc.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_rc6.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_reset.c | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/gt/intel_ggtt.c +2
-2@@ -1080,7 +1080,7 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) ggtt->vm.vma_ops.clear_pages = clear_pages;if (unlikely (ggtt->do_idle_maps)) -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"Applying Ironlake quirks for intel_iommu\n" );return 0 ;@@ -1145,7 +1145,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915)return ret;if (intel_vtd_active ()) -dev_info (i915->drm.dev,"VT-d active for gfx access\n" ); +drm_info (&i915->drm,"VT-d active for gfx access\n" );return 0 ; }drivers/gpu/drm/i915/gt/intel_gt_pm.c +2
-2@@ -204,7 +204,7 @@ int intel_gt_resume(struct intel_gt *gt)/* Only when the HW is re-initialised, can we replay the requests */ err =intel_gt_init_hw (gt);if (err) { -dev_err (gt->i915->drm.dev, +drm_err (>->i915->drm,"Failed to initialize GPU, declaring it wedged!\n" ); goto err_wedged; }@@ -220,7 +220,7 @@ int intel_gt_resume(struct intel_gt *gt)intel_engine_pm_put (engine);if (err) { -dev_err (gt->i915->drm.dev, +drm_err (>->i915->drm,"Failed to restart %s (%d)\n" , engine->name, err); goto err_wedged;drivers/gpu/drm/i915/gt/intel_lrc.c +2
-2@@ -3062,7 +3062,7 @@ check_redzone(const void *vaddr, const struct intel_engine_cs *engine) vaddr += engine->context_size;if (memchr_inv (vaddr,CONTEXT_REDZONE ,I915_GTT_PAGE_SIZE )) -dev_err_once (engine->i915->drm.dev, +drm_err_once (&engine->i915->drm,"%s context redzone overwritten!\n" , engine->name); }@@ -3558,7 +3558,7 @@ static void enable_error_interrupt(struct intel_engine_cs *engine) status =ENGINE_READ (engine,RING_ESR );if (unlikely (status)) { -dev_err (engine->i915->drm.dev, +drm_err (&engine->i915->drm,"engine '%s' resumed still in error: %08x\n" , engine->name, status);__intel_gt_reset (engine->gt, engine->mask);drivers/gpu/drm/i915/gt/intel_rc6.c +2
-2@@ -468,7 +468,7 @@ static bool rc6_supported(struct intel_rc6 *rc6)return false;if (IS_GEN9_LP (i915) && !bxt_check_bios_rc6_setup (rc6)) { -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"RC6 and powersaving disabled by BIOS\n" );return false; }@@ -500,7 +500,7 @@ static bool pctx_corrupted(struct intel_rc6 *rc6)if (intel_uncore_read (rc6_to_uncore (rc6),GEN8_RC6_CTX_INFO ))return false; -dev_notice (i915->drm.dev, +drm_notice (&i915->drm,"RC6 context corruption, disabling runtime power management\n" );return true; }drivers/gpu/drm/i915/gt/intel_reset.c +7
-7@@ -109,7 +109,7 @@ static bool mark_guilty(struct i915_request *rq) goto out; } -dev_notice (ctx->i915->drm.dev, +drm_notice (&ctx->i915->drm,"%s context reset due to GPU hang\n" , ctx->name);@@ -1031,7 +1031,7 @@ void intel_gt_reset(struct intel_gt *gt, goto unlock;if (reason) -dev_notice (gt->i915->drm.dev, +drm_notice (>->i915->drm,"Resetting chip for %s\n" , reason);atomic_inc (>->i915->gpu_error.reset_count);@@ -1039,7 +1039,7 @@ void intel_gt_reset(struct intel_gt *gt,if (!intel_has_gpu_reset (gt)) {if (i915_modparams.reset) -dev_err (gt->i915->drm.dev,"GPU reset not supported\n" ); +drm_err (>->i915->drm,"GPU reset not supported\n" );else drm_dbg (>->i915->drm,"GPU reset disabled\n" ); goto error;@@ -1049,7 +1049,7 @@ void intel_gt_reset(struct intel_gt *gt,intel_runtime_pm_disable_interrupts (gt->i915);if (do_reset (gt, stalled_mask)) { -dev_err (gt->i915->drm.dev,"Failed to reset chip\n" ); +drm_err (>->i915->drm,"Failed to reset chip\n" ); goto taint; }@@ -1111,7 +1111,7 @@ static inline int intel_gt_reset_engine(struct intel_engine_cs *engine)/** * intel_engine_reset - reset GPU engine to recover from a hang * @engine: engine to reset -* @msg: reason for GPU reset; or NULL for no dev_notice() +* @msg: reason for GPU reset; or NULL for no drm_notice() * * Reset a specific GPU engine. Useful if a hang is detected. * Returns zero on successful reset or otherwise an error code. @@ -1136,7 +1136,7 @@ int intel_engine_reset(struct intel_engine_cs *engine, const char *msg)reset_prepare_engine (engine);if (msg) -dev_notice (engine->i915->drm.dev, +drm_notice (&engine->i915->drm,"Resetting %s for %s\n" , engine->name, msg);atomic_inc (&engine->i915->gpu_error.reset_engine_count[engine->uabi_class]);@@ -1381,7 +1381,7 @@ static void intel_wedge_me(struct work_struct *work) {struct intel_wedge_me *w =container_of (work,typeof (*w), work.work); -dev_err (w->gt->i915->drm.dev, +drm_err (&w->gt->i915->drm,"%s timed out, cancelling all in-flight rendering.\n" , w->name);intel_gt_set_wedged (w->gt);Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 16/17] drm/i915/gt: prefer struct drm_device based logging
In reply to Jani NikulaQuoting Jani Nikula (2020-04-02 12:48:18)
Quoted 6 lines
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Please, please remove the added [drm] crap.
Can I just revert these?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 16/17] drm/i915/gt: prefer struct drm_device based logging
Quoted 9 lines · Chris Wilson
Quoting Jani Nikula (2020-04-02 12:48:18)
Quoted 6 lines
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>Please, please remove the added [drm] crap.
And what exactly is the problem with that?
I'm increasingly frustrated with the whole logging stuff, and beginning to regret I got involved with any of it. It's the perfect bikeshed minefield.
BR,
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
PATCH 17/17 drm/i915/uc: prefer struct drm_device based logging
In reply to Jani NikulaPrefer struct drm_device based logging over struct device based logging.
No functional changes.
--- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 14 +++++++------- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_uc.c +7 -7
@@ -63,25 +63,25 @@ static void __confirm_options(struct intel_uc *uc) }if (!intel_uc_supports_guc (uc)) -dev_info (i915->drm.dev, +drm_info (&i915->drm,"Incompatible option enable_guc=%d - %s\n" , i915_modparams.enable_guc,"GuC is not supported!" );if (i915_modparams.enable_guc &ENABLE_GUC_LOAD_HUC && !intel_uc_supports_huc (uc)) -dev_info (i915->drm.dev, +drm_info (&i915->drm,"Incompatible option enable_guc=%d - %s\n" , i915_modparams.enable_guc,"HuC is not supported!" );if (i915_modparams.enable_guc &ENABLE_GUC_SUBMISSION && !intel_uc_supports_guc_submission (uc)) -dev_info (i915->drm.dev, +drm_info (&i915->drm,"Incompatible option enable_guc=%d - %s\n" , i915_modparams.enable_guc,"GuC submission is N/A" );if (i915_modparams.enable_guc & ~(ENABLE_GUC_SUBMISSION |ENABLE_GUC_LOAD_HUC )) -dev_info (i915->drm.dev, +drm_info (&i915->drm,"Incompatible option enable_guc=%d - %s\n" , i915_modparams.enable_guc,"undocumented flag" ); }
@@ -480,14 +480,14 @@ static int __uc_init_hw(struct intel_uc *uc)if (intel_uc_uses_guc_submission (uc))intel_guc_submission_enable (guc); -dev_info (i915->drm.dev,"%s firmware %s version %u.%u %s:%s\n" , +drm_info (&i915->drm,"%s firmware %s version %u.%u %s:%s\n" ,intel_uc_fw_type_repr (INTEL_UC_FW_TYPE_GUC ), guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found,"submission" ,enableddisabled (intel_uc_uses_guc_submission (uc)));if (intel_uc_uses_huc (uc)) { - dev_info(i915->drm.dev, "%s firmware %s version %u.%u %s:%s\n", + drm_info(&i915->drm, "%s firmware %s version %u.%u %s:%s\n", intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_HUC), huc->fw.path, huc->fw.major_ver_found, huc->fw.minor_ver_found,
@@ -508,7 +508,7 @@ static int __uc_init_hw(struct intel_uc *uc)__uc_sanitize (uc);if (!ret) { -dev_notice (i915->drm.dev,"GuC is uninitialized\n" ); +drm_notice (&i915->drm,"GuC is uninitialized\n" );/* We want to run without GuC submission */ return 0 ; }
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +9 -9
@@ -299,7 +299,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)/* Check the size of the blob before examining buffer contents */ if (unlikely (fw->size <sizeof (struct uc_css_header ))) { -dev_warn (dev,"%s firmware %s: invalid size: %zu < %zu\n" , +drm_warn (&i915->drm,"%s firmware %s: invalid size: %zu < %zu\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, fw->size,sizeof (struct uc_css_header )); err = -ENODATA ;
@@ -312,7 +312,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) size = (css->header_size_dw - css->key_size_dw - css->modulus_size_dw - css->exponent_size_dw) *sizeof (u32);if (unlikely (size !=sizeof (struct uc_css_header ))) { -dev_warn (dev, +drm_warn (&i915->drm,"%s firmware %s: unexpected header size: %zu != %zu\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, fw->size,sizeof (struct uc_css_header ));
@@ -325,7 +325,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)/* now RSA */ if (unlikely (css->key_size_dw !=UOS_RSA_SCRATCH_COUNT )) { -dev_warn (dev,"%s firmware %s: unexpected key size: %u != %u\n" , +drm_warn (&i915->drm,"%s firmware %s: unexpected key size: %u != %u\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, css->key_size_dw,UOS_RSA_SCRATCH_COUNT ); err = -EPROTO ;
@@ -336,7 +336,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)/* At least, it should have header, uCode and RSA. Size of all three. */ size =sizeof (struct uc_css_header ) + uc_fw->ucode_size + uc_fw->rsa_size;if (unlikely (fw->size < size)) { -dev_warn (dev,"%s firmware %s: invalid size: %zu < %zu\n" , +drm_warn (&i915->drm,"%s firmware %s: invalid size: %zu < %zu\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, fw->size, size); err = -ENOEXEC ;
@@ -346,7 +346,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)/* Sanity check whether this fw is not larger than whole WOPCM memory */ size =__intel_uc_fw_get_upload_size (uc_fw);if (unlikely (size >= i915->wopcm.size)) { -dev_warn (dev,"%s firmware %s: invalid size: %zu > %zu\n" , +drm_warn (&i915->drm,"%s firmware %s: invalid size: %zu > %zu\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, size, (size_t )i915->wopcm.size); err = -E2BIG ;
@@ -361,7 +361,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { -dev_notice (dev,"%s firmware %s: unexpected version: %u.%u != %u.%u\n" , +drm_notice (&i915->drm,"%s firmware %s: unexpected version: %u.%u != %u.%u\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, uc_fw->major_ver_found, uc_fw->minor_ver_found, uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
@@ -389,9 +389,9 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) INTEL_UC_FIRMWARE_MISSING : INTEL_UC_FIRMWARE_ERROR); -dev_notice (dev,"%s firmware %s: fetch failed with error %d\n" , +drm_notice (&i915->drm,"%s firmware %s: fetch failed with error %d\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, err); -dev_info (dev,"%s firmware(s) can be downloaded from %s\n" , +drm_info (&i915->drm,"%s firmware(s) can be downloaded from %s\n" ,intel_uc_fw_type_repr (uc_fw->type),INTEL_UC_FIRMWARE_URL );release_firmware (fw);/* OK even if fw is NULL */
@@ -476,7 +476,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)/* Wait for DMA to finish */ ret =intel_wait_for_register_fw (uncore,DMA_CTRL ,START_DMA ,0 ,100 );if (ret) -dev_err (gt->i915->drm.dev,"DMA for %s fw failed, DMA_CTRL=%u\n" , +drm_err (>->i915->drm,"DMA for %s fw failed, DMA_CTRL=%u\n" ,intel_uc_fw_type_repr (uc_fw->type),intel_uncore_read_fw (uncore,DMA_CTRL ));
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 17/17] drm/i915/uc: prefer struct drm_device based logging
Quoted 6 lines · Jani Nikula
Prefer struct
drm_devicebased logging over struct device based logging.No functional changes.
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 148 lines
---
drivers/gpu/drm/i915/gt/uc/intel_uc.c| 14 +++++++-------drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c| 18 +++++++++---------2 files changed, 16 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_uc.c +7
-7@@ -63,25 +63,25 @@ static void __confirm_options(struct intel_uc *uc) }if (!intel_uc_supports_guc (uc)) -dev_info (i915->drm.dev, +drm_info (&i915->drm,"Incompatible option enable_guc=%d - %s\n" , i915_modparams.enable_guc,"GuC is not supported!" );if (i915_modparams.enable_guc &ENABLE_GUC_LOAD_HUC && !intel_uc_supports_huc (uc)) -dev_info (i915->drm.dev, +drm_info (&i915->drm,"Incompatible option enable_guc=%d - %s\n" , i915_modparams.enable_guc,"HuC is not supported!" );if (i915_modparams.enable_guc &ENABLE_GUC_SUBMISSION && !intel_uc_supports_guc_submission (uc)) -dev_info (i915->drm.dev, +drm_info (&i915->drm,"Incompatible option enable_guc=%d - %s\n" , i915_modparams.enable_guc,"GuC submission is N/A" );if (i915_modparams.enable_guc & ~(ENABLE_GUC_SUBMISSION |ENABLE_GUC_LOAD_HUC )) -dev_info (i915->drm.dev, +drm_info (&i915->drm,"Incompatible option enable_guc=%d - %s\n" , i915_modparams.enable_guc,"undocumented flag" ); }@@ -480,14 +480,14 @@ static int __uc_init_hw(struct intel_uc *uc)if (intel_uc_uses_guc_submission (uc))intel_guc_submission_enable (guc); -dev_info (i915->drm.dev,"%s firmware %s version %u.%u %s:%s\n" , +drm_info (&i915->drm,"%s firmware %s version %u.%u %s:%s\n" ,intel_uc_fw_type_repr (INTEL_UC_FW_TYPE_GUC ), guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found,"submission" ,enableddisabled (intel_uc_uses_guc_submission (uc)));if (intel_uc_uses_huc (uc)) { - dev_info(i915->drm.dev, "%s firmware %s version %u.%u %s:%s\n", + drm_info(&i915->drm, "%s firmware %s version %u.%u %s:%s\n", intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_HUC), huc->fw.path, huc->fw.major_ver_found, huc->fw.minor_ver_found,@@ -508,7 +508,7 @@ static int __uc_init_hw(struct intel_uc *uc)__uc_sanitize (uc);if (!ret) { -dev_notice (i915->drm.dev,"GuC is uninitialized\n" ); +drm_notice (&i915->drm,"GuC is uninitialized\n" );/* We want to run without GuC submission */ return 0 ; }drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +9
-9@@ -299,7 +299,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)/* Check the size of the blob before examining buffer contents */ if (unlikely (fw->size <sizeof (struct uc_css_header ))) { -dev_warn (dev,"%s firmware %s: invalid size: %zu < %zu\n" , +drm_warn (&i915->drm,"%s firmware %s: invalid size: %zu < %zu\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, fw->size,sizeof (struct uc_css_header )); err = -ENODATA ;@@ -312,7 +312,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) size = (css->header_size_dw - css->key_size_dw - css->modulus_size_dw - css->exponent_size_dw) *sizeof (u32);if (unlikely (size !=sizeof (struct uc_css_header ))) { -dev_warn (dev, +drm_warn (&i915->drm,"%s firmware %s: unexpected header size: %zu != %zu\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, fw->size,sizeof (struct uc_css_header ));@@ -325,7 +325,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)/* now RSA */ if (unlikely (css->key_size_dw !=UOS_RSA_SCRATCH_COUNT )) { -dev_warn (dev,"%s firmware %s: unexpected key size: %u != %u\n" , +drm_warn (&i915->drm,"%s firmware %s: unexpected key size: %u != %u\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, css->key_size_dw,UOS_RSA_SCRATCH_COUNT ); err = -EPROTO ;@@ -336,7 +336,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)/* At least, it should have header, uCode and RSA. Size of all three. */ size =sizeof (struct uc_css_header ) + uc_fw->ucode_size + uc_fw->rsa_size;if (unlikely (fw->size < size)) { -dev_warn (dev,"%s firmware %s: invalid size: %zu < %zu\n" , +drm_warn (&i915->drm,"%s firmware %s: invalid size: %zu < %zu\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, fw->size, size); err = -ENOEXEC ;@@ -346,7 +346,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)/* Sanity check whether this fw is not larger than whole WOPCM memory */ size =__intel_uc_fw_get_upload_size (uc_fw);if (unlikely (size >= i915->wopcm.size)) { -dev_warn (dev,"%s firmware %s: invalid size: %zu > %zu\n" , +drm_warn (&i915->drm,"%s firmware %s: invalid size: %zu > %zu\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, size, (size_t )i915->wopcm.size); err = -E2BIG ;@@ -361,7 +361,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { -dev_notice (dev,"%s firmware %s: unexpected version: %u.%u != %u.%u\n" , +drm_notice (&i915->drm,"%s firmware %s: unexpected version: %u.%u != %u.%u\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, uc_fw->major_ver_found, uc_fw->minor_ver_found, uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);@@ -389,9 +389,9 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) INTEL_UC_FIRMWARE_MISSING : INTEL_UC_FIRMWARE_ERROR); -dev_notice (dev,"%s firmware %s: fetch failed with error %d\n" , +drm_notice (&i915->drm,"%s firmware %s: fetch failed with error %d\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, err); -dev_info (dev,"%s firmware(s) can be downloaded from %s\n" , +drm_info (&i915->drm,"%s firmware(s) can be downloaded from %s\n" ,intel_uc_fw_type_repr (uc_fw->type),INTEL_UC_FIRMWARE_URL );release_firmware (fw);/* OK even if fw is NULL */ @@ -476,7 +476,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags)/* Wait for DMA to finish */ ret =intel_wait_for_register_fw (uncore,DMA_CTRL ,START_DMA ,0 ,100 );if (ret) -dev_err (gt->i915->drm.dev,"DMA for %s fw failed, DMA_CTRL=%u\n" , +drm_err (>->i915->drm,"DMA for %s fw failed, DMA_CTRL=%u\n" ,intel_uc_fw_type_repr (uc_fw->type),intel_uncore_read_fw (uncore,DMA_CTRL ));Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [01/17] drm/i915/audio: use struct drm_device based logging
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [01/17] drm/i915/audio: use struct drm_device based logging
URL : https://patchwork.freedesktop.org/series/75414/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8237 -> Patchwork_17179
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/index.html
Known issues
------------
Here are the changes found in Patchwork_17179 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@execlists:
- fi-bxt-dsi: [PASS][1] -> [INCOMPLETE][2] ([i915#656])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/fi-bxt-dsi/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/fi-bxt-dsi/igt@i915_selftest@[email protected]
#### Possible fixes ####
* igt@i915_module_load@reload:
- fi-icl-u2: [DMESG-WARN][3] ([i915#289]) -> [PASS][4] +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/fi-icl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/fi-icl-u2/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [DMESG-FAIL][5] ([i915#62]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/fi-kbl-x1275/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/fi-kbl-x1275/igt@[email protected]
* igt@i915_selftest@live@late_gt_pm:
- fi-bsw-n3050: [INCOMPLETE][7] ([i915#1382]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/fi-bsw-n3050/igt@i915_selftest@live@late_gt_pm.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/fi-bsw-n3050/igt@i915_selftest@live@late_gt_pm.html
* igt@i915_selftest@live@requests:
- fi-icl-u2: [INCOMPLETE][9] ([i915#1505] / [i915#1581]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/fi-icl-u2/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/fi-icl-u2/igt@i915_selftest@[email protected]
* igt@kms_force_connector_basic@force-connector-state:
- fi-kbl-x1275: [DMESG-WARN][11] ([i915#62] / [i915#92] / [i915#95]) -> [PASS][12] +9 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/fi-kbl-x1275/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/fi-kbl-x1275/igt@[email protected]
* igt@kms_force_connector_basic@force-edid:
- fi-kbl-x1275: [DMESG-WARN][13] ([i915#62] / [i915#92]) -> [PASS][14] +21 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/fi-kbl-x1275/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/fi-kbl-x1275/igt@[email protected]
[i915#1382]: https://gitlab.freedesktop.org/drm/intel/issues/1382
[i915#1505]: https://gitlab.freedesktop.org/drm/intel/issues/1505
[i915#1581]: https://gitlab.freedesktop.org/drm/intel/issues/1581
[i915#289]: https://gitlab.freedesktop.org/drm/intel/issues/289
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (42 -> 45)
------------------------------
Additional (6): fi-skl-guc fi-snb-2520m fi-kbl-7500u fi-ivb-3770 fi-skl-6600u fi-snb-2600
Missing (3): fi-byt-squawks fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8237 -> Patchwork_17179
CI-20190529: 20190529
CI_DRM_8237: a9a502feaca70cf6ae0259977095244a0a33c138 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5558: 3b55a816300d80bc5e0b995cd41ee8c8649a1ea2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17179: a2696b2a35a3236787b5ad5eda97670bad71a7de @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a2696b2a35a3 drm/i915/uc: prefer struct drm_device based logging 8488b70421b5 drm/i915/gt: prefer struct drm_device based logging e8205d33d8cb drm/i915/stolen: prefer struct drm_device based logging 4177202ed569 drm/i915/uncore: prefer struct drm_device based logging a6b82b4321ac drm/i915/dram: prefer struct drm_device based logging 75a3dc9d0164 drm/i915/pmu: prefer struct drm_device based logging b6bdc53eb65d drm/i915/error: prefer struct drm_device based logging 16ebe7bc1db8 drm/i915/uc: prefer struct drm_device based logging d94202a534f7 drm/i915/switcheroo: use struct drm_device based logging 7c27937f4177 drm/i915/state: use struct drm_device based logging 0ea9315752c2 drm/i915/bw: use struct drm_device based logging 3bd7e63ad124 drm/i915/debugfs: use struct drm_device based logging 242083a5ecc1 drm/i915/crt: use struct drm_device based logging 33d44f72afab drm/i915/dp: use struct drm_device based logging bdfa59ff420a drm/i915/tc: use struct drm_device based logging 555310b4127d drm/i915/panel: use struct drm_device based logging e596492dfa04 drm/i915/audio: use struct drm_device based logging
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/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 series starting with [01/17] drm/i915/audio: use struct drm_device based logging
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [01/17] drm/i915/audio: use struct drm_device based logging
URL : https://patchwork.freedesktop.org/series/75414/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8237_full -> Patchwork_17179_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_17179_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_17179_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_17179_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_mmap_gtt@cpuset-basic-small-copy-odd:
- shard-skl: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-skl9/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-skl7/igt@[email protected]
* igt@gem_tiled_swapping@non-threaded:
- shard-kbl: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-kbl6/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-kbl3/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_8237_full and Patchwork_17179_full:
### New IGT tests (22) ###
* igt@gem_busy@busy:
- Statuses :
- Exec time: [None] s
* igt@gem_exec_schedule@implicit-write-read:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-accuracy-2:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-accuracy-50:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-accuracy-98:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-check-all:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-double-start:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-hang:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-idle:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-no-semaphores:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@busy-start:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@enable-race:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@idle:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@idle-no-semaphores:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@init-wait:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@most-busy-check-all:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@most-busy-idle-check-all:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@multi-client:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@render-node-busy:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@render-node-busy-idle:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@semaphore-busy:
- Statuses :
- Exec time: [None] s
* igt@perf_pmu@semaphore-wait-idle:
- Statuses :
- Exec time: [None] s
Known issues
------------
Here are the changes found in Patchwork_17179_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@engines-mixed-process@vcs1:
- shard-kbl: [PASS][5] -> [FAIL][6] ([i915#1528])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-kbl1/igt@gem_ctx_persistence@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-kbl4/igt@gem_ctx_persistence@[email protected]
* igt@gem_ctx_ringsize@active@bcs0:
- shard-skl: [PASS][7] -> [FAIL][8] ([i915#1407])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-skl1/igt@gem_ctx_ringsize@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-skl5/igt@gem_ctx_ringsize@[email protected]
* igt@i915_selftest@live@requests:
- shard-tglb: [PASS][9] -> [INCOMPLETE][10] ([i915#1531])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-tglb7/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-tglb1/igt@i915_selftest@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: [PASS][11] -> [FAIL][12] ([i915#79])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-glk1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-glk1/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-skl: [PASS][13] -> [INCOMPLETE][14] ([i915#221])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-skl4/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-skl2/igt@[email protected]
- shard-apl: [PASS][15] -> [DMESG-WARN][16] ([i915#180]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-apl6/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-apl4/igt@[email protected]
* igt@kms_flip@plain-flip-fb-recreate:
- shard-skl: [PASS][17] -> [FAIL][18] ([i915#34])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-skl10/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-skl1/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][19] -> [DMESG-WARN][20] ([i915#180])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-kbl1/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-kbl4/igt@[email protected]
* igt@kms_plane_cursor@pipe-a-overlay-size-128:
- shard-kbl: [PASS][21] -> [FAIL][22] ([i915#1559] / [i915#93] / [i915#95])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-kbl4/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-kbl3/igt@[email protected]
- shard-apl: [PASS][23] -> [FAIL][24] ([i915#1559] / [i915#95])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-apl6/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-apl4/igt@[email protected]
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441]) +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-iclb1/igt@kms_psr@psr2_cursor_render.html
* igt@kms_rmfb@close-fd:
- shard-snb: [PASS][27] -> [SKIP][28] ([fdo#109271])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-snb4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-snb2/igt@[email protected]
* igt@prime_busy@wait-after-bsd2:
- shard-iclb: [PASS][29] -> [SKIP][30] ([fdo#109276]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-iclb2/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-iclb5/igt@[email protected]
#### Possible fixes ####
* igt@gem_mmap_gtt@cpuset-medium-copy-xy:
- shard-tglb: [FAIL][31] -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-tglb8/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-tglb5/igt@[email protected]
* {igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy@gtt}:
- shard-snb: [DMESG-WARN][33] ([i915#478]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-snb6/igt@gem_userptr_blits@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-snb4/igt@gem_userptr_blits@[email protected]
* igt@i915_suspend@forcewake:
- shard-kbl: [DMESG-WARN][35] ([i915#180]) -> [PASS][36] +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-kbl7/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-kbl4/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [INCOMPLETE][37] ([i915#221]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-skl7/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-skl4/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][39] ([i915#1188]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-skl5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-skl9/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [DMESG-WARN][41] ([i915#180]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-apl1/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-apl8/igt@[email protected]
* igt@kms_plane@plane-panning-top-left-pipe-a-planes:
- shard-skl: [FAIL][43] ([i915#1036]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-skl8/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-skl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][45] ([fdo#108145] / [i915#265]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-skl10/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-skl1/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][47] ([fdo#109441]) -> [PASS][48] +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-iclb6/igt@kms_psr@psr2_primary_mmap_cpu.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [SKIP][49] ([fdo#109276]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-iclb6/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-iclb2/igt@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][51] ([i915#658]) -> [SKIP][52] ([i915#588])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-iclb6/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-iclb2/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-tglb: [FAIL][53] ([i915#454]) -> [SKIP][54] ([i915#468])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-tglb6/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-tglb2/igt@[email protected]
* igt@i915_pm_rpm@modeset-lpsp-stress-no-wait:
- shard-snb: [INCOMPLETE][55] ([i915#82]) -> [SKIP][56] ([fdo#109271])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8237/shard-snb2/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17179/shard-snb2/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#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#1036]: https://gitlab.freedesktop.org/drm/intel/issues/1036
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1407]: https://gitlab.freedesktop.org/drm/intel/issues/1407
[i915#1528]: https://gitlab.freedesktop.org/drm/intel/issues/1528
[i915#1531]: https://gitlab.freedesktop.org/drm/intel/issues/1531
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1559]: https://gitlab.freedesktop.org/drm/intel/issues/1559
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#221]: https://gitlab.freedesktop.org/drm/intel/issues/221
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[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#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[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_8237 -> Patchwork_17179
CI-20190529: 20190529
CI_DRM_8237: a9a502feaca70cf6ae0259977095244a0a33c138 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5558: 3b55a816300d80bc5e0b995cd41ee8c8649a1ea2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17179: a2696b2a35a3236787b5ad5eda97670bad71a7de @ 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_17179/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 86 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,...)
)
...+>
}
Quoted 2 lines
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 34 lines
---
drivers/gpu/drm/i915/display/intel_audio.c| 12 +++++++-----1 file changed, 7 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/display/intel_audio.c +7
-5@@ -252,14 +252,16 @@ static u32 audio_config_hdmi_pixel_clock(const struct intel_crtc_state *crtc_sta i =ARRAY_SIZE (hdmi_audio_clock);if (i ==ARRAY_SIZE (hdmi_audio_clock)) { -DRM_DEBUG_KMS ("HDMI audio pixel clock setting for %d not found, falling back to defaults\n" , - adjusted_mode->crtc_clock); +drm_dbg_kms (&dev_priv->drm, +"HDMI audio pixel clock setting for %d not found, falling back to defaults\n" , + adjusted_mode->crtc_clock); i =1 ; } -DRM_DEBUG_KMS ("Configuring HDMI audio for pixel clock %d (0x%08x)\n" , - hdmi_audio_clock[i].clock, - hdmi_audio_clock[i].config); +drm_dbg_kms (&dev_priv->drm, +"Configuring HDMI audio for pixel clock %d (0x%08x)\n" , + hdmi_audio_clock[i].clock, + hdmi_audio_clock[i].config);return hdmi_audio_clock[i].config; }Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 88 lines · Wambui Karuga
Quoted 86 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&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_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_NOTE( +drm_notice(&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_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,...)
)
...+>
}
Quoted 4 lines
Quoted 2 lines
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>Reviewed-by Wambui Karuga <[email protected]>
Many thanks for all the reviews, pushed the lot.
BR,
Jani.
Quoted 39 lines
Quoted 35 lines
---
drivers/gpu/drm/i915/display/intel_audio.c| 12 +++++++-----1 file changed, 7 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/display/intel_audio.c +7
-5@@ -252,14 +252,16 @@ static u32 audio_config_hdmi_pixel_clock(const struct intel_crtc_state *crtc_sta i =ARRAY_SIZE (hdmi_audio_clock);if (i ==ARRAY_SIZE (hdmi_audio_clock)) { -DRM_DEBUG_KMS ("HDMI audio pixel clock setting for %d not found, falling back to defaults\n" , - adjusted_mode->crtc_clock); +drm_dbg_kms (&dev_priv->drm, +"HDMI audio pixel clock setting for %d not found, falling back to defaults\n" , + adjusted_mode->crtc_clock); i =1 ; } -DRM_DEBUG_KMS ("Configuring HDMI audio for pixel clock %d (0x%08x)\n" , - hdmi_audio_clock[i].clock, - hdmi_audio_clock[i].config); +drm_dbg_kms (&dev_priv->drm, +"Configuring HDMI audio for pixel clock %d (0x%08x)\n" , + hdmi_audio_clock[i].clock, + hdmi_audio_clock[i].config);return hdmi_audio_clock[i].config; }Signature · 1 line
2.20.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx