projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 8fece351 GKH |
1 | From 1883598d4201361a6d2ce785095695f58071ee11 Mon Sep 17 00:00:00 2001 |
| 2 | From: Charmaine Lee <charmainel@vmware.com> | |
| 3 | Date: Tue, 12 Apr 2016 08:14:23 -0700 | |
| 4 | Subject: drm/vmwgfx: Enable SVGA_3D_CMD_DX_SET_PREDICATION | |
| 5 | ||
| 6 | From: Charmaine Lee <charmainel@vmware.com> | |
| 7 | ||
| 8 | commit 1883598d4201361a6d2ce785095695f58071ee11 upstream. | |
| 9 | ||
| 10 | Fixes piglit tests nv_conditional_render-* crashes. | |
| 11 | ||
| 12 | Signed-off-by: Charmaine Lee <charmainel@vmware.com> | |
| 13 | Reviewed-by: Brian Paul <brianp@vmware.com> | |
| 14 | Reviewed-by: Sinclair Yeh <syeh@vmware.com> | |
| 15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 16 | ||
| 17 | --- | |
| 18 | drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- | |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 20 | ||
| 21 | --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | |
| 22 | +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | |
| 23 | @@ -3285,7 +3285,7 @@ static const struct vmw_cmd_entry vmw_cm | |
| 24 | true, false, true), | |
| 25 | VMW_CMD_DEF(SVGA_3D_CMD_DX_READBACK_QUERY, &vmw_cmd_invalid, | |
| 26 | true, false, true), | |
| 27 | - VMW_CMD_DEF(SVGA_3D_CMD_DX_SET_PREDICATION, &vmw_cmd_invalid, | |
| 28 | + VMW_CMD_DEF(SVGA_3D_CMD_DX_SET_PREDICATION, &vmw_cmd_dx_cid_check, | |
| 29 | true, false, true), | |
| 30 | VMW_CMD_DEF(SVGA_3D_CMD_DX_SET_VIEWPORTS, &vmw_cmd_dx_cid_check, | |
| 31 | true, false, true), |