* [PATCH 00/18] Prefer drm_WARN* over WARN*
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel; +Cc: pankaj.laxminarayan.bharadiya
Now we have struct drm_device specific drm_WARN* macros which include
device information in the backtrace, so we know what device the
warnings originate from.
This series converts WARN* with drm_WARN* where struct drm_device
pointer can be extracted.
This series is the continuation of:
https://patchwork.freedesktop.org/series/72035/
Pankaj Bharadiya (18):
drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/ddi: Prefer drm_WARN* over WARN*
drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/dp: Prefer drm_WARN* over WARN*
drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/global_state: Prefer drm_WARN* over WARN*
drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
drm/i915/gem: Prefer drm_WARN* over WARN*
drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
drivers/gpu/drm/i915/display/icl_dsi.c | 2 +-
.../gpu/drm/i915/display/intel_atomic_plane.c | 4 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 14 +++--
drivers/gpu/drm/i915/display/intel_display.c | 24 ++++----
.../drm/i915/display/intel_display_power.c | 35 ++++++++----
drivers/gpu/drm/i915/display/intel_dp.c | 26 ++++++---
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 8 +--
.../gpu/drm/i915/display/intel_frontbuffer.c | 6 +-
.../gpu/drm/i915/display/intel_global_state.c | 4 +-
drivers/gpu/drm/i915/display/intel_overlay.c | 6 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 16 +++---
drivers/gpu/drm/i915/display/intel_tc.c | 12 ++--
drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +-
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 3 +-
drivers/gpu/drm/i915/i915_pmu.c | 11 +++-
drivers/gpu/drm/i915/intel_pm.c | 57 +++++++++++--------
drivers/gpu/drm/i915/intel_runtime_pm.c | 39 +++++++++----
20 files changed, 170 insertions(+), 106 deletions(-)
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 00/18] Prefer drm_WARN* over WARN*
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel
Now we have struct drm_device specific drm_WARN* macros which include
device information in the backtrace, so we know what device the
warnings originate from.
This series converts WARN* with drm_WARN* where struct drm_device
pointer can be extracted.
This series is the continuation of:
https://patchwork.freedesktop.org/series/72035/
Pankaj Bharadiya (18):
drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/ddi: Prefer drm_WARN* over WARN*
drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/dp: Prefer drm_WARN* over WARN*
drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/global_state: Prefer drm_WARN* over WARN*
drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
drm/i915/gem: Prefer drm_WARN* over WARN*
drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
drivers/gpu/drm/i915/display/icl_dsi.c | 2 +-
.../gpu/drm/i915/display/intel_atomic_plane.c | 4 +-
drivers/gpu/drm/i915/display/intel_ddi.c | 14 +++--
drivers/gpu/drm/i915/display/intel_display.c | 24 ++++----
.../drm/i915/display/intel_display_power.c | 35 ++++++++----
drivers/gpu/drm/i915/display/intel_dp.c | 26 ++++++---
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 8 +--
.../gpu/drm/i915/display/intel_frontbuffer.c | 6 +-
.../gpu/drm/i915/display/intel_global_state.c | 4 +-
drivers/gpu/drm/i915/display/intel_overlay.c | 6 +-
drivers/gpu/drm/i915/display/intel_sdvo.c | 16 +++---
drivers/gpu/drm/i915/display/intel_tc.c | 12 ++--
drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +-
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 3 +-
drivers/gpu/drm/i915/i915_pmu.c | 11 +++-
drivers/gpu/drm/i915/intel_pm.c | 57 +++++++++++--------
drivers/gpu/drm/i915/intel_runtime_pm.c | 39 +++++++++----
20 files changed, 170 insertions(+), 106 deletions(-)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* [PATCH 01/18] drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Vandita Kulkarni,
Ville Syrjälä,
Uma Shankar, Chris Wilson, Imre Deak
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/icl_dsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 99a25c0bb08f..499383766fc2 100644
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1195,7 +1195,7 @@ static void gen11_dsi_enable(struct intel_atomic_state *state,
{
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
- WARN_ON(crtc_state->has_pch_encoder);
+ drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
/* step6d: enable dsi transcoder */
gen11_dsi_enable_transcoder(encoder);
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 01/18] drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Vandita Kulkarni,
Ville Syrjälä,
Uma Shankar, Chris Wilson, Imre Deak
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/icl_dsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 99a25c0bb08f..499383766fc2 100644
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1195,7 +1195,7 @@ static void gen11_dsi_enable(struct intel_atomic_state *state,
{
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
- WARN_ON(crtc_state->has_pch_encoder);
+ drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
/* step6d: enable dsi transcoder */
gen11_dsi_enable_transcoder(encoder);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 02/18] drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Maarten Lankhorst, Chris Wilson
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_atomic_plane.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 25dfeb3197aa..79032701873a 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -125,7 +125,7 @@ intel_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state)
{
struct intel_plane_state *plane_state = to_intel_plane_state(state);
- WARN_ON(plane_state->vma);
+ drm_WARN_ON(plane->dev, plane_state->vma);
__drm_atomic_helper_plane_destroy_state(&plane_state->uapi);
if (plane_state->hw.fb)
@@ -396,7 +396,7 @@ skl_next_plane_to_commit(struct intel_atomic_state *state,
}
/* should never happen */
- WARN_ON(1);
+ drm_WARN_ON(state->base.dev, 1);
return NULL;
}
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 02/18] drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Maarten Lankhorst, Chris Wilson
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_atomic_plane.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 25dfeb3197aa..79032701873a 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -125,7 +125,7 @@ intel_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state)
{
struct intel_plane_state *plane_state = to_intel_plane_state(state);
- WARN_ON(plane_state->vma);
+ drm_WARN_ON(plane->dev, plane_state->vma);
__drm_atomic_helper_plane_destroy_state(&plane_state->uapi);
if (plane_state->hw.fb)
@@ -396,7 +396,7 @@ skl_next_plane_to_commit(struct intel_atomic_state *state,
}
/* should never happen */
- WARN_ON(1);
+ drm_WARN_ON(state->base.dev, 1);
return NULL;
}
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 03/18] drm/i915/display/ddi: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
José Roberto de Souza, Lucas De Marchi, Imre Deak
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* calls.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_ddi.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 7184f3b8f091..353a32f5bf46 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2654,8 +2654,9 @@ static void tgl_ddi_vswing_sequence(struct intel_encoder *encoder,
tgl_dkl_phy_ddi_vswing_sequence(encoder, link_clock, level);
}
-static u32 translate_signal_level(int signal_levels)
+static u32 translate_signal_level(struct intel_dp *intel_dp, int signal_levels)
{
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
int i;
for (i = 0; i < ARRAY_SIZE(index_to_dp_signal_levels); i++) {
@@ -2663,8 +2664,9 @@ static u32 translate_signal_level(int signal_levels)
return i;
}
- WARN(1, "Unsupported voltage swing/pre-emphasis level: 0x%x\n",
- signal_levels);
+ drm_WARN(&i915->drm, 1,
+ "Unsupported voltage swing/pre-emphasis level: 0x%x\n",
+ signal_levels);
return 0;
}
@@ -2675,7 +2677,7 @@ static u32 intel_ddi_dp_level(struct intel_dp *intel_dp)
int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
DP_TRAIN_PRE_EMPHASIS_MASK);
- return translate_signal_level(signal_levels);
+ return translate_signal_level(intel_dp, signal_levels);
}
u32 bxt_signal_levels(struct intel_dp *intel_dp)
@@ -3766,7 +3768,7 @@ static void intel_enable_ddi(struct intel_atomic_state *state,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state)
{
- WARN_ON(crtc_state->has_pch_encoder);
+ drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
intel_enable_pipe(crtc_state);
@@ -3877,7 +3879,7 @@ intel_ddi_update_prepare(struct intel_atomic_state *state,
crtc ? intel_atomic_get_new_crtc_state(state, crtc) : NULL;
int required_lanes = crtc_state ? crtc_state->lane_count : 1;
- WARN_ON(crtc && crtc->active);
+ drm_WARN_ON(state->base.dev, crtc && crtc->active);
intel_tc_port_get_link(enc_to_dig_port(encoder),
required_lanes);
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 03/18] drm/i915/display/ddi: Prefer drm_WARN* over WARN*
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
José Roberto de Souza, Lucas De Marchi, Imre Deak
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* calls.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_ddi.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 7184f3b8f091..353a32f5bf46 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2654,8 +2654,9 @@ static void tgl_ddi_vswing_sequence(struct intel_encoder *encoder,
tgl_dkl_phy_ddi_vswing_sequence(encoder, link_clock, level);
}
-static u32 translate_signal_level(int signal_levels)
+static u32 translate_signal_level(struct intel_dp *intel_dp, int signal_levels)
{
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
int i;
for (i = 0; i < ARRAY_SIZE(index_to_dp_signal_levels); i++) {
@@ -2663,8 +2664,9 @@ static u32 translate_signal_level(int signal_levels)
return i;
}
- WARN(1, "Unsupported voltage swing/pre-emphasis level: 0x%x\n",
- signal_levels);
+ drm_WARN(&i915->drm, 1,
+ "Unsupported voltage swing/pre-emphasis level: 0x%x\n",
+ signal_levels);
return 0;
}
@@ -2675,7 +2677,7 @@ static u32 intel_ddi_dp_level(struct intel_dp *intel_dp)
int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
DP_TRAIN_PRE_EMPHASIS_MASK);
- return translate_signal_level(signal_levels);
+ return translate_signal_level(intel_dp, signal_levels);
}
u32 bxt_signal_levels(struct intel_dp *intel_dp)
@@ -3766,7 +3768,7 @@ static void intel_enable_ddi(struct intel_atomic_state *state,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state)
{
- WARN_ON(crtc_state->has_pch_encoder);
+ drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
intel_enable_pipe(crtc_state);
@@ -3877,7 +3879,7 @@ intel_ddi_update_prepare(struct intel_atomic_state *state,
crtc ? intel_atomic_get_new_crtc_state(state, crtc) : NULL;
int required_lanes = crtc_state ? crtc_state->lane_count : 1;
- WARN_ON(crtc && crtc->active);
+ drm_WARN_ON(state->base.dev, crtc && crtc->active);
intel_tc_port_get_link(enc_to_dig_port(encoder),
required_lanes);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 04/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Maarten Lankhorst, José Roberto de Souza
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON at places where struct drm_device
pointer can be extracted.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 24 ++++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 70ec301fe6e3..71ff6b2dc9df 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1973,16 +1973,16 @@ static bool is_aux_plane(const struct drm_framebuffer *fb, int plane)
static int main_to_ccs_plane(const struct drm_framebuffer *fb, int main_plane)
{
- WARN_ON(!is_ccs_modifier(fb->modifier) ||
- (main_plane && main_plane >= fb->format->num_planes / 2));
+ drm_WARN_ON(fb->dev, !is_ccs_modifier(fb->modifier) ||
+ (main_plane && main_plane >= fb->format->num_planes / 2));
return fb->format->num_planes / 2 + main_plane;
}
static int ccs_to_main_plane(const struct drm_framebuffer *fb, int ccs_plane)
{
- WARN_ON(!is_ccs_modifier(fb->modifier) ||
- ccs_plane < fb->format->num_planes / 2);
+ drm_WARN_ON(fb->dev, !is_ccs_modifier(fb->modifier) ||
+ ccs_plane < fb->format->num_planes / 2);
return ccs_plane - fb->format->num_planes / 2;
}
@@ -2992,7 +2992,7 @@ setup_fb_rotation(int plane, const struct intel_remapped_plane_info *plane_info,
fb->modifier != I915_FORMAT_MOD_Yf_TILED)
return 0;
- if (WARN_ON(plane >= ARRAY_SIZE(rot_info->plane)))
+ if (drm_WARN_ON(fb->dev, plane >= ARRAY_SIZE(rot_info->plane)))
return 0;
rot_info->plane[plane] = *plane_info;
@@ -6621,7 +6621,7 @@ intel_connector_primary_encoder(struct intel_connector *connector)
return &dp_to_dig_port(connector->mst_port)->base;
encoder = intel_attached_encoder(connector);
- WARN_ON(!encoder);
+ drm_WARN_ON(connector->base.dev, !encoder);
return encoder;
}
@@ -7946,7 +7946,8 @@ static u32 ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config)
if (pipe_h < pfit_h)
pipe_h = pfit_h;
- if (WARN_ON(!pfit_w || !pfit_h))
+ if (drm_WARN_ON(pipe_config->uapi.crtc->dev,
+ !pfit_w || !pfit_h))
return pixel_rate;
pixel_rate = div_u64(mul_u32_u32(pixel_rate, pipe_w * pipe_h),
@@ -12426,8 +12427,10 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)
if (IS_ERR(linked_plane_state))
return PTR_ERR(linked_plane_state);
- WARN_ON(linked_plane_state->planar_linked_plane != plane);
- WARN_ON(linked_plane_state->planar_slave == plane_state->planar_slave);
+ drm_WARN_ON(state->base.dev,
+ linked_plane_state->planar_linked_plane != plane);
+ drm_WARN_ON(state->base.dev,
+ linked_plane_state->planar_slave == plane_state->planar_slave);
}
return 0;
@@ -13150,7 +13153,8 @@ static void intel_crtc_copy_hw_to_uapi_state(struct intel_crtc_state *crtc_state
{
crtc_state->uapi.enable = crtc_state->hw.enable;
crtc_state->uapi.active = crtc_state->hw.active;
- WARN_ON(drm_atomic_set_mode_for_crtc(&crtc_state->uapi, &crtc_state->hw.mode) < 0);
+ drm_WARN_ON(crtc_state->uapi.crtc->dev,
+ drm_atomic_set_mode_for_crtc(&crtc_state->uapi, &crtc_state->hw.mode) < 0);
crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode;
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 04/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Maarten Lankhorst, José Roberto de Souza
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON at places where struct drm_device
pointer can be extracted.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 24 ++++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 70ec301fe6e3..71ff6b2dc9df 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1973,16 +1973,16 @@ static bool is_aux_plane(const struct drm_framebuffer *fb, int plane)
static int main_to_ccs_plane(const struct drm_framebuffer *fb, int main_plane)
{
- WARN_ON(!is_ccs_modifier(fb->modifier) ||
- (main_plane && main_plane >= fb->format->num_planes / 2));
+ drm_WARN_ON(fb->dev, !is_ccs_modifier(fb->modifier) ||
+ (main_plane && main_plane >= fb->format->num_planes / 2));
return fb->format->num_planes / 2 + main_plane;
}
static int ccs_to_main_plane(const struct drm_framebuffer *fb, int ccs_plane)
{
- WARN_ON(!is_ccs_modifier(fb->modifier) ||
- ccs_plane < fb->format->num_planes / 2);
+ drm_WARN_ON(fb->dev, !is_ccs_modifier(fb->modifier) ||
+ ccs_plane < fb->format->num_planes / 2);
return ccs_plane - fb->format->num_planes / 2;
}
@@ -2992,7 +2992,7 @@ setup_fb_rotation(int plane, const struct intel_remapped_plane_info *plane_info,
fb->modifier != I915_FORMAT_MOD_Yf_TILED)
return 0;
- if (WARN_ON(plane >= ARRAY_SIZE(rot_info->plane)))
+ if (drm_WARN_ON(fb->dev, plane >= ARRAY_SIZE(rot_info->plane)))
return 0;
rot_info->plane[plane] = *plane_info;
@@ -6621,7 +6621,7 @@ intel_connector_primary_encoder(struct intel_connector *connector)
return &dp_to_dig_port(connector->mst_port)->base;
encoder = intel_attached_encoder(connector);
- WARN_ON(!encoder);
+ drm_WARN_ON(connector->base.dev, !encoder);
return encoder;
}
@@ -7946,7 +7946,8 @@ static u32 ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config)
if (pipe_h < pfit_h)
pipe_h = pfit_h;
- if (WARN_ON(!pfit_w || !pfit_h))
+ if (drm_WARN_ON(pipe_config->uapi.crtc->dev,
+ !pfit_w || !pfit_h))
return pixel_rate;
pixel_rate = div_u64(mul_u32_u32(pixel_rate, pipe_w * pipe_h),
@@ -12426,8 +12427,10 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)
if (IS_ERR(linked_plane_state))
return PTR_ERR(linked_plane_state);
- WARN_ON(linked_plane_state->planar_linked_plane != plane);
- WARN_ON(linked_plane_state->planar_slave == plane_state->planar_slave);
+ drm_WARN_ON(state->base.dev,
+ linked_plane_state->planar_linked_plane != plane);
+ drm_WARN_ON(state->base.dev,
+ linked_plane_state->planar_slave == plane_state->planar_slave);
}
return 0;
@@ -13150,7 +13153,8 @@ static void intel_crtc_copy_hw_to_uapi_state(struct intel_crtc_state *crtc_state
{
crtc_state->uapi.enable = crtc_state->hw.enable;
crtc_state->uapi.active = crtc_state->hw.active;
- WARN_ON(drm_atomic_set_mode_for_crtc(&crtc_state->uapi, &crtc_state->hw.mode) < 0);
+ drm_WARN_ON(crtc_state->uapi.crtc->dev,
+ drm_atomic_set_mode_for_crtc(&crtc_state->uapi, &crtc_state->hw.mode) < 0);
crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode;
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 05/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Chris Wilson, Imre Deak,
Ville Syrjälä,
Matt Roper
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON at places where struct i915_power_domains
struct is available.
Conversion is done with below sementic patch:
@@
identifier func, T;
@@
func(struct i915_power_domains *T,...) {
+ struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, power_domains);
<+...
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
.../drm/i915/display/intel_display_power.c | 35 +++++++++++++------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 433e5a81dd4d..5475f989df4c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -1850,22 +1850,29 @@ static u64 __async_put_domains_mask(struct i915_power_domains *power_domains)
static bool
assert_async_put_domain_masks_disjoint(struct i915_power_domains *power_domains)
{
- return !WARN_ON(power_domains->async_put_domains[0] &
- power_domains->async_put_domains[1]);
+ struct drm_i915_private *i915 = container_of(power_domains,
+ struct drm_i915_private,
+ power_domains);
+ return !drm_WARN_ON(&i915->drm, power_domains->async_put_domains[0] &
+ power_domains->async_put_domains[1]);
}
static bool
__async_put_domains_state_ok(struct i915_power_domains *power_domains)
{
+ struct drm_i915_private *i915 = container_of(power_domains,
+ struct drm_i915_private,
+ power_domains);
enum intel_display_power_domain domain;
bool err = false;
err |= !assert_async_put_domain_masks_disjoint(power_domains);
- err |= WARN_ON(!!power_domains->async_put_wakeref !=
- !!__async_put_domains_mask(power_domains));
+ err |= drm_WARN_ON(&i915->drm, !!power_domains->async_put_wakeref !=
+ !!__async_put_domains_mask(power_domains));
for_each_power_domain(domain, __async_put_domains_mask(power_domains))
- err |= WARN_ON(power_domains->domain_use_count[domain] != 1);
+ err |= drm_WARN_ON(&i915->drm,
+ power_domains->domain_use_count[domain] != 1);
return !err;
}
@@ -2107,11 +2114,14 @@ static void
queue_async_put_domains_work(struct i915_power_domains *power_domains,
intel_wakeref_t wakeref)
{
- WARN_ON(power_domains->async_put_wakeref);
+ struct drm_i915_private *i915 = container_of(power_domains,
+ struct drm_i915_private,
+ power_domains);
+ drm_WARN_ON(&i915->drm, power_domains->async_put_wakeref);
power_domains->async_put_wakeref = wakeref;
- WARN_ON(!queue_delayed_work(system_unbound_wq,
- &power_domains->async_put_work,
- msecs_to_jiffies(100)));
+ drm_WARN_ON(&i915->drm, !queue_delayed_work(system_unbound_wq,
+ &power_domains->async_put_work,
+ msecs_to_jiffies(100)));
}
static void
@@ -4318,6 +4328,9 @@ __set_power_wells(struct i915_power_domains *power_domains,
const struct i915_power_well_desc *power_well_descs,
int power_well_count)
{
+ struct drm_i915_private *i915 = container_of(power_domains,
+ struct drm_i915_private,
+ power_domains);
u64 power_well_ids = 0;
int i;
@@ -4337,8 +4350,8 @@ __set_power_wells(struct i915_power_domains *power_domains,
if (id == DISP_PW_ID_NONE)
continue;
- WARN_ON(id >= sizeof(power_well_ids) * 8);
- WARN_ON(power_well_ids & BIT_ULL(id));
+ drm_WARN_ON(&i915->drm, id >= sizeof(power_well_ids) * 8);
+ drm_WARN_ON(&i915->drm, power_well_ids & BIT_ULL(id));
power_well_ids |= BIT_ULL(id);
}
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 05/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Chris Wilson, Imre Deak,
Ville Syrjälä,
Matt Roper
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON at places where struct i915_power_domains
struct is available.
Conversion is done with below sementic patch:
@@
identifier func, T;
@@
func(struct i915_power_domains *T,...) {
+ struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, power_domains);
<+...
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
.../drm/i915/display/intel_display_power.c | 35 +++++++++++++------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 433e5a81dd4d..5475f989df4c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -1850,22 +1850,29 @@ static u64 __async_put_domains_mask(struct i915_power_domains *power_domains)
static bool
assert_async_put_domain_masks_disjoint(struct i915_power_domains *power_domains)
{
- return !WARN_ON(power_domains->async_put_domains[0] &
- power_domains->async_put_domains[1]);
+ struct drm_i915_private *i915 = container_of(power_domains,
+ struct drm_i915_private,
+ power_domains);
+ return !drm_WARN_ON(&i915->drm, power_domains->async_put_domains[0] &
+ power_domains->async_put_domains[1]);
}
static bool
__async_put_domains_state_ok(struct i915_power_domains *power_domains)
{
+ struct drm_i915_private *i915 = container_of(power_domains,
+ struct drm_i915_private,
+ power_domains);
enum intel_display_power_domain domain;
bool err = false;
err |= !assert_async_put_domain_masks_disjoint(power_domains);
- err |= WARN_ON(!!power_domains->async_put_wakeref !=
- !!__async_put_domains_mask(power_domains));
+ err |= drm_WARN_ON(&i915->drm, !!power_domains->async_put_wakeref !=
+ !!__async_put_domains_mask(power_domains));
for_each_power_domain(domain, __async_put_domains_mask(power_domains))
- err |= WARN_ON(power_domains->domain_use_count[domain] != 1);
+ err |= drm_WARN_ON(&i915->drm,
+ power_domains->domain_use_count[domain] != 1);
return !err;
}
@@ -2107,11 +2114,14 @@ static void
queue_async_put_domains_work(struct i915_power_domains *power_domains,
intel_wakeref_t wakeref)
{
- WARN_ON(power_domains->async_put_wakeref);
+ struct drm_i915_private *i915 = container_of(power_domains,
+ struct drm_i915_private,
+ power_domains);
+ drm_WARN_ON(&i915->drm, power_domains->async_put_wakeref);
power_domains->async_put_wakeref = wakeref;
- WARN_ON(!queue_delayed_work(system_unbound_wq,
- &power_domains->async_put_work,
- msecs_to_jiffies(100)));
+ drm_WARN_ON(&i915->drm, !queue_delayed_work(system_unbound_wq,
+ &power_domains->async_put_work,
+ msecs_to_jiffies(100)));
}
static void
@@ -4318,6 +4328,9 @@ __set_power_wells(struct i915_power_domains *power_domains,
const struct i915_power_well_desc *power_well_descs,
int power_well_count)
{
+ struct drm_i915_private *i915 = container_of(power_domains,
+ struct drm_i915_private,
+ power_domains);
u64 power_well_ids = 0;
int i;
@@ -4337,8 +4350,8 @@ __set_power_wells(struct i915_power_domains *power_domains,
if (id == DISP_PW_ID_NONE)
continue;
- WARN_ON(id >= sizeof(power_well_ids) * 8);
- WARN_ON(power_well_ids & BIT_ULL(id));
+ drm_WARN_ON(&i915->drm, id >= sizeof(power_well_ids) * 8);
+ drm_WARN_ON(&i915->drm, power_well_ids & BIT_ULL(id));
power_well_ids |= BIT_ULL(id);
}
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 06/18] drm/i915/display/dp: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Manasi Navare, Imre Deak, Gwan-gyeong Mun
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* at places where struct intel_dp struct
pointer is available.
Conversion is done with below sementic patch:
@@
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,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp.c | 26 ++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index db6ae8e9af6e..5076a7cfe0e5 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -410,7 +410,10 @@ static int intel_dp_rate_index(const int *rates, int len, int rate)
static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
{
- WARN_ON(!intel_dp->num_source_rates || !intel_dp->num_sink_rates);
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+
+ drm_WARN_ON(&i915->drm,
+ !intel_dp->num_source_rates || !intel_dp->num_sink_rates);
intel_dp->num_common_rates = intersect_rates(intel_dp->source_rates,
intel_dp->num_source_rates,
@@ -419,7 +422,7 @@ static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
intel_dp->common_rates);
/* Paranoia, there should always be something in common. */
- if (WARN_ON(intel_dp->num_common_rates == 0)) {
+ if (drm_WARN_ON(&i915->drm, intel_dp->num_common_rates == 0)) {
intel_dp->common_rates[0] = 162000;
intel_dp->num_common_rates = 1;
}
@@ -1549,6 +1552,7 @@ static ssize_t
intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
{
struct intel_dp *intel_dp = container_of(aux, struct intel_dp, aux);
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
u8 txbuf[20], rxbuf[20];
size_t txsize, rxsize;
int ret;
@@ -1562,10 +1566,10 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
txsize = msg->size ? HEADER_SIZE + msg->size : BARE_ADDRESS_SIZE;
rxsize = 2; /* 0 or 1 data bytes */
- if (WARN_ON(txsize > 20))
+ if (drm_WARN_ON(&i915->drm, txsize > 20))
return -E2BIG;
- WARN_ON(!msg->buffer != !msg->size);
+ drm_WARN_ON(&i915->drm, !msg->buffer != !msg->size);
if (msg->buffer)
memcpy(txbuf + HEADER_SIZE, msg->buffer, msg->size);
@@ -1590,7 +1594,7 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
txsize = msg->size ? HEADER_SIZE : BARE_ADDRESS_SIZE;
rxsize = msg->size + 1;
- if (WARN_ON(rxsize > 20))
+ if (drm_WARN_ON(&i915->drm, rxsize > 20))
return -E2BIG;
ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
@@ -1864,10 +1868,11 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp)
int
intel_dp_max_link_rate(struct intel_dp *intel_dp)
{
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
int len;
len = intel_dp_common_len_rate_limit(intel_dp, intel_dp->max_link_rate);
- if (WARN_ON(len <= 0))
+ if (drm_WARN_ON(&i915->drm, len <= 0))
return 162000;
return intel_dp->common_rates[len - 1];
@@ -1875,10 +1880,11 @@ intel_dp_max_link_rate(struct intel_dp *intel_dp)
int intel_dp_rate_select(struct intel_dp *intel_dp, int rate)
{
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
int i = intel_dp_rate_index(intel_dp->sink_rates,
intel_dp->num_sink_rates, rate);
- if (WARN_ON(i < 0))
+ if (drm_WARN_ON(&i915->drm, i < 0))
i = 0;
return i;
@@ -5404,6 +5410,7 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp)
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) {
@@ -5412,7 +5419,7 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)
int retry;
bool handled;
- WARN_ON_ONCE(intel_dp->active_mst_links < 0);
+ drm_WARN_ON_ONCE(&i915->drm, intel_dp->active_mst_links < 0);
bret = intel_dp_get_sink_irq_esi(intel_dp, esi);
go_again:
if (bret == true) {
@@ -5695,11 +5702,12 @@ 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;
- if (WARN_ON(intel_dp_is_edp(intel_dp)))
+ if (drm_WARN_ON(&i915->drm, intel_dp_is_edp(intel_dp)))
return connector_status_connected;
if (lspcon->active)
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 06/18] drm/i915/display/dp: Prefer drm_WARN* over WARN*
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Manasi Navare, Imre Deak, Gwan-gyeong Mun
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* at places where struct intel_dp struct
pointer is available.
Conversion is done with below sementic patch:
@@
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,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp.c | 26 ++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index db6ae8e9af6e..5076a7cfe0e5 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -410,7 +410,10 @@ static int intel_dp_rate_index(const int *rates, int len, int rate)
static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
{
- WARN_ON(!intel_dp->num_source_rates || !intel_dp->num_sink_rates);
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+
+ drm_WARN_ON(&i915->drm,
+ !intel_dp->num_source_rates || !intel_dp->num_sink_rates);
intel_dp->num_common_rates = intersect_rates(intel_dp->source_rates,
intel_dp->num_source_rates,
@@ -419,7 +422,7 @@ static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
intel_dp->common_rates);
/* Paranoia, there should always be something in common. */
- if (WARN_ON(intel_dp->num_common_rates == 0)) {
+ if (drm_WARN_ON(&i915->drm, intel_dp->num_common_rates == 0)) {
intel_dp->common_rates[0] = 162000;
intel_dp->num_common_rates = 1;
}
@@ -1549,6 +1552,7 @@ static ssize_t
intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
{
struct intel_dp *intel_dp = container_of(aux, struct intel_dp, aux);
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
u8 txbuf[20], rxbuf[20];
size_t txsize, rxsize;
int ret;
@@ -1562,10 +1566,10 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
txsize = msg->size ? HEADER_SIZE + msg->size : BARE_ADDRESS_SIZE;
rxsize = 2; /* 0 or 1 data bytes */
- if (WARN_ON(txsize > 20))
+ if (drm_WARN_ON(&i915->drm, txsize > 20))
return -E2BIG;
- WARN_ON(!msg->buffer != !msg->size);
+ drm_WARN_ON(&i915->drm, !msg->buffer != !msg->size);
if (msg->buffer)
memcpy(txbuf + HEADER_SIZE, msg->buffer, msg->size);
@@ -1590,7 +1594,7 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
txsize = msg->size ? HEADER_SIZE : BARE_ADDRESS_SIZE;
rxsize = msg->size + 1;
- if (WARN_ON(rxsize > 20))
+ if (drm_WARN_ON(&i915->drm, rxsize > 20))
return -E2BIG;
ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
@@ -1864,10 +1868,11 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp)
int
intel_dp_max_link_rate(struct intel_dp *intel_dp)
{
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
int len;
len = intel_dp_common_len_rate_limit(intel_dp, intel_dp->max_link_rate);
- if (WARN_ON(len <= 0))
+ if (drm_WARN_ON(&i915->drm, len <= 0))
return 162000;
return intel_dp->common_rates[len - 1];
@@ -1875,10 +1880,11 @@ intel_dp_max_link_rate(struct intel_dp *intel_dp)
int intel_dp_rate_select(struct intel_dp *intel_dp, int rate)
{
+ struct drm_i915_private *i915 = dp_to_i915(intel_dp);
int i = intel_dp_rate_index(intel_dp->sink_rates,
intel_dp->num_sink_rates, rate);
- if (WARN_ON(i < 0))
+ if (drm_WARN_ON(&i915->drm, i < 0))
i = 0;
return i;
@@ -5404,6 +5410,7 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp)
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) {
@@ -5412,7 +5419,7 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)
int retry;
bool handled;
- WARN_ON_ONCE(intel_dp->active_mst_links < 0);
+ drm_WARN_ON_ONCE(&i915->drm, intel_dp->active_mst_links < 0);
bret = intel_dp_get_sink_irq_esi(intel_dp, esi);
go_again:
if (bret == true) {
@@ -5695,11 +5702,12 @@ 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;
- if (WARN_ON(intel_dp_is_edp(intel_dp)))
+ if (drm_WARN_ON(&i915->drm, intel_dp_is_edp(intel_dp)))
return connector_status_connected;
if (lspcon->active)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 07/18] drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Imre Deak, Lucas De Marchi, José Roberto de Souza,
Chris Wilson
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON at places where struct drm_device
pointer can be extracted.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 2d47f1f756a2..b45185b80bec 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -80,7 +80,7 @@ intel_atomic_get_shared_dpll_state(struct drm_atomic_state *s)
{
struct intel_atomic_state *state = to_intel_atomic_state(s);
- WARN_ON(!drm_modeset_is_locked(&s->dev->mode_config.connection_mutex));
+ drm_WARN_ON(s->dev, !drm_modeset_is_locked(&s->dev->mode_config.connection_mutex));
if (!state->dpll_set) {
state->dpll_set = true;
@@ -979,7 +979,7 @@ hsw_ddi_spll_get_dpll(struct intel_atomic_state *state,
struct intel_crtc_state *crtc_state =
intel_atomic_get_new_crtc_state(state, crtc);
- if (WARN_ON(crtc_state->port_clock / 2 != 135000))
+ if (drm_WARN_ON(crtc->base.dev, crtc_state->port_clock / 2 != 135000))
return NULL;
crtc_state->dpll_hw_state.spll = SPLL_PLL_ENABLE | SPLL_FREQ_1350MHz |
@@ -1616,7 +1616,7 @@ static int skl_ddi_wrpll_get_freq(struct drm_i915_private *i915,
dco_freq += ((pll_state->cfgcr1 & DPLL_CFGCR1_DCO_FRACTION_MASK) >> 9) *
ref_clock / 0x8000;
- if (WARN_ON(p0 == 0 || p1 == 0 || p2 == 0))
+ if (drm_WARN_ON(&i915->drm, p0 == 0 || p1 == 0 || p2 == 0))
return 0;
return dco_freq / (p0 * p1 * p2 * 5);
@@ -2074,7 +2074,7 @@ bxt_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state,
clk_div->p1 = best_clock.p1;
clk_div->p2 = best_clock.p2;
- WARN_ON(best_clock.m1 != 2);
+ drm_WARN_ON(&i915->drm, best_clock.m1 != 2);
clk_div->n = best_clock.n;
clk_div->m2_int = best_clock.m2 >> 22;
clk_div->m2_frac = best_clock.m2 & ((1 << 22) - 1);
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 07/18] drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Imre Deak, Lucas De Marchi, José Roberto de Souza,
Chris Wilson
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON at places where struct drm_device
pointer can be extracted.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 2d47f1f756a2..b45185b80bec 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -80,7 +80,7 @@ intel_atomic_get_shared_dpll_state(struct drm_atomic_state *s)
{
struct intel_atomic_state *state = to_intel_atomic_state(s);
- WARN_ON(!drm_modeset_is_locked(&s->dev->mode_config.connection_mutex));
+ drm_WARN_ON(s->dev, !drm_modeset_is_locked(&s->dev->mode_config.connection_mutex));
if (!state->dpll_set) {
state->dpll_set = true;
@@ -979,7 +979,7 @@ hsw_ddi_spll_get_dpll(struct intel_atomic_state *state,
struct intel_crtc_state *crtc_state =
intel_atomic_get_new_crtc_state(state, crtc);
- if (WARN_ON(crtc_state->port_clock / 2 != 135000))
+ if (drm_WARN_ON(crtc->base.dev, crtc_state->port_clock / 2 != 135000))
return NULL;
crtc_state->dpll_hw_state.spll = SPLL_PLL_ENABLE | SPLL_FREQ_1350MHz |
@@ -1616,7 +1616,7 @@ static int skl_ddi_wrpll_get_freq(struct drm_i915_private *i915,
dco_freq += ((pll_state->cfgcr1 & DPLL_CFGCR1_DCO_FRACTION_MASK) >> 9) *
ref_clock / 0x8000;
- if (WARN_ON(p0 == 0 || p1 == 0 || p2 == 0))
+ if (drm_WARN_ON(&i915->drm, p0 == 0 || p1 == 0 || p2 == 0))
return 0;
return dco_freq / (p0 * p1 * p2 * 5);
@@ -2074,7 +2074,7 @@ bxt_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state,
clk_div->p1 = best_clock.p1;
clk_div->p2 = best_clock.p2;
- WARN_ON(best_clock.m1 != 2);
+ drm_WARN_ON(&i915->drm, best_clock.m1 != 2);
clk_div->n = best_clock.n;
clk_div->m2_int = best_clock.m2 >> 22;
clk_div->m2_frac = best_clock.m2 & ((1 << 22) - 1);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 08/18] drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Chris Wilson, Ville Syrjälä,
Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_frontbuffer.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
index 6cb02c912acc..2979ed2588eb 100644
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@ -302,12 +302,14 @@ void intel_frontbuffer_track(struct intel_frontbuffer *old,
BITS_PER_TYPE(atomic_t));
if (old) {
- WARN_ON(!(atomic_read(&old->bits) & frontbuffer_bits));
+ drm_WARN_ON(old->obj->base.dev,
+ !(atomic_read(&old->bits) & frontbuffer_bits));
atomic_andnot(frontbuffer_bits, &old->bits);
}
if (new) {
- WARN_ON(atomic_read(&new->bits) & frontbuffer_bits);
+ drm_WARN_ON(new->obj->base.dev,
+ atomic_read(&new->bits) & frontbuffer_bits);
atomic_or(frontbuffer_bits, &new->bits);
}
}
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 08/18] drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Chris Wilson, Ville Syrjälä,
Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_frontbuffer.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
index 6cb02c912acc..2979ed2588eb 100644
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@ -302,12 +302,14 @@ void intel_frontbuffer_track(struct intel_frontbuffer *old,
BITS_PER_TYPE(atomic_t));
if (old) {
- WARN_ON(!(atomic_read(&old->bits) & frontbuffer_bits));
+ drm_WARN_ON(old->obj->base.dev,
+ !(atomic_read(&old->bits) & frontbuffer_bits));
atomic_andnot(frontbuffer_bits, &old->bits);
}
if (new) {
- WARN_ON(atomic_read(&new->bits) & frontbuffer_bits);
+ drm_WARN_ON(new->obj->base.dev,
+ atomic_read(&new->bits) & frontbuffer_bits);
atomic_or(frontbuffer_bits, &new->bits);
}
}
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 09/18] drm/i915/display/global_state: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Imre Deak, Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* calls.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_global_state.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_global_state.c b/drivers/gpu/drm/i915/display/intel_global_state.c
index a0cc894c3868..ede39c2f2e1d 100644
--- a/drivers/gpu/drm/i915/display/intel_global_state.c
+++ b/drivers/gpu/drm/i915/display/intel_global_state.c
@@ -64,7 +64,7 @@ static void assert_global_state_read_locked(struct intel_atomic_state *state)
return;
}
- WARN(1, "Global state not read locked\n");
+ drm_WARN(&dev_priv->drm, 1, "Global state not read locked\n");
}
struct intel_global_state *
@@ -147,7 +147,7 @@ void intel_atomic_swap_global_state(struct intel_atomic_state *state)
for_each_oldnew_global_obj_in_state(state, obj, old_obj_state,
new_obj_state, i) {
- WARN_ON(obj->state != old_obj_state);
+ drm_WARN_ON(&dev_priv->drm, obj->state != old_obj_state);
/*
* If the new state wasn't modified (and properly
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 09/18] drm/i915/display/global_state: Prefer drm_WARN* over WARN*
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Imre Deak, Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* calls.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_global_state.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_global_state.c b/drivers/gpu/drm/i915/display/intel_global_state.c
index a0cc894c3868..ede39c2f2e1d 100644
--- a/drivers/gpu/drm/i915/display/intel_global_state.c
+++ b/drivers/gpu/drm/i915/display/intel_global_state.c
@@ -64,7 +64,7 @@ static void assert_global_state_read_locked(struct intel_atomic_state *state)
return;
}
- WARN(1, "Global state not read locked\n");
+ drm_WARN(&dev_priv->drm, 1, "Global state not read locked\n");
}
struct intel_global_state *
@@ -147,7 +147,7 @@ void intel_atomic_swap_global_state(struct intel_atomic_state *state)
for_each_oldnew_global_obj_in_state(state, obj, old_obj_state,
new_obj_state, i) {
- WARN_ON(obj->state != old_obj_state);
+ drm_WARN_ON(&dev_priv->drm, obj->state != old_obj_state);
/*
* If the new state wasn't modified (and properly
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 10/18] drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Chris Wilson, Matthew Auld,
Tvrtko Ursulin, Ville Syrjälä,
Maarten Lankhorst, Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_overlay.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index 6e1d66323223..66711e62fa71 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -281,7 +281,7 @@ static void intel_overlay_flip_prepare(struct intel_overlay *overlay,
enum pipe pipe = overlay->crtc->pipe;
struct intel_frontbuffer *from = NULL, *to = NULL;
- WARN_ON(overlay->old_vma);
+ drm_WARN_ON(&overlay->i915->drm, overlay->old_vma);
if (overlay->vma)
from = intel_frontbuffer_get(overlay->vma->obj);
@@ -350,7 +350,7 @@ static void intel_overlay_release_old_vma(struct intel_overlay *overlay)
struct i915_vma *vma;
vma = fetch_and_zero(&overlay->old_vma);
- if (WARN_ON(!vma))
+ if (drm_WARN_ON(&overlay->i915->drm, !vma))
return;
intel_frontbuffer_flip_complete(overlay->i915,
@@ -396,7 +396,7 @@ static int intel_overlay_off(struct intel_overlay *overlay)
struct i915_request *rq;
u32 *cs, flip_addr = overlay->flip_addr;
- WARN_ON(!overlay->active);
+ drm_WARN_ON(&overlay->i915->drm, !overlay->active);
/* According to intel docs the overlay hw may hang (when switching
* off) without loading the filter coeffs. It is however unclear whether
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 10/18] drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Chris Wilson, Matthew Auld,
Tvrtko Ursulin, Ville Syrjälä,
Maarten Lankhorst, Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_overlay.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index 6e1d66323223..66711e62fa71 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -281,7 +281,7 @@ static void intel_overlay_flip_prepare(struct intel_overlay *overlay,
enum pipe pipe = overlay->crtc->pipe;
struct intel_frontbuffer *from = NULL, *to = NULL;
- WARN_ON(overlay->old_vma);
+ drm_WARN_ON(&overlay->i915->drm, overlay->old_vma);
if (overlay->vma)
from = intel_frontbuffer_get(overlay->vma->obj);
@@ -350,7 +350,7 @@ static void intel_overlay_release_old_vma(struct intel_overlay *overlay)
struct i915_vma *vma;
vma = fetch_and_zero(&overlay->old_vma);
- if (WARN_ON(!vma))
+ if (drm_WARN_ON(&overlay->i915->drm, !vma))
return;
intel_frontbuffer_flip_complete(overlay->i915,
@@ -396,7 +396,7 @@ static int intel_overlay_off(struct intel_overlay *overlay)
struct i915_request *rq;
u32 *cs, flip_addr = overlay->flip_addr;
- WARN_ON(!overlay->active);
+ drm_WARN_ON(&overlay->i915->drm, !overlay->active);
/* According to intel docs the overlay hw may hang (when switching
* off) without loading the filter coeffs. It is however unclear whether
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 11/18] drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Imre Deak
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* calls.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index e6306cbb7a3a..477465a9af90 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -431,7 +431,7 @@ static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
else
BUF_PRINT("(%02X)", cmd);
- WARN_ON(pos >= sizeof(buffer) - 1);
+ drm_WARN_ON(intel_sdvo->base.base.dev, pos >= sizeof(buffer) - 1);
#undef BUF_PRINT
DRM_DEBUG_KMS("%s: W: %02X %s\n", SDVO_NAME(intel_sdvo), cmd, buffer);
@@ -597,7 +597,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
BUF_PRINT(" %02X", ((u8 *)response)[i]);
}
- WARN_ON(pos >= sizeof(buffer) - 1);
+ drm_WARN_ON(intel_sdvo->base.base.dev, pos >= sizeof(buffer) - 1);
#undef BUF_PRINT
DRM_DEBUG_KMS("%s: R: %s\n", SDVO_NAME(intel_sdvo), buffer);
@@ -1106,7 +1106,7 @@ static bool intel_sdvo_compute_avi_infoframe(struct intel_sdvo *intel_sdvo,
HDMI_QUANTIZATION_RANGE_FULL);
ret = hdmi_avi_infoframe_check(frame);
- if (WARN_ON(ret))
+ if (drm_WARN_ON(intel_sdvo->base.base.dev, ret))
return false;
return true;
@@ -1123,11 +1123,12 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_AVI)) == 0)
return true;
- if (WARN_ON(frame->any.type != HDMI_INFOFRAME_TYPE_AVI))
+ if (drm_WARN_ON(intel_sdvo->base.base.dev,
+ frame->any.type != HDMI_INFOFRAME_TYPE_AVI))
return false;
len = hdmi_infoframe_pack_only(frame, sdvo_data, sizeof(sdvo_data));
- if (WARN_ON(len < 0))
+ if (drm_WARN_ON(intel_sdvo->base.base.dev, len < 0))
return false;
return intel_sdvo_write_infoframe(intel_sdvo, SDVO_HBUF_INDEX_AVI_IF,
@@ -1257,7 +1258,8 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_state *pipe_config)
clock->m1 = 12;
clock->m2 = 8;
} else {
- WARN(1, "SDVO TV clock out of range: %i\n", dotclock);
+ drm_WARN(pipe_config->uapi.crtc->dev, 1,
+ "SDVO TV clock out of range: %i\n", dotclock);
}
pipe_config->clock_set = true;
@@ -2294,7 +2296,7 @@ intel_sdvo_connector_atomic_get_property(struct drm_connector *connector,
return 0;
}
- WARN_ON(1);
+ drm_WARN_ON(connector->dev, 1);
*val = 0;
} else if (property == intel_sdvo_connector->top ||
property == intel_sdvo_connector->bottom)
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 11/18] drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Imre Deak
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* calls.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_sdvo.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index e6306cbb7a3a..477465a9af90 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -431,7 +431,7 @@ static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
else
BUF_PRINT("(%02X)", cmd);
- WARN_ON(pos >= sizeof(buffer) - 1);
+ drm_WARN_ON(intel_sdvo->base.base.dev, pos >= sizeof(buffer) - 1);
#undef BUF_PRINT
DRM_DEBUG_KMS("%s: W: %02X %s\n", SDVO_NAME(intel_sdvo), cmd, buffer);
@@ -597,7 +597,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
BUF_PRINT(" %02X", ((u8 *)response)[i]);
}
- WARN_ON(pos >= sizeof(buffer) - 1);
+ drm_WARN_ON(intel_sdvo->base.base.dev, pos >= sizeof(buffer) - 1);
#undef BUF_PRINT
DRM_DEBUG_KMS("%s: R: %s\n", SDVO_NAME(intel_sdvo), buffer);
@@ -1106,7 +1106,7 @@ static bool intel_sdvo_compute_avi_infoframe(struct intel_sdvo *intel_sdvo,
HDMI_QUANTIZATION_RANGE_FULL);
ret = hdmi_avi_infoframe_check(frame);
- if (WARN_ON(ret))
+ if (drm_WARN_ON(intel_sdvo->base.base.dev, ret))
return false;
return true;
@@ -1123,11 +1123,12 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_AVI)) == 0)
return true;
- if (WARN_ON(frame->any.type != HDMI_INFOFRAME_TYPE_AVI))
+ if (drm_WARN_ON(intel_sdvo->base.base.dev,
+ frame->any.type != HDMI_INFOFRAME_TYPE_AVI))
return false;
len = hdmi_infoframe_pack_only(frame, sdvo_data, sizeof(sdvo_data));
- if (WARN_ON(len < 0))
+ if (drm_WARN_ON(intel_sdvo->base.base.dev, len < 0))
return false;
return intel_sdvo_write_infoframe(intel_sdvo, SDVO_HBUF_INDEX_AVI_IF,
@@ -1257,7 +1258,8 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_state *pipe_config)
clock->m1 = 12;
clock->m2 = 8;
} else {
- WARN(1, "SDVO TV clock out of range: %i\n", dotclock);
+ drm_WARN(pipe_config->uapi.crtc->dev, 1,
+ "SDVO TV clock out of range: %i\n", dotclock);
}
pipe_config->clock_set = true;
@@ -2294,7 +2296,7 @@ intel_sdvo_connector_atomic_get_property(struct drm_connector *connector,
return 0;
}
- WARN_ON(1);
+ drm_WARN_ON(connector->dev, 1);
*val = 0;
} else if (property == intel_sdvo_connector->top ||
property == intel_sdvo_connector->bottom)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 12/18] drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Imre Deak,
José Roberto de Souza, Lucas De Marchi,
Ville Syrjälä,
Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Conversion is done with below sementic patch:
@@
identifier func, T;
@@
func(struct intel_digital_port *T,...) {
<+...
-WARN_ON(
+drm_WARN_ON(T->base.base.dev,
...)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_tc.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 9b850c11aa78..7d4172498320 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -295,12 +295,12 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port,
}
if (!icl_tc_phy_set_safe_mode(dig_port, false) &&
- !WARN_ON(dig_port->tc_legacy_port))
+ !drm_WARN_ON(dig_port->base.base.dev, dig_port->tc_legacy_port))
goto out_set_tbt_alt_mode;
max_lanes = intel_tc_port_fia_max_lane_count(dig_port);
if (dig_port->tc_legacy_port) {
- WARN_ON(max_lanes != 4);
+ drm_WARN_ON(dig_port->base.base.dev, max_lanes != 4);
dig_port->tc_mode = TC_PORT_LEGACY;
return;
@@ -381,14 +381,16 @@ intel_tc_port_get_current_mode(struct intel_digital_port *dig_port)
bool in_safe_mode = icl_tc_phy_is_in_safe_mode(dig_port);
enum tc_port_mode mode;
- if (in_safe_mode || WARN_ON(!icl_tc_phy_status_complete(dig_port)))
+ if (in_safe_mode || drm_WARN_ON(dig_port->base.base.dev,
+ !icl_tc_phy_status_complete(dig_port)))
return TC_PORT_TBT_ALT;
mode = dig_port->tc_legacy_port ? TC_PORT_LEGACY : TC_PORT_DP_ALT;
if (live_status_mask) {
enum tc_port_mode live_mode = fls(live_status_mask) - 1;
- if (!WARN_ON(live_mode == TC_PORT_TBT_ALT))
+ if (!drm_WARN_ON(dig_port->base.base.dev,
+ live_mode == TC_PORT_TBT_ALT))
mode = live_mode;
}
@@ -432,7 +434,7 @@ static void
intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port,
int refcount)
{
- WARN_ON(dig_port->tc_link_refcount);
+ drm_WARN_ON(dig_port->base.base.dev, dig_port->tc_link_refcount);
dig_port->tc_link_refcount = refcount;
}
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 12/18] drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Imre Deak,
José Roberto de Souza, Lucas De Marchi,
Ville Syrjälä,
Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Conversion is done with below sementic patch:
@@
identifier func, T;
@@
func(struct intel_digital_port *T,...) {
<+...
-WARN_ON(
+drm_WARN_ON(T->base.base.dev,
...)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/intel_tc.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 9b850c11aa78..7d4172498320 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -295,12 +295,12 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port,
}
if (!icl_tc_phy_set_safe_mode(dig_port, false) &&
- !WARN_ON(dig_port->tc_legacy_port))
+ !drm_WARN_ON(dig_port->base.base.dev, dig_port->tc_legacy_port))
goto out_set_tbt_alt_mode;
max_lanes = intel_tc_port_fia_max_lane_count(dig_port);
if (dig_port->tc_legacy_port) {
- WARN_ON(max_lanes != 4);
+ drm_WARN_ON(dig_port->base.base.dev, max_lanes != 4);
dig_port->tc_mode = TC_PORT_LEGACY;
return;
@@ -381,14 +381,16 @@ intel_tc_port_get_current_mode(struct intel_digital_port *dig_port)
bool in_safe_mode = icl_tc_phy_is_in_safe_mode(dig_port);
enum tc_port_mode mode;
- if (in_safe_mode || WARN_ON(!icl_tc_phy_status_complete(dig_port)))
+ if (in_safe_mode || drm_WARN_ON(dig_port->base.base.dev,
+ !icl_tc_phy_status_complete(dig_port)))
return TC_PORT_TBT_ALT;
mode = dig_port->tc_legacy_port ? TC_PORT_LEGACY : TC_PORT_DP_ALT;
if (live_status_mask) {
enum tc_port_mode live_mode = fls(live_status_mask) - 1;
- if (!WARN_ON(live_mode == TC_PORT_TBT_ALT))
+ if (!drm_WARN_ON(dig_port->base.base.dev,
+ live_mode == TC_PORT_TBT_ALT))
mode = live_mode;
}
@@ -432,7 +434,7 @@ static void
intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port,
int refcount)
{
- WARN_ON(dig_port->tc_link_refcount);
+ drm_WARN_ON(dig_port->base.base.dev, dig_port->tc_link_refcount);
dig_port->tc_link_refcount = refcount;
}
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 13/18] drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Hans de Goede, Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 4e18d4627065..46e2895d916d 100644
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -864,7 +864,7 @@ static void bxt_dsi_enable(struct intel_atomic_state *state,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state)
{
- WARN_ON(crtc_state->has_pch_encoder);
+ drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
intel_crtc_vblank_on(crtc_state);
}
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 13/18] drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Hans de Goede, Pankaj Bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 4e18d4627065..46e2895d916d 100644
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -864,7 +864,7 @@ static void bxt_dsi_enable(struct intel_atomic_state *state,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state)
{
- WARN_ON(crtc_state->has_pch_encoder);
+ drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
intel_crtc_vblank_on(crtc_state);
}
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 14/18] drm/i915/gem: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Chris Wilson, Matthew Auld,
Tvrtko Ursulin, Mika Kuoppala, Jon Bloomfield, Abdiel Janulgue,
Sam Ravnborg
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* at places where struct drm_device pointer
can be extracted.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 ++-
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 9d11bad74e9a..d910eb9b77ef 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1440,7 +1440,7 @@ eb_relocate_entry(struct i915_execbuffer *eb,
err = i915_vma_bind(target->vma,
target->vma->obj->cache_level,
PIN_GLOBAL, NULL);
- if (WARN_ONCE(err,
+ if (drm_WARN_ONCE(&i915->drm, err,
"Unexpected failure to bind target VMA!"))
return err;
}
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
index 7fe9831aa9ba..4c1c7232b024 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@ -27,7 +27,8 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
void *dst;
int i;
- if (WARN_ON(i915_gem_object_needs_bit17_swizzle(obj)))
+ if (drm_WARN_ON(obj->base.dev,
+ i915_gem_object_needs_bit17_swizzle(obj)))
return -EINVAL;
/*
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 7ffd7afeb7a5..8b0708708671 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -235,7 +235,7 @@ i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj,
if (flags & I915_USERPTR_UNSYNCHRONIZED)
return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
- if (WARN_ON(obj->userptr.mm == NULL))
+ if (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL))
return -EINVAL;
mn = i915_mmu_notifier_find(obj->userptr.mm);
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 14/18] drm/i915/gem: Prefer drm_WARN* over WARN*
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Chris Wilson, Matthew Auld,
Tvrtko Ursulin, Mika Kuoppala, Jon Bloomfield, Abdiel Janulgue,
Sam Ravnborg
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN* at places where struct drm_device pointer
can be extracted.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 ++-
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 9d11bad74e9a..d910eb9b77ef 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1440,7 +1440,7 @@ eb_relocate_entry(struct i915_execbuffer *eb,
err = i915_vma_bind(target->vma,
target->vma->obj->cache_level,
PIN_GLOBAL, NULL);
- if (WARN_ONCE(err,
+ if (drm_WARN_ONCE(&i915->drm, err,
"Unexpected failure to bind target VMA!"))
return err;
}
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
index 7fe9831aa9ba..4c1c7232b024 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
@@ -27,7 +27,8 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
void *dst;
int i;
- if (WARN_ON(i915_gem_object_needs_bit17_swizzle(obj)))
+ if (drm_WARN_ON(obj->base.dev,
+ i915_gem_object_needs_bit17_swizzle(obj)))
return -EINVAL;
/*
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 7ffd7afeb7a5..8b0708708671 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -235,7 +235,7 @@ i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj,
if (flags & I915_USERPTR_UNSYNCHRONIZED)
return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
- if (WARN_ON(obj->userptr.mm == NULL))
+ if (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL))
return -EINVAL;
mn = i915_mmu_notifier_find(obj->userptr.mm);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e9ee4daa9320..be33cab6403d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1647,7 +1647,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
#define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0)
/* Only valid when HAS_DISPLAY() is true */
-#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
+#define INTEL_DISPLAY_ENABLED(dev_priv) \
+ (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
static inline bool intel_vtd_active(void)
{
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e9ee4daa9320..be33cab6403d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1647,7 +1647,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
#define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0)
/* Only valid when HAS_DISPLAY() is true */
-#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
+#define INTEL_DISPLAY_ENABLED(dev_priv) \
+ (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
static inline bool intel_vtd_active(void)
{
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 16/18] drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/i915_pmu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 2c062534eac1..1d7fffdd938a 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -458,7 +458,10 @@ static void engine_event_destroy(struct perf_event *event)
static void i915_pmu_event_destroy(struct perf_event *event)
{
- WARN_ON(event->parent);
+ struct drm_i915_private *i915 =
+ container_of(event->pmu, typeof(*i915), pmu.base);
+
+ drm_WARN_ON(&i915->drm, event->parent);
if (is_engine_event(event))
engine_event_destroy(event);
@@ -1085,8 +1088,10 @@ static int i915_pmu_register_cpuhp_state(struct i915_pmu *pmu)
static void i915_pmu_unregister_cpuhp_state(struct i915_pmu *pmu)
{
- WARN_ON(pmu->cpuhp.slot == CPUHP_INVALID);
- WARN_ON(cpuhp_state_remove_instance(pmu->cpuhp.slot, &pmu->cpuhp.node));
+ struct drm_i915_private *i915 = container_of(pmu, typeof(*i915), pmu);
+
+ drm_WARN_ON(&i915->drm, pmu->cpuhp.slot == CPUHP_INVALID);
+ drm_WARN_ON(&i915->drm, cpuhp_state_remove_instance(pmu->cpuhp.slot, &pmu->cpuhp.node));
cpuhp_remove_multi_state(pmu->cpuhp.slot);
pmu->cpuhp.slot = CPUHP_INVALID;
}
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 16/18] drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/i915_pmu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 2c062534eac1..1d7fffdd938a 100644
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -458,7 +458,10 @@ static void engine_event_destroy(struct perf_event *event)
static void i915_pmu_event_destroy(struct perf_event *event)
{
- WARN_ON(event->parent);
+ struct drm_i915_private *i915 =
+ container_of(event->pmu, typeof(*i915), pmu.base);
+
+ drm_WARN_ON(&i915->drm, event->parent);
if (is_engine_event(event))
engine_event_destroy(event);
@@ -1085,8 +1088,10 @@ static int i915_pmu_register_cpuhp_state(struct i915_pmu *pmu)
static void i915_pmu_unregister_cpuhp_state(struct i915_pmu *pmu)
{
- WARN_ON(pmu->cpuhp.slot == CPUHP_INVALID);
- WARN_ON(cpuhp_state_remove_instance(pmu->cpuhp.slot, &pmu->cpuhp.node));
+ struct drm_i915_private *i915 = container_of(pmu, typeof(*i915), pmu);
+
+ drm_WARN_ON(&i915->drm, pmu->cpuhp.slot == CPUHP_INVALID);
+ drm_WARN_ON(&i915->drm, cpuhp_state_remove_instance(pmu->cpuhp.slot, &pmu->cpuhp.node));
cpuhp_remove_multi_state(pmu->cpuhp.slot);
pmu->cpuhp.slot = CPUHP_INVALID;
}
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 17/18] drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:27 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Conversion is done with below sementic patch:
@@
identifier func, T;
@@
func(...) {
...
struct intel_crtc *T = ...;
<+...
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
...+>
}
@@
identifier func, T;
@@
func(struct intel_crtc_state *T,...) {
<+...
-WARN_ON(
+drm_WARN_ON(T->uapi.crtc->dev,
...)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 57 ++++++++++++++++++---------------
1 file changed, 32 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 8375054ba27d..b2d22fdaf3db 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1464,8 +1464,8 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state)
max(optimal->wm.plane[plane_id],
active->wm.plane[plane_id]);
- WARN_ON(intermediate->wm.plane[plane_id] >
- g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL));
+ drm_WARN_ON(crtc->base.dev, intermediate->wm.plane[plane_id] >
+ g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL));
}
intermediate->sr.plane = max(optimal->sr.plane,
@@ -1482,21 +1482,25 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state)
intermediate->hpll.fbc = max(optimal->hpll.fbc,
active->hpll.fbc);
- WARN_ON((intermediate->sr.plane >
- g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) ||
- intermediate->sr.cursor >
- g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) &&
- intermediate->cxsr);
- WARN_ON((intermediate->sr.plane >
- g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) ||
- intermediate->sr.cursor >
- g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) &&
- intermediate->hpll_en);
-
- WARN_ON(intermediate->sr.fbc > g4x_fbc_fifo_size(1) &&
- intermediate->fbc_en && intermediate->cxsr);
- WARN_ON(intermediate->hpll.fbc > g4x_fbc_fifo_size(2) &&
- intermediate->fbc_en && intermediate->hpll_en);
+ drm_WARN_ON(crtc->base.dev,
+ (intermediate->sr.plane >
+ g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) ||
+ intermediate->sr.cursor >
+ g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) &&
+ intermediate->cxsr);
+ drm_WARN_ON(crtc->base.dev,
+ (intermediate->sr.plane >
+ g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) ||
+ intermediate->sr.cursor >
+ g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) &&
+ intermediate->hpll_en);
+
+ drm_WARN_ON(crtc->base.dev,
+ intermediate->sr.fbc > g4x_fbc_fifo_size(1) &&
+ intermediate->fbc_en && intermediate->cxsr);
+ drm_WARN_ON(crtc->base.dev,
+ intermediate->hpll.fbc > g4x_fbc_fifo_size(2) &&
+ intermediate->fbc_en && intermediate->hpll_en);
out:
/*
@@ -1748,11 +1752,11 @@ static int vlv_compute_fifo(struct intel_crtc_state *crtc_state)
fifo_left -= plane_extra;
}
- WARN_ON(active_planes != 0 && fifo_left != 0);
+ drm_WARN_ON(crtc->base.dev, active_planes != 0 && fifo_left != 0);
/* give it all to the first plane if none are active */
if (active_planes == 0) {
- WARN_ON(fifo_left != fifo_size);
+ drm_WARN_ON(crtc->base.dev, fifo_left != fifo_size);
fifo_state->plane[PLANE_PRIMARY] = fifo_left;
}
@@ -4154,7 +4158,8 @@ skl_plane_downscale_amount(const struct intel_crtc_state *crtc_state,
uint_fixed_16_16_t fp_w_ratio, fp_h_ratio;
uint_fixed_16_16_t downscale_h, downscale_w;
- if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
+ if (drm_WARN_ON(crtc_state->uapi.crtc->dev,
+ !intel_wm_plane_visible(crtc_state, plane_state)))
return u32_to_fixed16(0);
/*
@@ -4815,7 +4820,7 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
pixel_rate = crtc_state->pixel_rate;
- if (WARN_ON(pixel_rate == 0))
+ if (drm_WARN_ON(crtc_state->uapi.crtc->dev, pixel_rate == 0))
return u32_to_fixed16(0);
crtc_htotal = crtc_state->hw.adjusted_mode.crtc_htotal;
@@ -4832,7 +4837,8 @@ skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *crtc_state,
uint_fixed_16_16_t downscale_amount;
/* Shouldn't reach here on disabled planes... */
- if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
+ if (drm_WARN_ON(crtc_state->uapi.crtc->dev,
+ !intel_wm_plane_visible(crtc_state, plane_state)))
return 0;
/*
@@ -5261,9 +5267,10 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,
const struct drm_framebuffer *fb = plane_state->hw.fb;
enum plane_id y_plane_id = plane_state->planar_linked_plane->id;
- WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state));
- WARN_ON(!fb->format->is_yuv ||
- fb->format->num_planes == 1);
+ drm_WARN_ON(crtc_state->uapi.crtc->dev,
+ !intel_wm_plane_visible(crtc_state, plane_state));
+ drm_WARN_ON(crtc_state->uapi.crtc->dev, !fb->format->is_yuv ||
+ fb->format->num_planes == 1);
ret = skl_build_plane_wm_single(crtc_state, plane_state,
y_plane_id, 0);
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 17/18] drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 11:27 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:27 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN_ON over WARN_ON.
Conversion is done with below sementic patch:
@@
identifier func, T;
@@
func(...) {
...
struct intel_crtc *T = ...;
<+...
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
...+>
}
@@
identifier func, T;
@@
func(struct intel_crtc_state *T,...) {
<+...
-WARN_ON(
+drm_WARN_ON(T->uapi.crtc->dev,
...)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 57 ++++++++++++++++++---------------
1 file changed, 32 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 8375054ba27d..b2d22fdaf3db 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1464,8 +1464,8 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state)
max(optimal->wm.plane[plane_id],
active->wm.plane[plane_id]);
- WARN_ON(intermediate->wm.plane[plane_id] >
- g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL));
+ drm_WARN_ON(crtc->base.dev, intermediate->wm.plane[plane_id] >
+ g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL));
}
intermediate->sr.plane = max(optimal->sr.plane,
@@ -1482,21 +1482,25 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state)
intermediate->hpll.fbc = max(optimal->hpll.fbc,
active->hpll.fbc);
- WARN_ON((intermediate->sr.plane >
- g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) ||
- intermediate->sr.cursor >
- g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) &&
- intermediate->cxsr);
- WARN_ON((intermediate->sr.plane >
- g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) ||
- intermediate->sr.cursor >
- g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) &&
- intermediate->hpll_en);
-
- WARN_ON(intermediate->sr.fbc > g4x_fbc_fifo_size(1) &&
- intermediate->fbc_en && intermediate->cxsr);
- WARN_ON(intermediate->hpll.fbc > g4x_fbc_fifo_size(2) &&
- intermediate->fbc_en && intermediate->hpll_en);
+ drm_WARN_ON(crtc->base.dev,
+ (intermediate->sr.plane >
+ g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) ||
+ intermediate->sr.cursor >
+ g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) &&
+ intermediate->cxsr);
+ drm_WARN_ON(crtc->base.dev,
+ (intermediate->sr.plane >
+ g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) ||
+ intermediate->sr.cursor >
+ g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) &&
+ intermediate->hpll_en);
+
+ drm_WARN_ON(crtc->base.dev,
+ intermediate->sr.fbc > g4x_fbc_fifo_size(1) &&
+ intermediate->fbc_en && intermediate->cxsr);
+ drm_WARN_ON(crtc->base.dev,
+ intermediate->hpll.fbc > g4x_fbc_fifo_size(2) &&
+ intermediate->fbc_en && intermediate->hpll_en);
out:
/*
@@ -1748,11 +1752,11 @@ static int vlv_compute_fifo(struct intel_crtc_state *crtc_state)
fifo_left -= plane_extra;
}
- WARN_ON(active_planes != 0 && fifo_left != 0);
+ drm_WARN_ON(crtc->base.dev, active_planes != 0 && fifo_left != 0);
/* give it all to the first plane if none are active */
if (active_planes == 0) {
- WARN_ON(fifo_left != fifo_size);
+ drm_WARN_ON(crtc->base.dev, fifo_left != fifo_size);
fifo_state->plane[PLANE_PRIMARY] = fifo_left;
}
@@ -4154,7 +4158,8 @@ skl_plane_downscale_amount(const struct intel_crtc_state *crtc_state,
uint_fixed_16_16_t fp_w_ratio, fp_h_ratio;
uint_fixed_16_16_t downscale_h, downscale_w;
- if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
+ if (drm_WARN_ON(crtc_state->uapi.crtc->dev,
+ !intel_wm_plane_visible(crtc_state, plane_state)))
return u32_to_fixed16(0);
/*
@@ -4815,7 +4820,7 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
pixel_rate = crtc_state->pixel_rate;
- if (WARN_ON(pixel_rate == 0))
+ if (drm_WARN_ON(crtc_state->uapi.crtc->dev, pixel_rate == 0))
return u32_to_fixed16(0);
crtc_htotal = crtc_state->hw.adjusted_mode.crtc_htotal;
@@ -4832,7 +4837,8 @@ skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *crtc_state,
uint_fixed_16_16_t downscale_amount;
/* Shouldn't reach here on disabled planes... */
- if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
+ if (drm_WARN_ON(crtc_state->uapi.crtc->dev,
+ !intel_wm_plane_visible(crtc_state, plane_state)))
return 0;
/*
@@ -5261,9 +5267,10 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,
const struct drm_framebuffer *fb = plane_state->hw.fb;
enum plane_id y_plane_id = plane_state->planar_linked_plane->id;
- WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state));
- WARN_ON(!fb->format->is_yuv ||
- fb->format->num_planes == 1);
+ drm_WARN_ON(crtc_state->uapi.crtc->dev,
+ !intel_wm_plane_visible(crtc_state, plane_state));
+ drm_WARN_ON(crtc_state->uapi.crtc->dev, !fb->format->is_yuv ||
+ fb->format->num_planes == 1);
ret = skl_build_plane_wm_single(crtc_state, plane_state,
y_plane_id, 0);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [PATCH 18/18] drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-06 11:28 ` Pankaj Bharadiya
-1 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:28 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
Cc: pankaj.laxminarayan.bharadiya
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN*.
Conversion is done with below semantic patch:
@@
identifier func, T;
@@
func(struct intel_runtime_pm *T,...) {
+ struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, runtime_pm);
<+...
(
-WARN(
+drm_WARN(&i915->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&i915->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&i915->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/intel_runtime_pm.c | 39 ++++++++++++++++++-------
1 file changed, 28 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index ad719c9602af..31ccd0559c55 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -116,6 +116,9 @@ track_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm)
static void untrack_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm,
depot_stack_handle_t stack)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
unsigned long flags, n;
bool found = false;
@@ -134,9 +137,9 @@ static void untrack_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm,
}
spin_unlock_irqrestore(&rpm->debug.lock, flags);
- if (WARN(!found,
- "Unmatched wakeref (tracking %lu), count %u\n",
- rpm->debug.count, atomic_read(&rpm->wakeref_count))) {
+ if (drm_WARN(&i915->drm, !found,
+ "Unmatched wakeref (tracking %lu), count %u\n",
+ rpm->debug.count, atomic_read(&rpm->wakeref_count))) {
char *buf;
buf = kmalloc(PAGE_SIZE, GFP_NOWAIT | __GFP_NOWARN);
@@ -355,10 +358,14 @@ intel_runtime_pm_release(struct intel_runtime_pm *rpm, int wakelock)
static intel_wakeref_t __intel_runtime_pm_get(struct intel_runtime_pm *rpm,
bool wakelock)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
int ret;
ret = pm_runtime_get_sync(rpm->kdev);
- WARN_ONCE(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
+ drm_WARN_ONCE(&i915->drm, ret < 0,
+ "pm_runtime_get_sync() failed: %d\n", ret);
intel_runtime_pm_acquire(rpm, wakelock);
@@ -539,6 +546,9 @@ void intel_runtime_pm_put(struct intel_runtime_pm *rpm, intel_wakeref_t wref)
*/
void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
struct device *kdev = rpm->kdev;
/*
@@ -565,7 +575,8 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
pm_runtime_dont_use_autosuspend(kdev);
ret = pm_runtime_get_sync(kdev);
- WARN(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
+ drm_WARN(&i915->drm, ret < 0,
+ "pm_runtime_get_sync() failed: %d\n", ret);
} else {
pm_runtime_use_autosuspend(kdev);
}
@@ -580,11 +591,14 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
void intel_runtime_pm_disable(struct intel_runtime_pm *rpm)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
struct device *kdev = rpm->kdev;
/* Transfer rpm ownership back to core */
- WARN(pm_runtime_get_sync(kdev) < 0,
- "Failed to pass rpm ownership back to core\n");
+ drm_WARN(&i915->drm, pm_runtime_get_sync(kdev) < 0,
+ "Failed to pass rpm ownership back to core\n");
pm_runtime_dont_use_autosuspend(kdev);
@@ -594,12 +608,15 @@ void intel_runtime_pm_disable(struct intel_runtime_pm *rpm)
void intel_runtime_pm_driver_release(struct intel_runtime_pm *rpm)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
int count = atomic_read(&rpm->wakeref_count);
- WARN(count,
- "i915 raw-wakerefs=%d wakelocks=%d on cleanup\n",
- intel_rpm_raw_wakeref_count(count),
- intel_rpm_wakelock_count(count));
+ drm_WARN(&i915->drm, count,
+ "i915 raw-wakerefs=%d wakelocks=%d on cleanup\n",
+ intel_rpm_raw_wakeref_count(count),
+ intel_rpm_wakelock_count(count));
untrack_all_intel_runtime_pm_wakerefs(rpm);
}
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] [PATCH 18/18] drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
@ 2020-04-06 11:28 ` Pankaj Bharadiya
0 siblings, 0 replies; 69+ messages in thread
From: Pankaj Bharadiya @ 2020-04-06 11:28 UTC (permalink / raw)
To: jani.nikula, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
struct drm_device specific drm_WARN* macros include device information
in the backtrace, so we know what device the warnings originate from.
Prefer drm_WARN* over WARN*.
Conversion is done with below semantic patch:
@@
identifier func, T;
@@
func(struct intel_runtime_pm *T,...) {
+ struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, runtime_pm);
<+...
(
-WARN(
+drm_WARN(&i915->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&i915->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&i915->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&i915->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
---
drivers/gpu/drm/i915/intel_runtime_pm.c | 39 ++++++++++++++++++-------
1 file changed, 28 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index ad719c9602af..31ccd0559c55 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -116,6 +116,9 @@ track_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm)
static void untrack_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm,
depot_stack_handle_t stack)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
unsigned long flags, n;
bool found = false;
@@ -134,9 +137,9 @@ static void untrack_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm,
}
spin_unlock_irqrestore(&rpm->debug.lock, flags);
- if (WARN(!found,
- "Unmatched wakeref (tracking %lu), count %u\n",
- rpm->debug.count, atomic_read(&rpm->wakeref_count))) {
+ if (drm_WARN(&i915->drm, !found,
+ "Unmatched wakeref (tracking %lu), count %u\n",
+ rpm->debug.count, atomic_read(&rpm->wakeref_count))) {
char *buf;
buf = kmalloc(PAGE_SIZE, GFP_NOWAIT | __GFP_NOWARN);
@@ -355,10 +358,14 @@ intel_runtime_pm_release(struct intel_runtime_pm *rpm, int wakelock)
static intel_wakeref_t __intel_runtime_pm_get(struct intel_runtime_pm *rpm,
bool wakelock)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
int ret;
ret = pm_runtime_get_sync(rpm->kdev);
- WARN_ONCE(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
+ drm_WARN_ONCE(&i915->drm, ret < 0,
+ "pm_runtime_get_sync() failed: %d\n", ret);
intel_runtime_pm_acquire(rpm, wakelock);
@@ -539,6 +546,9 @@ void intel_runtime_pm_put(struct intel_runtime_pm *rpm, intel_wakeref_t wref)
*/
void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
struct device *kdev = rpm->kdev;
/*
@@ -565,7 +575,8 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
pm_runtime_dont_use_autosuspend(kdev);
ret = pm_runtime_get_sync(kdev);
- WARN(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
+ drm_WARN(&i915->drm, ret < 0,
+ "pm_runtime_get_sync() failed: %d\n", ret);
} else {
pm_runtime_use_autosuspend(kdev);
}
@@ -580,11 +591,14 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
void intel_runtime_pm_disable(struct intel_runtime_pm *rpm)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
struct device *kdev = rpm->kdev;
/* Transfer rpm ownership back to core */
- WARN(pm_runtime_get_sync(kdev) < 0,
- "Failed to pass rpm ownership back to core\n");
+ drm_WARN(&i915->drm, pm_runtime_get_sync(kdev) < 0,
+ "Failed to pass rpm ownership back to core\n");
pm_runtime_dont_use_autosuspend(kdev);
@@ -594,12 +608,15 @@ void intel_runtime_pm_disable(struct intel_runtime_pm *rpm)
void intel_runtime_pm_driver_release(struct intel_runtime_pm *rpm)
{
+ struct drm_i915_private *i915 = container_of(rpm,
+ struct drm_i915_private,
+ runtime_pm);
int count = atomic_read(&rpm->wakeref_count);
- WARN(count,
- "i915 raw-wakerefs=%d wakelocks=%d on cleanup\n",
- intel_rpm_raw_wakeref_count(count),
- intel_rpm_wakelock_count(count));
+ drm_WARN(&i915->drm, count,
+ "i915 raw-wakerefs=%d wakelocks=%d on cleanup\n",
+ intel_rpm_raw_wakeref_count(count),
+ intel_rpm_wakelock_count(count));
untrack_all_intel_runtime_pm_wakerefs(rpm);
}
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
` (18 preceding siblings ...)
(?)
@ 2020-04-06 11:59 ` Patchwork
-1 siblings, 0 replies; 69+ messages in thread
From: Patchwork @ 2020-04-06 11:59 UTC (permalink / raw)
To: Pankaj Bharadiya; +Cc: intel-gfx
== Series Details ==
Series: Prefer drm_WARN* over WARN*
URL : https://patchwork.freedesktop.org/series/75543/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
2b3269120530 drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
ce36d1d4c808 drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON
9db54cf5c0c1 drm/i915/display/ddi: Prefer drm_WARN* over WARN*
cbddf2425b98 drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
0aae019835f6 drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
-:18: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#18:
+ struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, power_domains);
total: 0 errors, 1 warnings, 0 checks, 71 lines checked
462c17ba380f drm/i915/display/dp: Prefer drm_WARN* over WARN*
3a60829da48b drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON
9343391f6779 drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON
31d144a0fd99 drm/i915/display/global_state: Prefer drm_WARN* over WARN*
e61a3429efb8 drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON
a17137b9ca74 drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
ccea1b50c254 drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
63fc326a1fca drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
a09caf119a41 drm/i915/gem: Prefer drm_WARN* over WARN*
-:24: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#24: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1444:
+ if (drm_WARN_ONCE(&i915->drm, err,
"Unexpected failure to bind target VMA!"))
-:50: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!obj->userptr.mm"
#50: FILE: drivers/gpu/drm/i915/gem/i915_gem_userptr.c:238:
+ if (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL))
total: 0 errors, 0 warnings, 2 checks, 25 lines checked
d9387cef2125 drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
-:22: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dev_priv' - possible side-effects?
#22: FILE: drivers/gpu/drm/i915/i915_drv.h:1650:
+#define INTEL_DISPLAY_ENABLED(dev_priv) \
+ (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
-:22: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'dev_priv' may be better as '(dev_priv)' to avoid precedence issues
#22: FILE: drivers/gpu/drm/i915/i915_drv.h:1650:
+#define INTEL_DISPLAY_ENABLED(dev_priv) \
+ (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
-:23: WARNING:LONG_LINE: line over 100 characters
#23: FILE: drivers/gpu/drm/i915/i915_drv.h:1651:
+ (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
total: 0 errors, 1 warnings, 2 checks, 9 lines checked
0af155c5b3f1 drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
db552aba6881 drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
4c4c2b16486b drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
-:17: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#17:
+ struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, runtime_pm);
total: 0 errors, 1 warnings, 0 checks, 89 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
` (19 preceding siblings ...)
(?)
@ 2020-04-06 12:28 ` Patchwork
-1 siblings, 0 replies; 69+ messages in thread
From: Patchwork @ 2020-04-06 12:28 UTC (permalink / raw)
To: Pankaj Bharadiya; +Cc: intel-gfx
== Series Details ==
Series: Prefer drm_WARN* over WARN*
URL : https://patchwork.freedesktop.org/series/75543/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8259 -> Patchwork_17216
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_17216 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_17216, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17216/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_17216:
### IGT changes ###
#### Possible regressions ####
* igt@runner@aborted:
- fi-bsw-nick: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17216/fi-bsw-nick/igt@runner@aborted.html
Known issues
------------
Here are the changes found in Patchwork_17216 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@read_all_entries:
- fi-bsw-nick: [PASS][2] -> [INCOMPLETE][3] ([i915#1250])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8259/fi-bsw-nick/igt@debugfs_test@read_all_entries.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17216/fi-bsw-nick/igt@debugfs_test@read_all_entries.html
* igt@gem_exec_suspend@basic-s4-devices:
- fi-tgl-y: [PASS][4] -> [FAIL][5] ([i915#1158])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8259/fi-tgl-y/igt@gem_exec_suspend@basic-s4-devices.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17216/fi-tgl-y/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live@hangcheck:
- fi-icl-u2: [PASS][6] -> [INCOMPLETE][7] ([i915#1580])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8259/fi-icl-u2/igt@i915_selftest@live@hangcheck.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17216/fi-icl-u2/igt@i915_selftest@live@hangcheck.html
* igt@kms_chamelium@dp-edid-read:
- fi-cml-u2: [PASS][8] -> [FAIL][9] ([i915#976])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8259/fi-cml-u2/igt@kms_chamelium@dp-edid-read.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17216/fi-cml-u2/igt@kms_chamelium@dp-edid-read.html
* igt@kms_flip@basic-flip-vs-dpms:
- fi-skl-6770hq: [PASS][10] -> [SKIP][11] ([fdo#109271]) +24 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8259/fi-skl-6770hq/igt@kms_flip@basic-flip-vs-dpms.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17216/fi-skl-6770hq/igt@kms_flip@basic-flip-vs-dpms.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1158]: https://gitlab.freedesktop.org/drm/intel/issues/1158
[i915#1250]: https://gitlab.freedesktop.org/drm/intel/issues/1250
[i915#1580]: https://gitlab.freedesktop.org/drm/intel/issues/1580
[i915#976]: https://gitlab.freedesktop.org/drm/intel/issues/976
Participating hosts (53 -> 47)
------------------------------
Additional (1): fi-kbl-7560u
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8259 -> Patchwork_17216
CI-20190529: 20190529
CI_DRM_8259: 450fc86b62651336f9b5fde79c068df7b4c95aa4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5571: da79d5fa2ebed237f0561a54b4b63bae6f21503a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17216: 4c4c2b16486bf668030b6be413ec16ed24ff0ed9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
4c4c2b16486b drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
db552aba6881 drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
0af155c5b3f1 drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
d9387cef2125 drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
a09caf119a41 drm/i915/gem: Prefer drm_WARN* over WARN*
63fc326a1fca drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
ccea1b50c254 drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
a17137b9ca74 drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
e61a3429efb8 drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON
31d144a0fd99 drm/i915/display/global_state: Prefer drm_WARN* over WARN*
9343391f6779 drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON
3a60829da48b drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON
462c17ba380f drm/i915/display/dp: Prefer drm_WARN* over WARN*
0aae019835f6 drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
cbddf2425b98 drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
9db54cf5c0c1 drm/i915/display/ddi: Prefer drm_WARN* over WARN*
ce36d1d4c808 drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON
2b3269120530 drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17216/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Prefer drm_WARN* over WARN* (rev2)
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
` (20 preceding siblings ...)
(?)
@ 2020-04-06 14:47 ` Patchwork
-1 siblings, 0 replies; 69+ messages in thread
From: Patchwork @ 2020-04-06 14:47 UTC (permalink / raw)
To: Pankaj Bharadiya; +Cc: intel-gfx
== Series Details ==
Series: Prefer drm_WARN* over WARN* (rev2)
URL : https://patchwork.freedesktop.org/series/75543/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
fd886b340869 drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
5a021e68d20b drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON
04cffffd23fe drm/i915/display/ddi: Prefer drm_WARN* over WARN*
7154962ac9f6 drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
1703f9a2f458 drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
-:18: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#18:
+ struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, power_domains);
total: 0 errors, 1 warnings, 0 checks, 71 lines checked
81a6c4600fea drm/i915/display/dp: Prefer drm_WARN* over WARN*
22c03725bfb6 drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON
8ec55548bc42 drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON
e5fb265bcdfc drm/i915/display/global_state: Prefer drm_WARN* over WARN*
da0de795981b drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON
b9632947474b drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
0856fae10111 drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
cd2d48c2fb37 drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
ae80b0409828 drm/i915/gem: Prefer drm_WARN* over WARN*
-:24: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#24: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1444:
+ if (drm_WARN_ONCE(&i915->drm, err,
"Unexpected failure to bind target VMA!"))
-:50: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!obj->userptr.mm"
#50: FILE: drivers/gpu/drm/i915/gem/i915_gem_userptr.c:238:
+ if (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL))
total: 0 errors, 0 warnings, 2 checks, 25 lines checked
3b4763bebc0e drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
-:22: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dev_priv' - possible side-effects?
#22: FILE: drivers/gpu/drm/i915/i915_drv.h:1650:
+#define INTEL_DISPLAY_ENABLED(dev_priv) \
+ (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
-:22: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'dev_priv' may be better as '(dev_priv)' to avoid precedence issues
#22: FILE: drivers/gpu/drm/i915/i915_drv.h:1650:
+#define INTEL_DISPLAY_ENABLED(dev_priv) \
+ (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
-:23: WARNING:LONG_LINE: line over 100 characters
#23: FILE: drivers/gpu/drm/i915/i915_drv.h:1651:
+ (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
total: 0 errors, 1 warnings, 2 checks, 9 lines checked
7de0dff58893 drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
5597bb572e9b drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
0fd60ba24842 drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
-:17: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#17:
+ struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, runtime_pm);
total: 0 errors, 1 warnings, 0 checks, 89 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for Prefer drm_WARN* over WARN* (rev2)
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
` (21 preceding siblings ...)
(?)
@ 2020-04-06 15:14 ` Patchwork
-1 siblings, 0 replies; 69+ messages in thread
From: Patchwork @ 2020-04-06 15:14 UTC (permalink / raw)
To: Pankaj Bharadiya; +Cc: intel-gfx
== Series Details ==
Series: Prefer drm_WARN* over WARN* (rev2)
URL : https://patchwork.freedesktop.org/series/75543/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8260 -> Patchwork_17221
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/index.html
Known issues
------------
Here are the changes found in Patchwork_17221 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@requests:
- fi-icl-guc: [PASS][1] -> [INCOMPLETE][2] ([i915#1531] / [i915#1581])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/fi-icl-guc/igt@i915_selftest@live@requests.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/fi-icl-guc/igt@i915_selftest@live@requests.html
* igt@kms_flip@basic-flip-vs-dpms:
- fi-skl-6770hq: [PASS][3] -> [SKIP][4] ([fdo#109271]) +24 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/fi-skl-6770hq/igt@kms_flip@basic-flip-vs-dpms.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/fi-skl-6770hq/igt@kms_flip@basic-flip-vs-dpms.html
#### Possible fixes ####
* igt@gem_tiled_fence_blits@basic:
- fi-blb-e6850: [DMESG-WARN][5] ([i915#1612]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/fi-blb-e6850/igt@gem_tiled_fence_blits@basic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/fi-blb-e6850/igt@gem_tiled_fence_blits@basic.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1531]: https://gitlab.freedesktop.org/drm/intel/issues/1531
[i915#1581]: https://gitlab.freedesktop.org/drm/intel/issues/1581
[i915#1612]: https://gitlab.freedesktop.org/drm/intel/issues/1612
Participating hosts (53 -> 45)
------------------------------
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-bdw-gvtdvm fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8260 -> Patchwork_17221
CI-20190529: 20190529
CI_DRM_8260: fa5519e01f097b7f69259be38606ff5f1bc3cc6c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5572: 6c124b5c8501d900966c033ac86c3dc55c16a2da @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17221: 0fd60ba248422a0d5663452133f23baad2764749 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0fd60ba24842 drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
5597bb572e9b drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
7de0dff58893 drm/i915/pmu: Prefer drm_WARN_ON over WARN_ON
3b4763bebc0e drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
ae80b0409828 drm/i915/gem: Prefer drm_WARN* over WARN*
cd2d48c2fb37 drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
0856fae10111 drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
b9632947474b drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
da0de795981b drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON
e5fb265bcdfc drm/i915/display/global_state: Prefer drm_WARN* over WARN*
8ec55548bc42 drm/i915/display/frontbuffer: Prefer drm_WARN_ON over WARN_ON
22c03725bfb6 drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON
81a6c4600fea drm/i915/display/dp: Prefer drm_WARN* over WARN*
1703f9a2f458 drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
7154962ac9f6 drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
04cffffd23fe drm/i915/display/ddi: Prefer drm_WARN* over WARN*
5a021e68d20b drm/i915/display/atomic_plane: Prefer drm_WARN_ON over WARN_ON
fd886b340869 drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 01/18] drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
(?)
@ 2020-04-06 18:08 ` kbuild test robot
-1 siblings, 0 replies; 69+ messages in thread
From: kbuild test robot @ 2020-04-06 18:08 UTC (permalink / raw)
To: Pankaj Bharadiya
Cc: kbuild-all, Vandita Kulkarni, David Airlie, intel-gfx, dri-devel,
Chris Wilson, clang-built-linux, Uma Shankar, Rodrigo Vivi
[-- Attachment #1: Type: text/plain, Size: 2335 bytes --]
Hi Pankaj,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20200406]
[cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Pankaj-Bharadiya/Prefer-drm_WARN-over-WARN/20200406-210932
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-f002-20200406 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project a43e23360657e3df82af6b96b403d1a5a3174744)
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/icl_dsi.c:1127:14: error: use of undeclared identifier 'state'
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
^
>> drivers/gpu/drm/i915/display/icl_dsi.c:1127:14: error: use of undeclared identifier 'state'
2 errors generated.
vim +/state +1127 drivers/gpu/drm/i915/display/icl_dsi.c
1120
1121 static void gen11_dsi_enable(struct intel_encoder *encoder,
1122 const struct intel_crtc_state *crtc_state,
1123 const struct drm_connector_state *conn_state)
1124 {
1125 struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
1126
> 1127 drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
1128
1129 /* step6d: enable dsi transcoder */
1130 gen11_dsi_enable_transcoder(encoder);
1131
1132 /* step7: enable backlight */
1133 intel_panel_enable_backlight(crtc_state, conn_state);
1134 intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);
1135
1136 intel_crtc_vblank_on(crtc_state);
1137 }
1138
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 33686 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 01/18] drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 18:08 ` kbuild test robot
0 siblings, 0 replies; 69+ messages in thread
From: kbuild test robot @ 2020-04-06 18:08 UTC (permalink / raw)
To: Pankaj Bharadiya
Cc: kbuild-all, David Airlie, intel-gfx, dri-devel, Chris Wilson,
clang-built-linux
[-- Attachment #1: Type: text/plain, Size: 2335 bytes --]
Hi Pankaj,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20200406]
[cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Pankaj-Bharadiya/Prefer-drm_WARN-over-WARN/20200406-210932
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-f002-20200406 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project a43e23360657e3df82af6b96b403d1a5a3174744)
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/icl_dsi.c:1127:14: error: use of undeclared identifier 'state'
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
^
>> drivers/gpu/drm/i915/display/icl_dsi.c:1127:14: error: use of undeclared identifier 'state'
2 errors generated.
vim +/state +1127 drivers/gpu/drm/i915/display/icl_dsi.c
1120
1121 static void gen11_dsi_enable(struct intel_encoder *encoder,
1122 const struct intel_crtc_state *crtc_state,
1123 const struct drm_connector_state *conn_state)
1124 {
1125 struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
1126
> 1127 drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
1128
1129 /* step6d: enable dsi transcoder */
1130 gen11_dsi_enable_transcoder(encoder);
1131
1132 /* step7: enable backlight */
1133 intel_panel_enable_backlight(crtc_state, conn_state);
1134 intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);
1135
1136 intel_crtc_vblank_on(crtc_state);
1137 }
1138
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 33686 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 01/18] drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-06 18:08 ` kbuild test robot
0 siblings, 0 replies; 69+ messages in thread
From: kbuild test robot @ 2020-04-06 18:08 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2394 bytes --]
Hi Pankaj,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20200406]
[cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Pankaj-Bharadiya/Prefer-drm_WARN-over-WARN/20200406-210932
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-f002-20200406 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project a43e23360657e3df82af6b96b403d1a5a3174744)
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/icl_dsi.c:1127:14: error: use of undeclared identifier 'state'
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
^
>> drivers/gpu/drm/i915/display/icl_dsi.c:1127:14: error: use of undeclared identifier 'state'
2 errors generated.
vim +/state +1127 drivers/gpu/drm/i915/display/icl_dsi.c
1120
1121 static void gen11_dsi_enable(struct intel_encoder *encoder,
1122 const struct intel_crtc_state *crtc_state,
1123 const struct drm_connector_state *conn_state)
1124 {
1125 struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
1126
> 1127 drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
1128
1129 /* step6d: enable dsi transcoder */
1130 gen11_dsi_enable_transcoder(encoder);
1131
1132 /* step7: enable backlight */
1133 intel_panel_enable_backlight(crtc_state, conn_state);
1134 intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);
1135
1136 intel_crtc_vblank_on(crtc_state);
1137 }
1138
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 33686 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for Prefer drm_WARN* over WARN* (rev2)
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
` (22 preceding siblings ...)
(?)
@ 2020-04-06 19:58 ` Patchwork
-1 siblings, 0 replies; 69+ messages in thread
From: Patchwork @ 2020-04-06 19:58 UTC (permalink / raw)
To: Pankaj Bharadiya; +Cc: intel-gfx
== Series Details ==
Series: Prefer drm_WARN* over WARN* (rev2)
URL : https://patchwork.freedesktop.org/series/75543/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8260_full -> Patchwork_17221_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_17221_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_params@invalid-bsd-ring:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-iclb2/igt@gem_exec_params@invalid-bsd-ring.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-iclb3/igt@gem_exec_params@invalid-bsd-ring.html
* igt@gem_softpin@noreloc-s3:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([i915#180] / [i915#95])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-apl4/igt@gem_softpin@noreloc-s3.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-apl4/igt@gem_softpin@noreloc-s3.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][5] -> [FAIL][6] ([i915#454])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-iclb1/igt@i915_pm_dc@dc6-psr.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
- shard-skl: [PASS][7] -> [FAIL][8] ([i915#454])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-skl3/igt@i915_pm_dc@dc6-psr.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-skl7/igt@i915_pm_dc@dc6-psr.html
* igt@i915_suspend@forcewake:
- shard-kbl: [PASS][9] -> [DMESG-WARN][10] ([i915#180])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-kbl1/igt@i915_suspend@forcewake.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-kbl2/igt@i915_suspend@forcewake.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][11] -> [FAIL][12] ([fdo#108145] / [i915#265])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-skl10/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_sprite_render:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-iclb2/igt@kms_psr@psr2_sprite_render.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-iclb3/igt@kms_psr@psr2_sprite_render.html
#### Possible fixes ####
* igt@gem_media_fill:
- shard-kbl: [DMESG-WARN][15] ([i915#165]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-kbl2/igt@gem_media_fill.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-kbl4/igt@gem_media_fill.html
* igt@gem_softpin@noreloc-s3:
- shard-kbl: [DMESG-WARN][17] ([i915#180] / [i915#93] / [i915#95]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-kbl6/igt@gem_softpin@noreloc-s3.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-kbl6/igt@gem_softpin@noreloc-s3.html
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [DMESG-WARN][19] ([i915#716]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-glk6/igt@gen9_exec_parse@allowed-all.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-glk7/igt@gen9_exec_parse@allowed-all.html
* igt@kms_color@pipe-b-ctm-0-5:
- shard-kbl: [DMESG-WARN][21] ([i915#78]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-kbl2/igt@kms_color@pipe-b-ctm-0-5.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-kbl4/igt@kms_color@pipe-b-ctm-0-5.html
* igt@kms_cursor_crc@pipe-a-cursor-128x42-sliding:
- shard-apl: [FAIL][23] ([i915#54] / [i915#95]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-apl3/igt@kms_cursor_crc@pipe-a-cursor-128x42-sliding.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-apl7/igt@kms_cursor_crc@pipe-a-cursor-128x42-sliding.html
* igt@kms_dp_aux_dev:
- shard-iclb: [DMESG-FAIL][25] ([i915#1645]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-iclb7/igt@kms_dp_aux_dev.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-iclb7/igt@kms_dp_aux_dev.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][27] ([fdo#109349]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-iclb5/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* igt@kms_fbcon_fbt@fbc:
- shard-kbl: [FAIL][29] ([i915#1121] / [i915#64]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-kbl2/igt@kms_fbcon_fbt@fbc.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-kbl4/igt@kms_fbcon_fbt@fbc.html
* igt@kms_flip@2x-wf_vblank-ts-check:
- shard-glk: [FAIL][31] ([i915#34]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-glk2/igt@kms_flip@2x-wf_vblank-ts-check.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-glk6/igt@kms_flip@2x-wf_vblank-ts-check.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-apl: [DMESG-WARN][33] ([i915#180]) -> [PASS][34] +5 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-apl6/igt@kms_flip@flip-vs-suspend-interruptible.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-apl1/igt@kms_flip@flip-vs-suspend-interruptible.html
- shard-hsw: [INCOMPLETE][35] ([i915#61]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-hsw8/igt@kms_flip@flip-vs-suspend-interruptible.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-hsw8/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][37] ([i915#1188]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-skl4/igt@kms_hdr@bpc-switch.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-skl10/igt@kms_hdr@bpc-switch.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-kbl: [DMESG-WARN][39] ([i915#180]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-kbl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-glk: [FAIL][41] ([i915#899]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-glk7/igt@kms_plane_lowres@pipe-a-tiling-x.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-glk2/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][43] ([fdo#109642] / [fdo#111068]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-iclb6/igt@kms_psr2_su@frontbuffer.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [SKIP][45] ([fdo#109441]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-iclb5/igt@kms_psr@psr2_no_drrs.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][47] ([i915#31]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-apl7/igt@kms_setmode@basic.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-apl2/igt@kms_setmode@basic.html
* {igt@perf@polling-parameterized}:
- shard-hsw: [FAIL][49] ([i915#1542]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-hsw8/igt@perf@polling-parameterized.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-hsw7/igt@perf@polling-parameterized.html
#### Warnings ####
* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [FAIL][51] ([i915#454]) -> [SKIP][52] ([i915#468])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-tglb6/igt@i915_pm_dc@dc6-dpms.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-tglb2/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait:
- shard-snb: [SKIP][53] ([fdo#109271]) -> [INCOMPLETE][54] ([i915#82])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-snb6/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-snb1/igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-apl: [FAIL][55] ([i915#49] / [i915#95]) -> [FAIL][56] ([i915#49])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8260/shard-apl2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17221/shard-apl4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html
{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#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1121]: https://gitlab.freedesktop.org/drm/intel/issues/1121
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1645]: https://gitlab.freedesktop.org/drm/intel/issues/1645
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[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#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61
[i915#64]: https://gitlab.freedesktop.org/drm/intel/issues/64
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
[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_8260 -> Patchwork_17221
CI-20190529: 20190529
CI_DRM_8260: fa5519e01f097b7f69259be38606ff5f1bc3cc6c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5572: 6c124b5c8501d900966c033ac86c3dc55c16a2da @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17221: 0fd60ba248422a0d5663452133f23baad2764749 @ 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_17221/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 03/18] drm/i915/display/ddi: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
(?)
@ 2020-04-06 20:21 ` kbuild test robot
-1 siblings, 0 replies; 69+ messages in thread
From: kbuild test robot @ 2020-04-06 20:21 UTC (permalink / raw)
To: Pankaj Bharadiya
Cc: kbuild-all, David Airlie, intel-gfx, Lucas De Marchi, dri-devel,
clang-built-linux, Rodrigo Vivi, José Roberto de Souza
[-- Attachment #1: Type: text/plain, Size: 2556 bytes --]
Hi Pankaj,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20200406]
[cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Pankaj-Bharadiya/Prefer-drm_WARN-over-WARN/20200406-210932
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-f002-20200406 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project a43e23360657e3df82af6b96b403d1a5a3174744)
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_ddi.c:3624:14: error: use of undeclared identifier 'state'
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
^
>> drivers/gpu/drm/i915/display/intel_ddi.c:3624:14: error: use of undeclared identifier 'state'
2 errors generated.
vim +/state +3624 drivers/gpu/drm/i915/display/intel_ddi.c
3619
3620 static void intel_enable_ddi(struct intel_encoder *encoder,
3621 const struct intel_crtc_state *crtc_state,
3622 const struct drm_connector_state *conn_state)
3623 {
> 3624 drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
3625
3626 intel_enable_pipe(crtc_state);
3627
3628 intel_crtc_vblank_on(crtc_state);
3629
3630 if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
3631 intel_enable_ddi_hdmi(encoder, crtc_state, conn_state);
3632 else
3633 intel_enable_ddi_dp(encoder, crtc_state, conn_state);
3634
3635 /* Enable hdcp if it's desired */
3636 if (conn_state->content_protection ==
3637 DRM_MODE_CONTENT_PROTECTION_DESIRED)
3638 intel_hdcp_enable(to_intel_connector(conn_state->connector),
3639 crtc_state->cpu_transcoder,
3640 (u8)conn_state->hdcp_content_type);
3641 }
3642
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 33686 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 03/18] drm/i915/display/ddi: Prefer drm_WARN* over WARN*
@ 2020-04-06 20:21 ` kbuild test robot
0 siblings, 0 replies; 69+ messages in thread
From: kbuild test robot @ 2020-04-06 20:21 UTC (permalink / raw)
To: Pankaj Bharadiya
Cc: kbuild-all, David Airlie, intel-gfx, Lucas De Marchi, dri-devel,
clang-built-linux
[-- Attachment #1: Type: text/plain, Size: 2556 bytes --]
Hi Pankaj,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20200406]
[cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Pankaj-Bharadiya/Prefer-drm_WARN-over-WARN/20200406-210932
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-f002-20200406 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project a43e23360657e3df82af6b96b403d1a5a3174744)
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_ddi.c:3624:14: error: use of undeclared identifier 'state'
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
^
>> drivers/gpu/drm/i915/display/intel_ddi.c:3624:14: error: use of undeclared identifier 'state'
2 errors generated.
vim +/state +3624 drivers/gpu/drm/i915/display/intel_ddi.c
3619
3620 static void intel_enable_ddi(struct intel_encoder *encoder,
3621 const struct intel_crtc_state *crtc_state,
3622 const struct drm_connector_state *conn_state)
3623 {
> 3624 drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
3625
3626 intel_enable_pipe(crtc_state);
3627
3628 intel_crtc_vblank_on(crtc_state);
3629
3630 if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
3631 intel_enable_ddi_hdmi(encoder, crtc_state, conn_state);
3632 else
3633 intel_enable_ddi_dp(encoder, crtc_state, conn_state);
3634
3635 /* Enable hdcp if it's desired */
3636 if (conn_state->content_protection ==
3637 DRM_MODE_CONTENT_PROTECTION_DESIRED)
3638 intel_hdcp_enable(to_intel_connector(conn_state->connector),
3639 crtc_state->cpu_transcoder,
3640 (u8)conn_state->hdcp_content_type);
3641 }
3642
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 33686 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 03/18] drm/i915/display/ddi: Prefer drm_WARN* over WARN*
@ 2020-04-06 20:21 ` kbuild test robot
0 siblings, 0 replies; 69+ messages in thread
From: kbuild test robot @ 2020-04-06 20:21 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2620 bytes --]
Hi Pankaj,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20200406]
[cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Pankaj-Bharadiya/Prefer-drm_WARN-over-WARN/20200406-210932
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-f002-20200406 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project a43e23360657e3df82af6b96b403d1a5a3174744)
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_ddi.c:3624:14: error: use of undeclared identifier 'state'
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
^
>> drivers/gpu/drm/i915/display/intel_ddi.c:3624:14: error: use of undeclared identifier 'state'
2 errors generated.
vim +/state +3624 drivers/gpu/drm/i915/display/intel_ddi.c
3619
3620 static void intel_enable_ddi(struct intel_encoder *encoder,
3621 const struct intel_crtc_state *crtc_state,
3622 const struct drm_connector_state *conn_state)
3623 {
> 3624 drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
3625
3626 intel_enable_pipe(crtc_state);
3627
3628 intel_crtc_vblank_on(crtc_state);
3629
3630 if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
3631 intel_enable_ddi_hdmi(encoder, crtc_state, conn_state);
3632 else
3633 intel_enable_ddi_dp(encoder, crtc_state, conn_state);
3634
3635 /* Enable hdcp if it's desired */
3636 if (conn_state->content_protection ==
3637 DRM_MODE_CONTENT_PROTECTION_DESIRED)
3638 intel_hdcp_enable(to_intel_connector(conn_state->connector),
3639 crtc_state->cpu_transcoder,
3640 (u8)conn_state->hdcp_content_type);
3641 }
3642
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 33686 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 13/18] drm/i915/display/vlv_dsi: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
(?)
@ 2020-04-06 22:41 ` kbuild test robot
-1 siblings, 0 replies; 69+ messages in thread
From: kbuild test robot @ 2020-04-06 22:41 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2026 bytes --]
Hi Pankaj,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20200406]
[cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Pankaj-Bharadiya/Prefer-drm_WARN-over-WARN/20200406-210932
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-randconfig-f002-20200406 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project a43e23360657e3df82af6b96b403d1a5a3174744)
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/vlv_dsi.c:865:14: error: use of undeclared identifier 'state'
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
^
>> drivers/gpu/drm/i915/display/vlv_dsi.c:865:14: error: use of undeclared identifier 'state'
2 errors generated.
vim +/state +865 drivers/gpu/drm/i915/display/vlv_dsi.c
860
861 static void bxt_dsi_enable(struct intel_encoder *encoder,
862 const struct intel_crtc_state *crtc_state,
863 const struct drm_connector_state *conn_state)
864 {
> 865 drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
866
867 intel_crtc_vblank_on(crtc_state);
868 }
869
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 33686 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 11/18] drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-21 6:55 ` Jani Nikula
-1 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 6:55 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Imre Deak
Cc: pankaj.laxminarayan.bharadiya
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN* over WARN* calls.
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index e6306cbb7a3a..477465a9af90 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -431,7 +431,7 @@ static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
> else
> BUF_PRINT("(%02X)", cmd);
>
> - WARN_ON(pos >= sizeof(buffer) - 1);
> + drm_WARN_ON(intel_sdvo->base.base.dev, pos >= sizeof(buffer) - 1);
> #undef BUF_PRINT
>
> DRM_DEBUG_KMS("%s: W: %02X %s\n", SDVO_NAME(intel_sdvo), cmd, buffer);
> @@ -597,7 +597,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
> BUF_PRINT(" %02X", ((u8 *)response)[i]);
> }
>
> - WARN_ON(pos >= sizeof(buffer) - 1);
> + drm_WARN_ON(intel_sdvo->base.base.dev, pos >= sizeof(buffer) - 1);
> #undef BUF_PRINT
>
> DRM_DEBUG_KMS("%s: R: %s\n", SDVO_NAME(intel_sdvo), buffer);
> @@ -1106,7 +1106,7 @@ static bool intel_sdvo_compute_avi_infoframe(struct intel_sdvo *intel_sdvo,
> HDMI_QUANTIZATION_RANGE_FULL);
>
> ret = hdmi_avi_infoframe_check(frame);
> - if (WARN_ON(ret))
> + if (drm_WARN_ON(intel_sdvo->base.base.dev, ret))
> return false;
>
> return true;
> @@ -1123,11 +1123,12 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
> intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_AVI)) == 0)
> return true;
>
> - if (WARN_ON(frame->any.type != HDMI_INFOFRAME_TYPE_AVI))
> + if (drm_WARN_ON(intel_sdvo->base.base.dev,
> + frame->any.type != HDMI_INFOFRAME_TYPE_AVI))
> return false;
>
> len = hdmi_infoframe_pack_only(frame, sdvo_data, sizeof(sdvo_data));
> - if (WARN_ON(len < 0))
> + if (drm_WARN_ON(intel_sdvo->base.base.dev, len < 0))
For most places, but especially places like this, I'd rather you added a
i915 local variable and used &i915->drm instead.
BR,
Jani.
> return false;
>
> return intel_sdvo_write_infoframe(intel_sdvo, SDVO_HBUF_INDEX_AVI_IF,
> @@ -1257,7 +1258,8 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_state *pipe_config)
> clock->m1 = 12;
> clock->m2 = 8;
> } else {
> - WARN(1, "SDVO TV clock out of range: %i\n", dotclock);
> + drm_WARN(pipe_config->uapi.crtc->dev, 1,
> + "SDVO TV clock out of range: %i\n", dotclock);
> }
>
> pipe_config->clock_set = true;
> @@ -2294,7 +2296,7 @@ intel_sdvo_connector_atomic_get_property(struct drm_connector *connector,
> return 0;
> }
>
> - WARN_ON(1);
> + drm_WARN_ON(connector->dev, 1);
> *val = 0;
> } else if (property == intel_sdvo_connector->top ||
> property == intel_sdvo_connector->bottom)
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 11/18] drm/i915/display/sdvo: Prefer drm_WARN* over WARN*
@ 2020-04-21 6:55 ` Jani Nikula
0 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 6:55 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Imre Deak
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN* over WARN* calls.
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index e6306cbb7a3a..477465a9af90 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -431,7 +431,7 @@ static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
> else
> BUF_PRINT("(%02X)", cmd);
>
> - WARN_ON(pos >= sizeof(buffer) - 1);
> + drm_WARN_ON(intel_sdvo->base.base.dev, pos >= sizeof(buffer) - 1);
> #undef BUF_PRINT
>
> DRM_DEBUG_KMS("%s: W: %02X %s\n", SDVO_NAME(intel_sdvo), cmd, buffer);
> @@ -597,7 +597,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
> BUF_PRINT(" %02X", ((u8 *)response)[i]);
> }
>
> - WARN_ON(pos >= sizeof(buffer) - 1);
> + drm_WARN_ON(intel_sdvo->base.base.dev, pos >= sizeof(buffer) - 1);
> #undef BUF_PRINT
>
> DRM_DEBUG_KMS("%s: R: %s\n", SDVO_NAME(intel_sdvo), buffer);
> @@ -1106,7 +1106,7 @@ static bool intel_sdvo_compute_avi_infoframe(struct intel_sdvo *intel_sdvo,
> HDMI_QUANTIZATION_RANGE_FULL);
>
> ret = hdmi_avi_infoframe_check(frame);
> - if (WARN_ON(ret))
> + if (drm_WARN_ON(intel_sdvo->base.base.dev, ret))
> return false;
>
> return true;
> @@ -1123,11 +1123,12 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo,
> intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_AVI)) == 0)
> return true;
>
> - if (WARN_ON(frame->any.type != HDMI_INFOFRAME_TYPE_AVI))
> + if (drm_WARN_ON(intel_sdvo->base.base.dev,
> + frame->any.type != HDMI_INFOFRAME_TYPE_AVI))
> return false;
>
> len = hdmi_infoframe_pack_only(frame, sdvo_data, sizeof(sdvo_data));
> - if (WARN_ON(len < 0))
> + if (drm_WARN_ON(intel_sdvo->base.base.dev, len < 0))
For most places, but especially places like this, I'd rather you added a
i915 local variable and used &i915->drm instead.
BR,
Jani.
> return false;
>
> return intel_sdvo_write_infoframe(intel_sdvo, SDVO_HBUF_INDEX_AVI_IF,
> @@ -1257,7 +1258,8 @@ static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_state *pipe_config)
> clock->m1 = 12;
> clock->m2 = 8;
> } else {
> - WARN(1, "SDVO TV clock out of range: %i\n", dotclock);
> + drm_WARN(pipe_config->uapi.crtc->dev, 1,
> + "SDVO TV clock out of range: %i\n", dotclock);
> }
>
> pipe_config->clock_set = true;
> @@ -2294,7 +2296,7 @@ intel_sdvo_connector_atomic_get_property(struct drm_connector *connector,
> return 0;
> }
>
> - WARN_ON(1);
> + drm_WARN_ON(connector->dev, 1);
> *val = 0;
> } else if (property == intel_sdvo_connector->top ||
> property == intel_sdvo_connector->bottom)
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 06/18] drm/i915/display/dp: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-21 6:56 ` Jani Nikula
-1 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 6:56 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Manasi Navare, Imre Deak, Gwan-gyeong Mun
Cc: pankaj.laxminarayan.bharadiya
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
The patch no longer applies.
>
> Prefer drm_WARN* over WARN* at places where struct intel_dp struct
> pointer is available.
>
> Conversion is done with below sementic patch:
>
> @@
> 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,
> ...)
> )
> ...+>
>
> }
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp.c | 26 ++++++++++++++++---------
> 1 file changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index db6ae8e9af6e..5076a7cfe0e5 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -410,7 +410,10 @@ static int intel_dp_rate_index(const int *rates, int len, int rate)
>
> static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
> {
> - WARN_ON(!intel_dp->num_source_rates || !intel_dp->num_sink_rates);
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> +
> + drm_WARN_ON(&i915->drm,
> + !intel_dp->num_source_rates || !intel_dp->num_sink_rates);
>
> intel_dp->num_common_rates = intersect_rates(intel_dp->source_rates,
> intel_dp->num_source_rates,
> @@ -419,7 +422,7 @@ static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
> intel_dp->common_rates);
>
> /* Paranoia, there should always be something in common. */
> - if (WARN_ON(intel_dp->num_common_rates == 0)) {
> + if (drm_WARN_ON(&i915->drm, intel_dp->num_common_rates == 0)) {
> intel_dp->common_rates[0] = 162000;
> intel_dp->num_common_rates = 1;
> }
> @@ -1549,6 +1552,7 @@ static ssize_t
> intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
> {
> struct intel_dp *intel_dp = container_of(aux, struct intel_dp, aux);
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> u8 txbuf[20], rxbuf[20];
> size_t txsize, rxsize;
> int ret;
> @@ -1562,10 +1566,10 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
> txsize = msg->size ? HEADER_SIZE + msg->size : BARE_ADDRESS_SIZE;
> rxsize = 2; /* 0 or 1 data bytes */
>
> - if (WARN_ON(txsize > 20))
> + if (drm_WARN_ON(&i915->drm, txsize > 20))
> return -E2BIG;
>
> - WARN_ON(!msg->buffer != !msg->size);
> + drm_WARN_ON(&i915->drm, !msg->buffer != !msg->size);
>
> if (msg->buffer)
> memcpy(txbuf + HEADER_SIZE, msg->buffer, msg->size);
> @@ -1590,7 +1594,7 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
> txsize = msg->size ? HEADER_SIZE : BARE_ADDRESS_SIZE;
> rxsize = msg->size + 1;
>
> - if (WARN_ON(rxsize > 20))
> + if (drm_WARN_ON(&i915->drm, rxsize > 20))
> return -E2BIG;
>
> ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
> @@ -1864,10 +1868,11 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp)
> int
> intel_dp_max_link_rate(struct intel_dp *intel_dp)
> {
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> int len;
>
> len = intel_dp_common_len_rate_limit(intel_dp, intel_dp->max_link_rate);
> - if (WARN_ON(len <= 0))
> + if (drm_WARN_ON(&i915->drm, len <= 0))
> return 162000;
>
> return intel_dp->common_rates[len - 1];
> @@ -1875,10 +1880,11 @@ intel_dp_max_link_rate(struct intel_dp *intel_dp)
>
> int intel_dp_rate_select(struct intel_dp *intel_dp, int rate)
> {
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> int i = intel_dp_rate_index(intel_dp->sink_rates,
> intel_dp->num_sink_rates, rate);
>
> - if (WARN_ON(i < 0))
> + if (drm_WARN_ON(&i915->drm, i < 0))
> i = 0;
>
> return i;
> @@ -5404,6 +5410,7 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp)
> 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) {
> @@ -5412,7 +5419,7 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)
> int retry;
> bool handled;
>
> - WARN_ON_ONCE(intel_dp->active_mst_links < 0);
> + drm_WARN_ON_ONCE(&i915->drm, intel_dp->active_mst_links < 0);
> bret = intel_dp_get_sink_irq_esi(intel_dp, esi);
> go_again:
> if (bret == true) {
> @@ -5695,11 +5702,12 @@ 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;
>
> - if (WARN_ON(intel_dp_is_edp(intel_dp)))
> + if (drm_WARN_ON(&i915->drm, intel_dp_is_edp(intel_dp)))
> return connector_status_connected;
>
> if (lspcon->active)
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 06/18] drm/i915/display/dp: Prefer drm_WARN* over WARN*
@ 2020-04-21 6:56 ` Jani Nikula
0 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 6:56 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Ville Syrjälä,
Chris Wilson, Manasi Navare, Imre Deak, Gwan-gyeong Mun
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
The patch no longer applies.
>
> Prefer drm_WARN* over WARN* at places where struct intel_dp struct
> pointer is available.
>
> Conversion is done with below sementic patch:
>
> @@
> 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,
> ...)
> )
> ...+>
>
> }
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp.c | 26 ++++++++++++++++---------
> 1 file changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index db6ae8e9af6e..5076a7cfe0e5 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -410,7 +410,10 @@ static int intel_dp_rate_index(const int *rates, int len, int rate)
>
> static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
> {
> - WARN_ON(!intel_dp->num_source_rates || !intel_dp->num_sink_rates);
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> +
> + drm_WARN_ON(&i915->drm,
> + !intel_dp->num_source_rates || !intel_dp->num_sink_rates);
>
> intel_dp->num_common_rates = intersect_rates(intel_dp->source_rates,
> intel_dp->num_source_rates,
> @@ -419,7 +422,7 @@ static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
> intel_dp->common_rates);
>
> /* Paranoia, there should always be something in common. */
> - if (WARN_ON(intel_dp->num_common_rates == 0)) {
> + if (drm_WARN_ON(&i915->drm, intel_dp->num_common_rates == 0)) {
> intel_dp->common_rates[0] = 162000;
> intel_dp->num_common_rates = 1;
> }
> @@ -1549,6 +1552,7 @@ static ssize_t
> intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
> {
> struct intel_dp *intel_dp = container_of(aux, struct intel_dp, aux);
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> u8 txbuf[20], rxbuf[20];
> size_t txsize, rxsize;
> int ret;
> @@ -1562,10 +1566,10 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
> txsize = msg->size ? HEADER_SIZE + msg->size : BARE_ADDRESS_SIZE;
> rxsize = 2; /* 0 or 1 data bytes */
>
> - if (WARN_ON(txsize > 20))
> + if (drm_WARN_ON(&i915->drm, txsize > 20))
> return -E2BIG;
>
> - WARN_ON(!msg->buffer != !msg->size);
> + drm_WARN_ON(&i915->drm, !msg->buffer != !msg->size);
>
> if (msg->buffer)
> memcpy(txbuf + HEADER_SIZE, msg->buffer, msg->size);
> @@ -1590,7 +1594,7 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
> txsize = msg->size ? HEADER_SIZE : BARE_ADDRESS_SIZE;
> rxsize = msg->size + 1;
>
> - if (WARN_ON(rxsize > 20))
> + if (drm_WARN_ON(&i915->drm, rxsize > 20))
> return -E2BIG;
>
> ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
> @@ -1864,10 +1868,11 @@ static void intel_dp_print_rates(struct intel_dp *intel_dp)
> int
> intel_dp_max_link_rate(struct intel_dp *intel_dp)
> {
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> int len;
>
> len = intel_dp_common_len_rate_limit(intel_dp, intel_dp->max_link_rate);
> - if (WARN_ON(len <= 0))
> + if (drm_WARN_ON(&i915->drm, len <= 0))
> return 162000;
>
> return intel_dp->common_rates[len - 1];
> @@ -1875,10 +1880,11 @@ intel_dp_max_link_rate(struct intel_dp *intel_dp)
>
> int intel_dp_rate_select(struct intel_dp *intel_dp, int rate)
> {
> + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> int i = intel_dp_rate_index(intel_dp->sink_rates,
> intel_dp->num_sink_rates, rate);
>
> - if (WARN_ON(i < 0))
> + if (drm_WARN_ON(&i915->drm, i < 0))
> i = 0;
>
> return i;
> @@ -5404,6 +5410,7 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp)
> 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) {
> @@ -5412,7 +5419,7 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)
> int retry;
> bool handled;
>
> - WARN_ON_ONCE(intel_dp->active_mst_links < 0);
> + drm_WARN_ON_ONCE(&i915->drm, intel_dp->active_mst_links < 0);
> bret = intel_dp_get_sink_irq_esi(intel_dp, esi);
> go_again:
> if (bret == true) {
> @@ -5695,11 +5702,12 @@ 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;
>
> - if (WARN_ON(intel_dp_is_edp(intel_dp)))
> + if (drm_WARN_ON(&i915->drm, intel_dp_is_edp(intel_dp)))
> return connector_status_connected;
>
> if (lspcon->active)
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 12/18] drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-21 6:57 ` Jani Nikula
-1 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 6:57 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Imre Deak,
José Roberto de Souza, Lucas De Marchi,
Ville Syrjälä,
Pankaj Bharadiya
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN_ON over WARN_ON.
>
> Conversion is done with below sementic patch:
>
> @@
> identifier func, T;
> @@
> func(struct intel_digital_port *T,...) {
> <+...
> -WARN_ON(
> +drm_WARN_ON(T->base.base.dev,
> ...)
> ...+>
>
> }
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_tc.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> index 9b850c11aa78..7d4172498320 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -295,12 +295,12 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port,
> }
>
> if (!icl_tc_phy_set_safe_mode(dig_port, false) &&
> - !WARN_ON(dig_port->tc_legacy_port))
> + !drm_WARN_ON(dig_port->base.base.dev, dig_port->tc_legacy_port))
> goto out_set_tbt_alt_mode;
>
> max_lanes = intel_tc_port_fia_max_lane_count(dig_port);
> if (dig_port->tc_legacy_port) {
> - WARN_ON(max_lanes != 4);
> + drm_WARN_ON(dig_port->base.base.dev, max_lanes != 4);
The patch needs a rebase, and please use i915 local variable.
BR,
Jani.
> dig_port->tc_mode = TC_PORT_LEGACY;
>
> return;
> @@ -381,14 +381,16 @@ intel_tc_port_get_current_mode(struct intel_digital_port *dig_port)
> bool in_safe_mode = icl_tc_phy_is_in_safe_mode(dig_port);
> enum tc_port_mode mode;
>
> - if (in_safe_mode || WARN_ON(!icl_tc_phy_status_complete(dig_port)))
> + if (in_safe_mode || drm_WARN_ON(dig_port->base.base.dev,
> + !icl_tc_phy_status_complete(dig_port)))
> return TC_PORT_TBT_ALT;
>
> mode = dig_port->tc_legacy_port ? TC_PORT_LEGACY : TC_PORT_DP_ALT;
> if (live_status_mask) {
> enum tc_port_mode live_mode = fls(live_status_mask) - 1;
>
> - if (!WARN_ON(live_mode == TC_PORT_TBT_ALT))
> + if (!drm_WARN_ON(dig_port->base.base.dev,
> + live_mode == TC_PORT_TBT_ALT))
> mode = live_mode;
> }
>
> @@ -432,7 +434,7 @@ static void
> intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port,
> int refcount)
> {
> - WARN_ON(dig_port->tc_link_refcount);
> + drm_WARN_ON(dig_port->base.base.dev, dig_port->tc_link_refcount);
> dig_port->tc_link_refcount = refcount;
> }
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 12/18] drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-21 6:57 ` Jani Nikula
0 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 6:57 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie, Imre Deak,
José Roberto de Souza, Lucas De Marchi,
Ville Syrjälä,
Pankaj Bharadiya
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN_ON over WARN_ON.
>
> Conversion is done with below sementic patch:
>
> @@
> identifier func, T;
> @@
> func(struct intel_digital_port *T,...) {
> <+...
> -WARN_ON(
> +drm_WARN_ON(T->base.base.dev,
> ...)
> ...+>
>
> }
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_tc.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> index 9b850c11aa78..7d4172498320 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -295,12 +295,12 @@ static void icl_tc_phy_connect(struct intel_digital_port *dig_port,
> }
>
> if (!icl_tc_phy_set_safe_mode(dig_port, false) &&
> - !WARN_ON(dig_port->tc_legacy_port))
> + !drm_WARN_ON(dig_port->base.base.dev, dig_port->tc_legacy_port))
> goto out_set_tbt_alt_mode;
>
> max_lanes = intel_tc_port_fia_max_lane_count(dig_port);
> if (dig_port->tc_legacy_port) {
> - WARN_ON(max_lanes != 4);
> + drm_WARN_ON(dig_port->base.base.dev, max_lanes != 4);
The patch needs a rebase, and please use i915 local variable.
BR,
Jani.
> dig_port->tc_mode = TC_PORT_LEGACY;
>
> return;
> @@ -381,14 +381,16 @@ intel_tc_port_get_current_mode(struct intel_digital_port *dig_port)
> bool in_safe_mode = icl_tc_phy_is_in_safe_mode(dig_port);
> enum tc_port_mode mode;
>
> - if (in_safe_mode || WARN_ON(!icl_tc_phy_status_complete(dig_port)))
> + if (in_safe_mode || drm_WARN_ON(dig_port->base.base.dev,
> + !icl_tc_phy_status_complete(dig_port)))
> return TC_PORT_TBT_ALT;
>
> mode = dig_port->tc_legacy_port ? TC_PORT_LEGACY : TC_PORT_DP_ALT;
> if (live_status_mask) {
> enum tc_port_mode live_mode = fls(live_status_mask) - 1;
>
> - if (!WARN_ON(live_mode == TC_PORT_TBT_ALT))
> + if (!drm_WARN_ON(dig_port->base.base.dev,
> + live_mode == TC_PORT_TBT_ALT))
> mode = live_mode;
> }
>
> @@ -432,7 +434,7 @@ static void
> intel_tc_port_link_init_refcount(struct intel_digital_port *dig_port,
> int refcount)
> {
> - WARN_ON(dig_port->tc_link_refcount);
> + drm_WARN_ON(dig_port->base.base.dev, dig_port->tc_link_refcount);
> dig_port->tc_link_refcount = refcount;
> }
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 05/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
(?)
@ 2020-04-21 7:53 ` Jani Nikula
2020-04-21 9:19 ` Imre Deak
-1 siblings, 1 reply; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 7:53 UTC (permalink / raw)
To: Pankaj Bharadiya, intel-gfx, Imre Deak; +Cc: Chris Wilson
Pankaj, the subject line is identical to patch 4, please update.
Imre, one question inline for you.
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 433e5a81dd4d..5475f989df4c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -1850,22 +1850,29 @@ static u64 __async_put_domains_mask(struct i915_power_domains *power_domains)
> static bool
> assert_async_put_domain_masks_disjoint(struct i915_power_domains *power_domains)
> {
> - return !WARN_ON(power_domains->async_put_domains[0] &
> - power_domains->async_put_domains[1]);
> + struct drm_i915_private *i915 = container_of(power_domains,
> + struct drm_i915_private,
> + power_domains);
> + return !drm_WARN_ON(&i915->drm, power_domains->async_put_domains[0] &
> + power_domains->async_put_domains[1]);
> }
Do we want to depend on struct i915_power_domains being a struct
drm_i915_private member via container_of?
BR,
Jani.
>
> static bool
> __async_put_domains_state_ok(struct i915_power_domains *power_domains)
> {
> + struct drm_i915_private *i915 = container_of(power_domains,
> + struct drm_i915_private,
> + power_domains);
> enum intel_display_power_domain domain;
> bool err = false;
>
> err |= !assert_async_put_domain_masks_disjoint(power_domains);
> - err |= WARN_ON(!!power_domains->async_put_wakeref !=
> - !!__async_put_domains_mask(power_domains));
> + err |= drm_WARN_ON(&i915->drm, !!power_domains->async_put_wakeref !=
> + !!__async_put_domains_mask(power_domains));
>
> for_each_power_domain(domain, __async_put_domains_mask(power_domains))
> - err |= WARN_ON(power_domains->domain_use_count[domain] != 1);
> + err |= drm_WARN_ON(&i915->drm,
> + power_domains->domain_use_count[domain] != 1);
>
> return !err;
> }
> @@ -2107,11 +2114,14 @@ static void
> queue_async_put_domains_work(struct i915_power_domains *power_domains,
> intel_wakeref_t wakeref)
> {
> - WARN_ON(power_domains->async_put_wakeref);
> + struct drm_i915_private *i915 = container_of(power_domains,
> + struct drm_i915_private,
> + power_domains);
> + drm_WARN_ON(&i915->drm, power_domains->async_put_wakeref);
> power_domains->async_put_wakeref = wakeref;
> - WARN_ON(!queue_delayed_work(system_unbound_wq,
> - &power_domains->async_put_work,
> - msecs_to_jiffies(100)));
> + drm_WARN_ON(&i915->drm, !queue_delayed_work(system_unbound_wq,
> + &power_domains->async_put_work,
> + msecs_to_jiffies(100)));
> }
>
> static void
> @@ -4318,6 +4328,9 @@ __set_power_wells(struct i915_power_domains *power_domains,
> const struct i915_power_well_desc *power_well_descs,
> int power_well_count)
> {
> + struct drm_i915_private *i915 = container_of(power_domains,
> + struct drm_i915_private,
> + power_domains);
> u64 power_well_ids = 0;
> int i;
>
> @@ -4337,8 +4350,8 @@ __set_power_wells(struct i915_power_domains *power_domains,
> if (id == DISP_PW_ID_NONE)
> continue;
>
> - WARN_ON(id >= sizeof(power_well_ids) * 8);
> - WARN_ON(power_well_ids & BIT_ULL(id));
> + drm_WARN_ON(&i915->drm, id >= sizeof(power_well_ids) * 8);
> + drm_WARN_ON(&i915->drm, power_well_ids & BIT_ULL(id));
> power_well_ids |= BIT_ULL(id);
> }
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-21 8:24 ` Jani Nikula
-1 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 8:24 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
Cc: pankaj.laxminarayan.bharadiya
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN_ON over WARN_ON.
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index e9ee4daa9320..be33cab6403d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1647,7 +1647,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> #define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0)
>
> /* Only valid when HAS_DISPLAY() is true */
> -#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
> +#define INTEL_DISPLAY_ENABLED(dev_priv) \
> + (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
Needs parens around the dev_priv macro argument.
BR,
Jani.
>
> static inline bool intel_vtd_active(void)
> {
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-21 8:24 ` Jani Nikula
0 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 8:24 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN_ON over WARN_ON.
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index e9ee4daa9320..be33cab6403d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1647,7 +1647,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> #define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0)
>
> /* Only valid when HAS_DISPLAY() is true */
> -#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
> +#define INTEL_DISPLAY_ENABLED(dev_priv) \
> + (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
Needs parens around the dev_priv macro argument.
BR,
Jani.
>
> static inline bool intel_vtd_active(void)
> {
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 17/18] drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
@ 2020-04-21 8:26 ` Jani Nikula
-1 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 8:26 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
Cc: pankaj.laxminarayan.bharadiya
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN_ON over WARN_ON.
>
> Conversion is done with below sementic patch:
>
> @@
> identifier func, T;
> @@
> func(...) {
> ...
> struct intel_crtc *T = ...;
> <+...
> -WARN_ON(
> +drm_WARN_ON(T->base.dev,
> ...)
> ...+>
>
> }
>
> @@
> identifier func, T;
> @@
> func(struct intel_crtc_state *T,...) {
> <+...
> -WARN_ON(
> +drm_WARN_ON(T->uapi.crtc->dev,
> ...)
> ...+>
>
> }
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 57 ++++++++++++++++++---------------
> 1 file changed, 32 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8375054ba27d..b2d22fdaf3db 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1464,8 +1464,8 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state)
> max(optimal->wm.plane[plane_id],
> active->wm.plane[plane_id]);
>
> - WARN_ON(intermediate->wm.plane[plane_id] >
> - g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL));
> + drm_WARN_ON(crtc->base.dev, intermediate->wm.plane[plane_id] >
> + g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL));
> }
>
> intermediate->sr.plane = max(optimal->sr.plane,
> @@ -1482,21 +1482,25 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state)
> intermediate->hpll.fbc = max(optimal->hpll.fbc,
> active->hpll.fbc);
>
> - WARN_ON((intermediate->sr.plane >
> - g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) ||
> - intermediate->sr.cursor >
> - g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) &&
> - intermediate->cxsr);
> - WARN_ON((intermediate->sr.plane >
> - g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) ||
> - intermediate->sr.cursor >
> - g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) &&
> - intermediate->hpll_en);
> -
> - WARN_ON(intermediate->sr.fbc > g4x_fbc_fifo_size(1) &&
> - intermediate->fbc_en && intermediate->cxsr);
> - WARN_ON(intermediate->hpll.fbc > g4x_fbc_fifo_size(2) &&
> - intermediate->fbc_en && intermediate->hpll_en);
> + drm_WARN_ON(crtc->base.dev,
> + (intermediate->sr.plane >
> + g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) ||
> + intermediate->sr.cursor >
> + g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) &&
> + intermediate->cxsr);
> + drm_WARN_ON(crtc->base.dev,
> + (intermediate->sr.plane >
> + g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) ||
> + intermediate->sr.cursor >
> + g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) &&
> + intermediate->hpll_en);
> +
> + drm_WARN_ON(crtc->base.dev,
> + intermediate->sr.fbc > g4x_fbc_fifo_size(1) &&
> + intermediate->fbc_en && intermediate->cxsr);
> + drm_WARN_ON(crtc->base.dev,
> + intermediate->hpll.fbc > g4x_fbc_fifo_size(2) &&
> + intermediate->fbc_en && intermediate->hpll_en);
Please add a i915 local variable and use &i915->drm.
>
> out:
> /*
> @@ -1748,11 +1752,11 @@ static int vlv_compute_fifo(struct intel_crtc_state *crtc_state)
> fifo_left -= plane_extra;
> }
>
> - WARN_ON(active_planes != 0 && fifo_left != 0);
> + drm_WARN_ON(crtc->base.dev, active_planes != 0 && fifo_left != 0);
>
> /* give it all to the first plane if none are active */
> if (active_planes == 0) {
> - WARN_ON(fifo_left != fifo_size);
> + drm_WARN_ON(crtc->base.dev, fifo_left != fifo_size);
> fifo_state->plane[PLANE_PRIMARY] = fifo_left;
> }
>
> @@ -4154,7 +4158,8 @@ skl_plane_downscale_amount(const struct intel_crtc_state *crtc_state,
> uint_fixed_16_16_t fp_w_ratio, fp_h_ratio;
> uint_fixed_16_16_t downscale_h, downscale_w;
>
> - if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
> + if (drm_WARN_ON(crtc_state->uapi.crtc->dev,
> + !intel_wm_plane_visible(crtc_state, plane_state)))
> return u32_to_fixed16(0);
>
> /*
> @@ -4815,7 +4820,7 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
>
> pixel_rate = crtc_state->pixel_rate;
>
> - if (WARN_ON(pixel_rate == 0))
> + if (drm_WARN_ON(crtc_state->uapi.crtc->dev, pixel_rate == 0))
> return u32_to_fixed16(0);
>
> crtc_htotal = crtc_state->hw.adjusted_mode.crtc_htotal;
> @@ -4832,7 +4837,8 @@ skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *crtc_state,
> uint_fixed_16_16_t downscale_amount;
>
> /* Shouldn't reach here on disabled planes... */
> - if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
> + if (drm_WARN_ON(crtc_state->uapi.crtc->dev,
> + !intel_wm_plane_visible(crtc_state, plane_state)))
> return 0;
>
> /*
> @@ -5261,9 +5267,10 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,
> const struct drm_framebuffer *fb = plane_state->hw.fb;
> enum plane_id y_plane_id = plane_state->planar_linked_plane->id;
>
> - WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state));
> - WARN_ON(!fb->format->is_yuv ||
> - fb->format->num_planes == 1);
> + drm_WARN_ON(crtc_state->uapi.crtc->dev,
> + !intel_wm_plane_visible(crtc_state, plane_state));
> + drm_WARN_ON(crtc_state->uapi.crtc->dev, !fb->format->is_yuv ||
> + fb->format->num_planes == 1);
Ditto.
BR,
Jani.
>
> ret = skl_build_plane_wm_single(crtc_state, plane_state,
> y_plane_id, 0);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 17/18] drm/i915/pm: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-21 8:26 ` Jani Nikula
0 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 8:26 UTC (permalink / raw)
To: Pankaj Bharadiya, daniel, intel-gfx, dri-devel, Joonas Lahtinen,
Rodrigo Vivi, David Airlie
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN_ON over WARN_ON.
>
> Conversion is done with below sementic patch:
>
> @@
> identifier func, T;
> @@
> func(...) {
> ...
> struct intel_crtc *T = ...;
> <+...
> -WARN_ON(
> +drm_WARN_ON(T->base.dev,
> ...)
> ...+>
>
> }
>
> @@
> identifier func, T;
> @@
> func(struct intel_crtc_state *T,...) {
> <+...
> -WARN_ON(
> +drm_WARN_ON(T->uapi.crtc->dev,
> ...)
> ...+>
>
> }
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 57 ++++++++++++++++++---------------
> 1 file changed, 32 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8375054ba27d..b2d22fdaf3db 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1464,8 +1464,8 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state)
> max(optimal->wm.plane[plane_id],
> active->wm.plane[plane_id]);
>
> - WARN_ON(intermediate->wm.plane[plane_id] >
> - g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL));
> + drm_WARN_ON(crtc->base.dev, intermediate->wm.plane[plane_id] >
> + g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL));
> }
>
> intermediate->sr.plane = max(optimal->sr.plane,
> @@ -1482,21 +1482,25 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state)
> intermediate->hpll.fbc = max(optimal->hpll.fbc,
> active->hpll.fbc);
>
> - WARN_ON((intermediate->sr.plane >
> - g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) ||
> - intermediate->sr.cursor >
> - g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) &&
> - intermediate->cxsr);
> - WARN_ON((intermediate->sr.plane >
> - g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) ||
> - intermediate->sr.cursor >
> - g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) &&
> - intermediate->hpll_en);
> -
> - WARN_ON(intermediate->sr.fbc > g4x_fbc_fifo_size(1) &&
> - intermediate->fbc_en && intermediate->cxsr);
> - WARN_ON(intermediate->hpll.fbc > g4x_fbc_fifo_size(2) &&
> - intermediate->fbc_en && intermediate->hpll_en);
> + drm_WARN_ON(crtc->base.dev,
> + (intermediate->sr.plane >
> + g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) ||
> + intermediate->sr.cursor >
> + g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) &&
> + intermediate->cxsr);
> + drm_WARN_ON(crtc->base.dev,
> + (intermediate->sr.plane >
> + g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) ||
> + intermediate->sr.cursor >
> + g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) &&
> + intermediate->hpll_en);
> +
> + drm_WARN_ON(crtc->base.dev,
> + intermediate->sr.fbc > g4x_fbc_fifo_size(1) &&
> + intermediate->fbc_en && intermediate->cxsr);
> + drm_WARN_ON(crtc->base.dev,
> + intermediate->hpll.fbc > g4x_fbc_fifo_size(2) &&
> + intermediate->fbc_en && intermediate->hpll_en);
Please add a i915 local variable and use &i915->drm.
>
> out:
> /*
> @@ -1748,11 +1752,11 @@ static int vlv_compute_fifo(struct intel_crtc_state *crtc_state)
> fifo_left -= plane_extra;
> }
>
> - WARN_ON(active_planes != 0 && fifo_left != 0);
> + drm_WARN_ON(crtc->base.dev, active_planes != 0 && fifo_left != 0);
>
> /* give it all to the first plane if none are active */
> if (active_planes == 0) {
> - WARN_ON(fifo_left != fifo_size);
> + drm_WARN_ON(crtc->base.dev, fifo_left != fifo_size);
> fifo_state->plane[PLANE_PRIMARY] = fifo_left;
> }
>
> @@ -4154,7 +4158,8 @@ skl_plane_downscale_amount(const struct intel_crtc_state *crtc_state,
> uint_fixed_16_16_t fp_w_ratio, fp_h_ratio;
> uint_fixed_16_16_t downscale_h, downscale_w;
>
> - if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
> + if (drm_WARN_ON(crtc_state->uapi.crtc->dev,
> + !intel_wm_plane_visible(crtc_state, plane_state)))
> return u32_to_fixed16(0);
>
> /*
> @@ -4815,7 +4820,7 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
>
> pixel_rate = crtc_state->pixel_rate;
>
> - if (WARN_ON(pixel_rate == 0))
> + if (drm_WARN_ON(crtc_state->uapi.crtc->dev, pixel_rate == 0))
> return u32_to_fixed16(0);
>
> crtc_htotal = crtc_state->hw.adjusted_mode.crtc_htotal;
> @@ -4832,7 +4837,8 @@ skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *crtc_state,
> uint_fixed_16_16_t downscale_amount;
>
> /* Shouldn't reach here on disabled planes... */
> - if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
> + if (drm_WARN_ON(crtc_state->uapi.crtc->dev,
> + !intel_wm_plane_visible(crtc_state, plane_state)))
> return 0;
>
> /*
> @@ -5261,9 +5267,10 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,
> const struct drm_framebuffer *fb = plane_state->hw.fb;
> enum plane_id y_plane_id = plane_state->planar_linked_plane->id;
>
> - WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state));
> - WARN_ON(!fb->format->is_yuv ||
> - fb->format->num_planes == 1);
> + drm_WARN_ON(crtc_state->uapi.crtc->dev,
> + !intel_wm_plane_visible(crtc_state, plane_state));
> + drm_WARN_ON(crtc_state->uapi.crtc->dev, !fb->format->is_yuv ||
> + fb->format->num_planes == 1);
Ditto.
BR,
Jani.
>
> ret = skl_build_plane_wm_single(crtc_state, plane_state,
> y_plane_id, 0);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 18/18] drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
2020-04-06 11:28 ` [Intel-gfx] " Pankaj Bharadiya
(?)
@ 2020-04-21 8:28 ` Jani Nikula
2020-04-21 9:48 ` Imre Deak
-1 siblings, 1 reply; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 8:28 UTC (permalink / raw)
To: Pankaj Bharadiya, intel-gfx, imre.deak
Imre, please check the one question inline.
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN* over WARN*.
>
> Conversion is done with below semantic patch:
>
> @@
> identifier func, T;
> @@
> func(struct intel_runtime_pm *T,...) {
> + struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, runtime_pm);
> <+...
> (
> -WARN(
> +drm_WARN(&i915->drm,
> ...)
> |
> -WARN_ON(
> +drm_WARN_ON(&i915->drm,
> ...)
> |
> -WARN_ONCE(
> +drm_WARN_ONCE(&i915->drm,
> ...)
> |
> -WARN_ON_ONCE(
> +drm_WARN_ON_ONCE(&i915->drm,
> ...)
> )
> ...+>
>
> }
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/intel_runtime_pm.c | 39 ++++++++++++++++++-------
> 1 file changed, 28 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index ad719c9602af..31ccd0559c55 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -116,6 +116,9 @@ track_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm)
> static void untrack_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm,
> depot_stack_handle_t stack)
> {
> + struct drm_i915_private *i915 = container_of(rpm,
> + struct drm_i915_private,
> + runtime_pm);
Is this a dependency we want to add? Should struct intel_runtime_pm be
allowed to be elsewhere than struct i915?
BR,
Jani.
> unsigned long flags, n;
> bool found = false;
>
> @@ -134,9 +137,9 @@ static void untrack_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm,
> }
> spin_unlock_irqrestore(&rpm->debug.lock, flags);
>
> - if (WARN(!found,
> - "Unmatched wakeref (tracking %lu), count %u\n",
> - rpm->debug.count, atomic_read(&rpm->wakeref_count))) {
> + if (drm_WARN(&i915->drm, !found,
> + "Unmatched wakeref (tracking %lu), count %u\n",
> + rpm->debug.count, atomic_read(&rpm->wakeref_count))) {
> char *buf;
>
> buf = kmalloc(PAGE_SIZE, GFP_NOWAIT | __GFP_NOWARN);
> @@ -355,10 +358,14 @@ intel_runtime_pm_release(struct intel_runtime_pm *rpm, int wakelock)
> static intel_wakeref_t __intel_runtime_pm_get(struct intel_runtime_pm *rpm,
> bool wakelock)
> {
> + struct drm_i915_private *i915 = container_of(rpm,
> + struct drm_i915_private,
> + runtime_pm);
> int ret;
>
> ret = pm_runtime_get_sync(rpm->kdev);
> - WARN_ONCE(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
> + drm_WARN_ONCE(&i915->drm, ret < 0,
> + "pm_runtime_get_sync() failed: %d\n", ret);
>
> intel_runtime_pm_acquire(rpm, wakelock);
>
> @@ -539,6 +546,9 @@ void intel_runtime_pm_put(struct intel_runtime_pm *rpm, intel_wakeref_t wref)
> */
> void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
> {
> + struct drm_i915_private *i915 = container_of(rpm,
> + struct drm_i915_private,
> + runtime_pm);
> struct device *kdev = rpm->kdev;
>
> /*
> @@ -565,7 +575,8 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
>
> pm_runtime_dont_use_autosuspend(kdev);
> ret = pm_runtime_get_sync(kdev);
> - WARN(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
> + drm_WARN(&i915->drm, ret < 0,
> + "pm_runtime_get_sync() failed: %d\n", ret);
> } else {
> pm_runtime_use_autosuspend(kdev);
> }
> @@ -580,11 +591,14 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
>
> void intel_runtime_pm_disable(struct intel_runtime_pm *rpm)
> {
> + struct drm_i915_private *i915 = container_of(rpm,
> + struct drm_i915_private,
> + runtime_pm);
> struct device *kdev = rpm->kdev;
>
> /* Transfer rpm ownership back to core */
> - WARN(pm_runtime_get_sync(kdev) < 0,
> - "Failed to pass rpm ownership back to core\n");
> + drm_WARN(&i915->drm, pm_runtime_get_sync(kdev) < 0,
> + "Failed to pass rpm ownership back to core\n");
>
> pm_runtime_dont_use_autosuspend(kdev);
>
> @@ -594,12 +608,15 @@ void intel_runtime_pm_disable(struct intel_runtime_pm *rpm)
>
> void intel_runtime_pm_driver_release(struct intel_runtime_pm *rpm)
> {
> + struct drm_i915_private *i915 = container_of(rpm,
> + struct drm_i915_private,
> + runtime_pm);
> int count = atomic_read(&rpm->wakeref_count);
>
> - WARN(count,
> - "i915 raw-wakerefs=%d wakelocks=%d on cleanup\n",
> - intel_rpm_raw_wakeref_count(count),
> - intel_rpm_wakelock_count(count));
> + drm_WARN(&i915->drm, count,
> + "i915 raw-wakerefs=%d wakelocks=%d on cleanup\n",
> + intel_rpm_raw_wakeref_count(count),
> + intel_rpm_wakelock_count(count));
>
> untrack_all_intel_runtime_pm_wakerefs(rpm);
> }
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 14/18] drm/i915/gem: Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
(?)
@ 2020-04-21 8:30 ` Jani Nikula
-1 siblings, 0 replies; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 8:30 UTC (permalink / raw)
To: Pankaj Bharadiya, intel-gfx, Chris Wilson
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> struct drm_device specific drm_WARN* macros include device information
> in the backtrace, so we know what device the warnings originate from.
>
> Prefer drm_WARN* over WARN* at places where struct drm_device pointer
> can be extracted.
I'd like to have Chris' ack on this.
BR,
Jani.
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
> drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 ++-
> drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index 9d11bad74e9a..d910eb9b77ef 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -1440,7 +1440,7 @@ eb_relocate_entry(struct i915_execbuffer *eb,
> err = i915_vma_bind(target->vma,
> target->vma->obj->cache_level,
> PIN_GLOBAL, NULL);
> - if (WARN_ONCE(err,
> + if (drm_WARN_ONCE(&i915->drm, err,
> "Unexpected failure to bind target VMA!"))
> return err;
> }
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
> index 7fe9831aa9ba..4c1c7232b024 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c
> @@ -27,7 +27,8 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj)
> void *dst;
> int i;
>
> - if (WARN_ON(i915_gem_object_needs_bit17_swizzle(obj)))
> + if (drm_WARN_ON(obj->base.dev,
> + i915_gem_object_needs_bit17_swizzle(obj)))
> return -EINVAL;
>
> /*
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
> index 7ffd7afeb7a5..8b0708708671 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
> @@ -235,7 +235,7 @@ i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj,
> if (flags & I915_USERPTR_UNSYNCHRONIZED)
> return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
>
> - if (WARN_ON(obj->userptr.mm == NULL))
> + if (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL))
> return -EINVAL;
>
> mn = i915_mmu_notifier_find(obj->userptr.mm);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 00/18] Prefer drm_WARN* over WARN*
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
` (23 preceding siblings ...)
(?)
@ 2020-04-21 8:35 ` Jani Nikula
2020-04-21 10:01 ` Bharadiya,Pankaj
-1 siblings, 1 reply; 69+ messages in thread
From: Jani Nikula @ 2020-04-21 8:35 UTC (permalink / raw)
To: Pankaj Bharadiya, intel-gfx
On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> Now we have struct drm_device specific drm_WARN* macros which include
> device information in the backtrace, so we know what device the
> warnings originate from.
>
> This series converts WARN* with drm_WARN* where struct drm_device
> pointer can be extracted.
I think I pushed all the patches that I didn't comment on separately,
and that still applied.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 05/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON
2020-04-21 7:53 ` Jani Nikula
@ 2020-04-21 9:19 ` Imre Deak
0 siblings, 0 replies; 69+ messages in thread
From: Imre Deak @ 2020-04-21 9:19 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Chris Wilson
On Tue, Apr 21, 2020 at 10:53:12AM +0300, Jani Nikula wrote:
>
> Pankaj, the subject line is identical to patch 4, please update.
>
> Imre, one question inline for you.
>
> On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> > index 433e5a81dd4d..5475f989df4c 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> > @@ -1850,22 +1850,29 @@ static u64 __async_put_domains_mask(struct i915_power_domains *power_domains)
> > static bool
> > assert_async_put_domain_masks_disjoint(struct i915_power_domains *power_domains)
> > {
> > - return !WARN_ON(power_domains->async_put_domains[0] &
> > - power_domains->async_put_domains[1]);
> > + struct drm_i915_private *i915 = container_of(power_domains,
> > + struct drm_i915_private,
> > + power_domains);
> > + return !drm_WARN_ON(&i915->drm, power_domains->async_put_domains[0] &
> > + power_domains->async_put_domains[1]);
> > }
>
> Do we want to depend on struct i915_power_domains being a struct
> drm_i915_private member via container_of?
It looks ok to me, there is only one i915_power_domains struct per
device.
> BR,
> Jani.
>
> >
> > static bool
> > __async_put_domains_state_ok(struct i915_power_domains *power_domains)
> > {
> > + struct drm_i915_private *i915 = container_of(power_domains,
> > + struct drm_i915_private,
> > + power_domains);
> > enum intel_display_power_domain domain;
> > bool err = false;
> >
> > err |= !assert_async_put_domain_masks_disjoint(power_domains);
> > - err |= WARN_ON(!!power_domains->async_put_wakeref !=
> > - !!__async_put_domains_mask(power_domains));
> > + err |= drm_WARN_ON(&i915->drm, !!power_domains->async_put_wakeref !=
> > + !!__async_put_domains_mask(power_domains));
> >
> > for_each_power_domain(domain, __async_put_domains_mask(power_domains))
> > - err |= WARN_ON(power_domains->domain_use_count[domain] != 1);
> > + err |= drm_WARN_ON(&i915->drm,
> > + power_domains->domain_use_count[domain] != 1);
> >
> > return !err;
> > }
> > @@ -2107,11 +2114,14 @@ static void
> > queue_async_put_domains_work(struct i915_power_domains *power_domains,
> > intel_wakeref_t wakeref)
> > {
> > - WARN_ON(power_domains->async_put_wakeref);
> > + struct drm_i915_private *i915 = container_of(power_domains,
> > + struct drm_i915_private,
> > + power_domains);
> > + drm_WARN_ON(&i915->drm, power_domains->async_put_wakeref);
> > power_domains->async_put_wakeref = wakeref;
> > - WARN_ON(!queue_delayed_work(system_unbound_wq,
> > - &power_domains->async_put_work,
> > - msecs_to_jiffies(100)));
> > + drm_WARN_ON(&i915->drm, !queue_delayed_work(system_unbound_wq,
> > + &power_domains->async_put_work,
> > + msecs_to_jiffies(100)));
> > }
> >
> > static void
> > @@ -4318,6 +4328,9 @@ __set_power_wells(struct i915_power_domains *power_domains,
> > const struct i915_power_well_desc *power_well_descs,
> > int power_well_count)
> > {
> > + struct drm_i915_private *i915 = container_of(power_domains,
> > + struct drm_i915_private,
> > + power_domains);
> > u64 power_well_ids = 0;
> > int i;
> >
> > @@ -4337,8 +4350,8 @@ __set_power_wells(struct i915_power_domains *power_domains,
> > if (id == DISP_PW_ID_NONE)
> > continue;
> >
> > - WARN_ON(id >= sizeof(power_well_ids) * 8);
> > - WARN_ON(power_well_ids & BIT_ULL(id));
> > + drm_WARN_ON(&i915->drm, id >= sizeof(power_well_ids) * 8);
> > + drm_WARN_ON(&i915->drm, power_well_ids & BIT_ULL(id));
> > power_well_ids |= BIT_ULL(id);
> > }
>
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 18/18] drm/i915/runtime_pm: Prefer drm_WARN* over WARN*
2020-04-21 8:28 ` Jani Nikula
@ 2020-04-21 9:48 ` Imre Deak
0 siblings, 0 replies; 69+ messages in thread
From: Imre Deak @ 2020-04-21 9:48 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, Apr 21, 2020 at 11:28:24AM +0300, Jani Nikula wrote:
>
> Imre, please check the one question inline.
>
> On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> > struct drm_device specific drm_WARN* macros include device information
> > in the backtrace, so we know what device the warnings originate from.
> >
> > Prefer drm_WARN* over WARN*.
> >
> > Conversion is done with below semantic patch:
> >
> > @@
> > identifier func, T;
> > @@
> > func(struct intel_runtime_pm *T,...) {
> > + struct drm_i915_private *i915 = container_of(T, struct drm_i915_private, runtime_pm);
> > <+...
> > (
> > -WARN(
> > +drm_WARN(&i915->drm,
> > ...)
> > |
> > -WARN_ON(
> > +drm_WARN_ON(&i915->drm,
> > ...)
> > |
> > -WARN_ONCE(
> > +drm_WARN_ONCE(&i915->drm,
> > ...)
> > |
> > -WARN_ON_ONCE(
> > +drm_WARN_ON_ONCE(&i915->drm,
> > ...)
> > )
> > ...+>
> >
> > }
> >
> > Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_runtime_pm.c | 39 ++++++++++++++++++-------
> > 1 file changed, 28 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> > index ad719c9602af..31ccd0559c55 100644
> > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> > @@ -116,6 +116,9 @@ track_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm)
> > static void untrack_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm,
> > depot_stack_handle_t stack)
> > {
> > + struct drm_i915_private *i915 = container_of(rpm,
> > + struct drm_i915_private,
> > + runtime_pm);
>
> Is this a dependency we want to add? Should struct intel_runtime_pm be
> allowed to be elsewhere than struct i915?
For convenience a pointer to intel_runtime_pm is stored in intel_uncore
and intel_wakeref, but there is only one instance of it. So looks ok to
me to use container_of() on the pointer.
>
> BR,
> Jani.
>
> > unsigned long flags, n;
> > bool found = false;
> >
> > @@ -134,9 +137,9 @@ static void untrack_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm,
> > }
> > spin_unlock_irqrestore(&rpm->debug.lock, flags);
> >
> > - if (WARN(!found,
> > - "Unmatched wakeref (tracking %lu), count %u\n",
> > - rpm->debug.count, atomic_read(&rpm->wakeref_count))) {
> > + if (drm_WARN(&i915->drm, !found,
> > + "Unmatched wakeref (tracking %lu), count %u\n",
> > + rpm->debug.count, atomic_read(&rpm->wakeref_count))) {
> > char *buf;
> >
> > buf = kmalloc(PAGE_SIZE, GFP_NOWAIT | __GFP_NOWARN);
> > @@ -355,10 +358,14 @@ intel_runtime_pm_release(struct intel_runtime_pm *rpm, int wakelock)
> > static intel_wakeref_t __intel_runtime_pm_get(struct intel_runtime_pm *rpm,
> > bool wakelock)
> > {
> > + struct drm_i915_private *i915 = container_of(rpm,
> > + struct drm_i915_private,
> > + runtime_pm);
> > int ret;
> >
> > ret = pm_runtime_get_sync(rpm->kdev);
> > - WARN_ONCE(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
> > + drm_WARN_ONCE(&i915->drm, ret < 0,
> > + "pm_runtime_get_sync() failed: %d\n", ret);
> >
> > intel_runtime_pm_acquire(rpm, wakelock);
> >
> > @@ -539,6 +546,9 @@ void intel_runtime_pm_put(struct intel_runtime_pm *rpm, intel_wakeref_t wref)
> > */
> > void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
> > {
> > + struct drm_i915_private *i915 = container_of(rpm,
> > + struct drm_i915_private,
> > + runtime_pm);
> > struct device *kdev = rpm->kdev;
> >
> > /*
> > @@ -565,7 +575,8 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
> >
> > pm_runtime_dont_use_autosuspend(kdev);
> > ret = pm_runtime_get_sync(kdev);
> > - WARN(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
> > + drm_WARN(&i915->drm, ret < 0,
> > + "pm_runtime_get_sync() failed: %d\n", ret);
> > } else {
> > pm_runtime_use_autosuspend(kdev);
> > }
> > @@ -580,11 +591,14 @@ void intel_runtime_pm_enable(struct intel_runtime_pm *rpm)
> >
> > void intel_runtime_pm_disable(struct intel_runtime_pm *rpm)
> > {
> > + struct drm_i915_private *i915 = container_of(rpm,
> > + struct drm_i915_private,
> > + runtime_pm);
> > struct device *kdev = rpm->kdev;
> >
> > /* Transfer rpm ownership back to core */
> > - WARN(pm_runtime_get_sync(kdev) < 0,
> > - "Failed to pass rpm ownership back to core\n");
> > + drm_WARN(&i915->drm, pm_runtime_get_sync(kdev) < 0,
> > + "Failed to pass rpm ownership back to core\n");
> >
> > pm_runtime_dont_use_autosuspend(kdev);
> >
> > @@ -594,12 +608,15 @@ void intel_runtime_pm_disable(struct intel_runtime_pm *rpm)
> >
> > void intel_runtime_pm_driver_release(struct intel_runtime_pm *rpm)
> > {
> > + struct drm_i915_private *i915 = container_of(rpm,
> > + struct drm_i915_private,
> > + runtime_pm);
> > int count = atomic_read(&rpm->wakeref_count);
> >
> > - WARN(count,
> > - "i915 raw-wakerefs=%d wakelocks=%d on cleanup\n",
> > - intel_rpm_raw_wakeref_count(count),
> > - intel_rpm_wakelock_count(count));
> > + drm_WARN(&i915->drm, count,
> > + "i915 raw-wakerefs=%d wakelocks=%d on cleanup\n",
> > + intel_rpm_raw_wakeref_count(count),
> > + intel_rpm_wakelock_count(count));
> >
> > untrack_all_intel_runtime_pm_wakerefs(rpm);
> > }
>
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
2020-04-21 8:24 ` [Intel-gfx] " Jani Nikula
@ 2020-04-21 9:59 ` Bharadiya,Pankaj
-1 siblings, 0 replies; 69+ messages in thread
From: Bharadiya,Pankaj @ 2020-04-21 9:59 UTC (permalink / raw)
To: Jani Nikula; +Cc: David Airlie, intel-gfx, dri-devel, Rodrigo Vivi
On Tue, Apr 21, 2020 at 11:24:39AM +0300, Jani Nikula wrote:
> On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> > struct drm_device specific drm_WARN* macros include device information
> > in the backtrace, so we know what device the warnings originate from.
> >
> > Prefer drm_WARN_ON over WARN_ON.
> >
> > Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index e9ee4daa9320..be33cab6403d 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1647,7 +1647,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> > #define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0)
> >
> > /* Only valid when HAS_DISPLAY() is true */
> > -#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
> > +#define INTEL_DISPLAY_ENABLED(dev_priv) \
> > + (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
>
> Needs parens around the dev_priv macro argument.
Yeah, missed it. Thanks for pointing out.
Thanks,
Pankaj
>
> BR,
> Jani.
>
> >
> > static inline bool intel_vtd_active(void)
> > {
>
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON
@ 2020-04-21 9:59 ` Bharadiya,Pankaj
0 siblings, 0 replies; 69+ messages in thread
From: Bharadiya,Pankaj @ 2020-04-21 9:59 UTC (permalink / raw)
To: Jani Nikula; +Cc: David Airlie, intel-gfx, dri-devel
On Tue, Apr 21, 2020 at 11:24:39AM +0300, Jani Nikula wrote:
> On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> > struct drm_device specific drm_WARN* macros include device information
> > in the backtrace, so we know what device the warnings originate from.
> >
> > Prefer drm_WARN_ON over WARN_ON.
> >
> > Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index e9ee4daa9320..be33cab6403d 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1647,7 +1647,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> > #define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0)
> >
> > /* Only valid when HAS_DISPLAY() is true */
> > -#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
> > +#define INTEL_DISPLAY_ENABLED(dev_priv) \
> > + (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
>
> Needs parens around the dev_priv macro argument.
Yeah, missed it. Thanks for pointing out.
Thanks,
Pankaj
>
> BR,
> Jani.
>
> >
> > static inline bool intel_vtd_active(void)
> > {
>
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [Intel-gfx] [PATCH 00/18] Prefer drm_WARN* over WARN*
2020-04-21 8:35 ` [Intel-gfx] [PATCH 00/18] Prefer drm_WARN* over WARN* Jani Nikula
@ 2020-04-21 10:01 ` Bharadiya,Pankaj
0 siblings, 0 replies; 69+ messages in thread
From: Bharadiya,Pankaj @ 2020-04-21 10:01 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, Apr 21, 2020 at 11:35:08AM +0300, Jani Nikula wrote:
> On Mon, 06 Apr 2020, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> wrote:
> > Now we have struct drm_device specific drm_WARN* macros which include
> > device information in the backtrace, so we know what device the
> > warnings originate from.
> >
> > This series converts WARN* with drm_WARN* where struct drm_device
> > pointer can be extracted.
>
> I think I pushed all the patches that I didn't comment on separately,
> and that still applied.
Thank you Jani. Will rework on pending patches and resubmit.
Thanks,
Pankaj
>
> BR,
> Jani.
>
>
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 69+ messages in thread
end of thread, other threads:[~2020-04-21 10:09 UTC | newest]
Thread overview: 69+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-06 11:27 [PATCH 00/18] Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 01/18] drm/i915/display/icl_dsi: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 18:08 ` kbuild test robot
2020-04-06 18:08 ` kbuild test robot
2020-04-06 18:08 ` kbuild test robot
2020-04-06 11:27 ` [PATCH 02/18] drm/i915/display/atomic_plane: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 03/18] drm/i915/display/ddi: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 20:21 ` kbuild test robot
2020-04-06 20:21 ` kbuild test robot
2020-04-06 20:21 ` kbuild test robot
2020-04-06 11:27 ` [PATCH 04/18] drm/i915/display/display: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 05/18] " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 7:53 ` Jani Nikula
2020-04-21 9:19 ` Imre Deak
2020-04-06 11:27 ` [PATCH 06/18] drm/i915/display/dp: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 6:56 ` Jani Nikula
2020-04-21 6:56 ` [Intel-gfx] " Jani Nikula
2020-04-06 11:27 ` [PATCH 07/18] drm/i915/display/dpll_mgr: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 08/18] drm/i915/display/frontbuffer: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 09/18] drm/i915/display/global_state: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 10/18] drm/i915/display/overlay: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 11/18] drm/i915/display/sdvo: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 6:55 ` Jani Nikula
2020-04-21 6:55 ` [Intel-gfx] " Jani Nikula
2020-04-06 11:27 ` [PATCH 12/18] drm/i915/display/tc: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 6:57 ` Jani Nikula
2020-04-21 6:57 ` [Intel-gfx] " Jani Nikula
2020-04-06 11:27 ` [PATCH 13/18] drm/i915/display/vlv_dsi: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 22:41 ` kbuild test robot
2020-04-06 11:27 ` [PATCH 14/18] drm/i915/gem: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 8:30 ` Jani Nikula
2020-04-06 11:27 ` [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 8:24 ` Jani Nikula
2020-04-21 8:24 ` [Intel-gfx] " Jani Nikula
2020-04-21 9:59 ` Bharadiya,Pankaj
2020-04-21 9:59 ` [Intel-gfx] " Bharadiya,Pankaj
2020-04-06 11:27 ` [PATCH 16/18] drm/i915/pmu: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-06 11:27 ` [PATCH 17/18] drm/i915/pm: " Pankaj Bharadiya
2020-04-06 11:27 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 8:26 ` Jani Nikula
2020-04-21 8:26 ` [Intel-gfx] " Jani Nikula
2020-04-06 11:28 ` [PATCH 18/18] drm/i915/runtime_pm: Prefer drm_WARN* over WARN* Pankaj Bharadiya
2020-04-06 11:28 ` [Intel-gfx] " Pankaj Bharadiya
2020-04-21 8:28 ` Jani Nikula
2020-04-21 9:48 ` Imre Deak
2020-04-06 11:59 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-04-06 12:28 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2020-04-06 14:47 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Prefer drm_WARN* over WARN* (rev2) Patchwork
2020-04-06 15:14 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-04-06 19:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-04-21 8:35 ` [Intel-gfx] [PATCH 00/18] Prefer drm_WARN* over WARN* Jani Nikula
2020-04-21 10:01 ` Bharadiya,Pankaj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.