Skip to content

Commit db19c72

Browse files
bpankajlzhenyw
authored andcommitted
drm/i915/gvt: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the backtrace, so we know what device the warnings originate from. Covert all the calls of WARN* with device specific drm_WARN* variants in functions where drm_i915_private struct pointer is readily available. The conversion was done automatically with below coccinelle semantic patch. checkpatch errors/warnings are fixed manually. @rule1@ identifier func, T; @@ func(...) { ... struct drm_i915_private *T = ...; <+... ( -WARN( +drm_WARN(&T->drm, ...) | -WARN_ON( +drm_WARN_ON(&T->drm, ...) | -WARN_ONCE( +drm_WARN_ONCE(&T->drm, ...) | -WARN_ON_ONCE( +drm_WARN_ON_ONCE(&T->drm, ...) ) ...+> } @Rule2@ identifier func, T; @@ func(struct drm_i915_private *T,...) { <+... ( -WARN( +drm_WARN(&T->drm, ...) | -WARN_ON( +drm_WARN_ON(&T->drm, ...) | -WARN_ONCE( +drm_WARN_ONCE(&T->drm, ...) | -WARN_ON_ONCE( +drm_WARN_ON_ONCE(&T->drm, ...) ) ...+> } Signed-off-by: Pankaj Bharadiya <[email protected]> Acked-by: Zhenyu Wang <[email protected]> Signed-off-by: Zhenyu Wang <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 06d63c4 commit db19c72

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

drivers/gpu/drm/i915/gvt/aperture_gm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ void intel_vgpu_write_fence(struct intel_vgpu *vgpu,
134134

135135
assert_rpm_wakelock_held(&dev_priv->runtime_pm);
136136

137-
if (WARN_ON(fence >= vgpu_fence_sz(vgpu)))
137+
if (drm_WARN_ON(&dev_priv->drm, fence >= vgpu_fence_sz(vgpu)))
138138
return;
139139

140140
reg = vgpu->fence.regs[fence];
141-
if (WARN_ON(!reg))
141+
if (drm_WARN_ON(&dev_priv->drm, !reg))
142142
return;
143143

144144
fence_reg_lo = FENCE_REG_GEN6_LO(reg->id);
@@ -167,7 +167,7 @@ static void free_vgpu_fence(struct intel_vgpu *vgpu)
167167
struct i915_fence_reg *reg;
168168
u32 i;
169169

170-
if (WARN_ON(!vgpu_fence_sz(vgpu)))
170+
if (drm_WARN_ON(&dev_priv->drm, !vgpu_fence_sz(vgpu)))
171171
return;
172172

173173
intel_runtime_pm_get(&dev_priv->runtime_pm);

drivers/gpu/drm/i915/gvt/cmd_parser.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@ static int gen8_decode_mi_display_flip(struct parser_exec_state *s,
12301230
dword2 = cmd_val(s, 2);
12311231

12321232
v = (dword0 & GENMASK(21, 19)) >> 19;
1233-
if (WARN_ON(v >= ARRAY_SIZE(gen8_plane_code)))
1233+
if (drm_WARN_ON(&dev_priv->drm, v >= ARRAY_SIZE(gen8_plane_code)))
12341234
return -EBADRQC;
12351235

12361236
info->pipe = gen8_plane_code[v].pipe;
@@ -1250,7 +1250,7 @@ static int gen8_decode_mi_display_flip(struct parser_exec_state *s,
12501250
info->stride_reg = SPRSTRIDE(info->pipe);
12511251
info->surf_reg = SPRSURF(info->pipe);
12521252
} else {
1253-
WARN_ON(1);
1253+
drm_WARN_ON(&dev_priv->drm, 1);
12541254
return -EBADRQC;
12551255
}
12561256
return 0;

drivers/gpu/drm/i915/gvt/display.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ int pipe_is_enabled(struct intel_vgpu *vgpu, int pipe)
7171
{
7272
struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
7373

74-
if (WARN_ON(pipe < PIPE_A || pipe >= I915_MAX_PIPES))
74+
if (drm_WARN_ON(&dev_priv->drm,
75+
pipe < PIPE_A || pipe >= I915_MAX_PIPES))
7576
return -EINVAL;
7677

7778
if (vgpu_vreg_t(vgpu, PIPECONF(pipe)) & PIPECONF_ENABLE)

drivers/gpu/drm/i915/gvt/dmabuf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ static int vgpu_gem_get_pages(
6767
u32 page_num;
6868

6969
fb_info = (struct intel_vgpu_fb_info *)obj->gvt_info;
70-
if (WARN_ON(!fb_info))
70+
if (drm_WARN_ON(&dev_priv->drm, !fb_info))
7171
return -ENODEV;
7272

7373
vgpu = fb_info->obj->vgpu;
74-
if (WARN_ON(!vgpu))
74+
if (drm_WARN_ON(&dev_priv->drm, !vgpu))
7575
return -ENODEV;
7676

7777
st = kmalloc(sizeof(*st), GFP_KERNEL);

drivers/gpu/drm/i915/gvt/edid.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ static int gmbus0_mmio_write(struct intel_vgpu *vgpu,
153153
port = cnp_get_port_from_gmbus0(pin_select);
154154
else
155155
port = get_port_from_gmbus0(pin_select);
156-
if (WARN_ON(port < 0))
156+
if (drm_WARN_ON(&dev_priv->drm, port < 0))
157157
return 0;
158158

159159
vgpu->display.i2c_edid.state = I2C_GMBUS;

drivers/gpu/drm/i915/gvt/gvt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ void intel_gvt_clean_device(struct drm_i915_private *dev_priv)
265265
{
266266
struct intel_gvt *gvt = to_gvt(dev_priv);
267267

268-
if (WARN_ON(!gvt))
268+
if (drm_WARN_ON(&dev_priv->drm, !gvt))
269269
return;
270270

271271
intel_gvt_destroy_idle_vgpu(gvt->idle_vgpu);
@@ -304,7 +304,7 @@ int intel_gvt_init_device(struct drm_i915_private *dev_priv)
304304
struct intel_vgpu *vgpu;
305305
int ret;
306306

307-
if (WARN_ON(dev_priv->gvt))
307+
if (drm_WARN_ON(&dev_priv->drm, dev_priv->gvt))
308308
return -EEXIST;
309309

310310
gvt = kzalloc(sizeof(struct intel_gvt), GFP_KERNEL);

drivers/gpu/drm/i915/gvt/handlers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ static int trigger_aux_channel_interrupt(struct intel_vgpu *vgpu,
836836
reg == i915_mmio_reg_offset(DP_AUX_CH_CTL(AUX_CH_D)))
837837
event = AUX_CHANNEL_D;
838838
else {
839-
WARN_ON(true);
839+
drm_WARN_ON(&dev_priv->drm, true);
840840
return -EINVAL;
841841
}
842842

drivers/gpu/drm/i915/gvt/mmio_context.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ static void handle_tlb_pending_event(struct intel_vgpu *vgpu, int ring_id)
357357
if (!regs)
358358
return;
359359

360-
if (WARN_ON(ring_id >= cnt))
360+
if (drm_WARN_ON(&dev_priv->drm, ring_id >= cnt))
361361
return;
362362

363363
if (!test_and_clear_bit(ring_id, (void *)s->tlb_handle_pending))

0 commit comments

Comments
 (0)