Skip to content

Commit 312d100

Browse files
airliedairlied
committed
Merge branch 'vmwgfx-next-5.9' of git://people.freedesktop.org/~sroland/linux into drm-next
The drm_mode_config_reset patches are very important fixing a recently introduced kernel crash, the others fix various older issues which are a bit less serious in practice. Signed-off-by: Dave Airlie <[email protected]> From: "Roland Scheidegger (VMware)" <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 16e6eea + e97644e commit 312d100

File tree

6 files changed

+15
-30
lines changed

6 files changed

+15
-30
lines changed

‎drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3037,7 +3037,7 @@ static int vmw_cmd_dx_bind_streamoutput(struct vmw_private *dev_priv,
30373037
res = vmw_dx_streamoutput_lookup(vmw_context_res_man(ctx_node->ctx),
30383038
cmd->body.soid);
30393039
if (IS_ERR(res)) {
3040-
DRM_ERROR("Cound not find streamoutput to bind.\n");
3040+
DRM_ERROR("Could not find streamoutput to bind.\n");
30413041
return PTR_ERR(res);
30423042
}
30433043

‎drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf,
186186
/* TODO handle none page aligned offsets */
187187
/* TODO handle more dst & src != 0 */
188188
/* TODO handle more then one copy */
189-
DRM_ERROR("Cant snoop dma request for cursor!\n");
189+
DRM_ERROR("Can't snoop dma request for cursor!\n");
190190
DRM_ERROR("(%u, %u, %u) (%u, %u, %u) (%ux%ux%u) %u %u\n",
191191
box->srcx, box->srcy, box->srcz,
192192
box->x, box->y, box->z,
@@ -2575,7 +2575,7 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv,
25752575
++i;
25762576
}
25772577

2578-
if (i != unit) {
2578+
if (&con->head == &dev_priv->dev->mode_config.connector_list) {
25792579
DRM_ERROR("Could not find initial display unit.\n");
25802580
ret = -EINVAL;
25812581
goto out_unlock;
@@ -2599,13 +2599,13 @@ int vmw_kms_fbdev_init_data(struct vmw_private *dev_priv,
25992599
break;
26002600
}
26012601

2602-
if (mode->type & DRM_MODE_TYPE_PREFERRED)
2603-
*p_mode = mode;
2604-
else {
2602+
if (&mode->head == &con->modes) {
26052603
WARN_ONCE(true, "Could not find initial preferred mode.\n");
26062604
*p_mode = list_first_entry(&con->modes,
26072605
struct drm_display_mode,
26082606
head);
2607+
} else {
2608+
*p_mode = mode;
26092609
}
26102610

26112611
out_unlock:

‎drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
8181
struct vmw_legacy_display_unit *entry;
8282
struct drm_framebuffer *fb = NULL;
8383
struct drm_crtc *crtc = NULL;
84-
int i = 0;
84+
int i;
8585

8686
/* If there is no display topology the host just assumes
8787
* that the guest will set the same layout as the host.
@@ -92,12 +92,11 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
9292
crtc = &entry->base.crtc;
9393
w = max(w, crtc->x + crtc->mode.hdisplay);
9494
h = max(h, crtc->y + crtc->mode.vdisplay);
95-
i++;
9695
}
9796

9897
if (crtc == NULL)
9998
return 0;
100-
fb = entry->base.crtc.primary->state->fb;
99+
fb = crtc->primary->state->fb;
101100

102101
return vmw_kms_write_svga(dev_priv, w, h, fb->pitches[0],
103102
fb->format->cpp[0] * 8,
@@ -388,8 +387,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
388387
ldu->base.is_implicit = true;
389388

390389
/* Initialize primary plane */
391-
vmw_du_plane_reset(primary);
392-
393390
ret = drm_universal_plane_init(dev, &ldu->base.primary,
394391
0, &vmw_ldu_plane_funcs,
395392
vmw_primary_plane_formats,
@@ -403,8 +400,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
403400
drm_plane_helper_add(primary, &vmw_ldu_primary_plane_helper_funcs);
404401

405402
/* Initialize cursor plane */
406-
vmw_du_plane_reset(cursor);
407-
408403
ret = drm_universal_plane_init(dev, &ldu->base.cursor,
409404
0, &vmw_ldu_cursor_funcs,
410405
vmw_cursor_plane_formats,
@@ -418,7 +413,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
418413

419414
drm_plane_helper_add(cursor, &vmw_ldu_cursor_plane_helper_funcs);
420415

421-
vmw_du_connector_reset(connector);
422416
ret = drm_connector_init(dev, connector, &vmw_legacy_connector_funcs,
423417
DRM_MODE_CONNECTOR_VIRTUAL);
424418
if (ret) {
@@ -446,7 +440,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
446440
goto err_free_encoder;
447441
}
448442

449-
vmw_du_crtc_reset(crtc);
450443
ret = drm_crtc_init_with_planes(dev, crtc, &ldu->base.primary,
451444
&ldu->base.cursor,
452445
&vmw_legacy_crtc_funcs, NULL);
@@ -521,6 +514,8 @@ int vmw_kms_ldu_init_display(struct vmw_private *dev_priv)
521514

522515
dev_priv->active_display_unit = vmw_du_legacy;
523516

517+
drm_mode_config_reset(dev);
518+
524519
DRM_INFO("Legacy Display Unit initialized\n");
525520

526521
return 0;

‎drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -859,8 +859,6 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
859859
sou->base.is_implicit = false;
860860

861861
/* Initialize primary plane */
862-
vmw_du_plane_reset(primary);
863-
864862
ret = drm_universal_plane_init(dev, &sou->base.primary,
865863
0, &vmw_sou_plane_funcs,
866864
vmw_primary_plane_formats,
@@ -875,8 +873,6 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
875873
drm_plane_enable_fb_damage_clips(primary);
876874

877875
/* Initialize cursor plane */
878-
vmw_du_plane_reset(cursor);
879-
880876
ret = drm_universal_plane_init(dev, &sou->base.cursor,
881877
0, &vmw_sou_cursor_funcs,
882878
vmw_cursor_plane_formats,
@@ -890,7 +886,6 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
890886

891887
drm_plane_helper_add(cursor, &vmw_sou_cursor_plane_helper_funcs);
892888

893-
vmw_du_connector_reset(connector);
894889
ret = drm_connector_init(dev, connector, &vmw_sou_connector_funcs,
895890
DRM_MODE_CONNECTOR_VIRTUAL);
896891
if (ret) {
@@ -918,8 +913,6 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
918913
goto err_free_encoder;
919914
}
920915

921-
922-
vmw_du_crtc_reset(crtc);
923916
ret = drm_crtc_init_with_planes(dev, crtc, &sou->base.primary,
924917
&sou->base.cursor,
925918
&vmw_screen_object_crtc_funcs, NULL);
@@ -973,6 +966,8 @@ int vmw_kms_sou_init_display(struct vmw_private *dev_priv)
973966

974967
dev_priv->active_display_unit = vmw_du_screen_object;
975968

969+
drm_mode_config_reset(dev);
970+
976971
DRM_INFO("Screen Objects Display Unit initialized\n");
977972

978973
return 0;

‎drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,8 +1738,6 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
17381738
stdu->base.is_implicit = false;
17391739

17401740
/* Initialize primary plane */
1741-
vmw_du_plane_reset(primary);
1742-
17431741
ret = drm_universal_plane_init(dev, primary,
17441742
0, &vmw_stdu_plane_funcs,
17451743
vmw_primary_plane_formats,
@@ -1754,8 +1752,6 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
17541752
drm_plane_enable_fb_damage_clips(primary);
17551753

17561754
/* Initialize cursor plane */
1757-
vmw_du_plane_reset(cursor);
1758-
17591755
ret = drm_universal_plane_init(dev, cursor,
17601756
0, &vmw_stdu_cursor_funcs,
17611757
vmw_cursor_plane_formats,
@@ -1769,8 +1765,6 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
17691765

17701766
drm_plane_helper_add(cursor, &vmw_stdu_cursor_plane_helper_funcs);
17711767

1772-
vmw_du_connector_reset(connector);
1773-
17741768
ret = drm_connector_init(dev, connector, &vmw_stdu_connector_funcs,
17751769
DRM_MODE_CONNECTOR_VIRTUAL);
17761770
if (ret) {
@@ -1798,7 +1792,6 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
17981792
goto err_free_encoder;
17991793
}
18001794

1801-
vmw_du_crtc_reset(crtc);
18021795
ret = drm_crtc_init_with_planes(dev, crtc, &stdu->base.primary,
18031796
&stdu->base.cursor,
18041797
&vmw_stdu_crtc_funcs, NULL);
@@ -1894,6 +1887,8 @@ int vmw_kms_stdu_init_display(struct vmw_private *dev_priv)
18941887
}
18951888
}
18961889

1890+
drm_mode_config_reset(dev);
1891+
18971892
DRM_INFO("Screen Target Display device initialized\n");
18981893

18991894
return 0;

‎drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1969,7 +1969,7 @@ static int vmw_surface_dirty_alloc(struct vmw_resource *res)
19691969
num_mip = 1;
19701970

19711971
num_subres = num_layers * num_mip;
1972-
dirty_size = sizeof(*dirty) + num_subres * sizeof(dirty->boxes[0]);
1972+
dirty_size = struct_size(dirty, boxes, num_subres);
19731973
acc_size = ttm_round_pot(dirty_size);
19741974
ret = ttm_mem_global_alloc(vmw_mem_glob(res->dev_priv),
19751975
acc_size, &ctx);

0 commit comments

Comments
 (0)