update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
..
..
@@ -25,9 +25,9 @@
25
25
  *
26
26
  **************************************************************************/
27
27
 
28
-#include "vmwgfx_drv.h"
29
-#include <drm/drmP.h>
30
28
 #include <drm/ttm/ttm_bo_driver.h>
29
+
30
+#include "vmwgfx_drv.h"
31
31
 
32
32
 #define VMW_PPN_SIZE (sizeof(unsigned long))
33
33
 /* A future safe maximum remap size. */
..
..
@@ -51,7 +51,7 @@
51
51
 	uint32_t cmd_size = define_size + remap_size;
52
52
 	uint32_t i;
53
53
 
54
-	cmd_orig = cmd = vmw_fifo_reserve(dev_priv, cmd_size);
54
+	cmd_orig = cmd = VMW_FIFO_RESERVE(dev_priv, cmd_size);
55
55
 	if (unlikely(cmd == NULL))
56
56
 		return -ENOMEM;
57
57
 
..
..
@@ -110,11 +110,10 @@
110
110
 	uint32_t define_size = sizeof(define_cmd) + 4;
111
111
 	uint32_t *cmd;
112
112
 
113
-	cmd = vmw_fifo_reserve(dev_priv, define_size);
114
-	if (unlikely(cmd == NULL)) {
115
-		DRM_ERROR("GMR2 unbind failed.\n");
113
+	cmd = VMW_FIFO_RESERVE(dev_priv, define_size);
114
+	if (unlikely(cmd == NULL))
116
115
 		return;
117
-	}
116
+
118
117
 	define_cmd.gmrId = gmr_id;
119
118
 	define_cmd.numPages = 0;
120
119