rtl88x2CE_WiFi_linux driver

hc

2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8

 kernel/drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c
..
..
@@ -81,7 +81,7 @@
81
81
 		return ret;
82
82
 	}
83
83
 
84
-	vmw_resource_activate(&simple->res, simple->func->hw_destroy);
84
+	simple->res.hw_destroy = simple->func->hw_destroy;
85
85
 
86
86
 	return 0;
87
87
 }
..
..
@@ -159,7 +159,8 @@
159
159
 
160
160
 	alloc_size = offsetof(struct vmw_user_simple_resource, simple) +
161
161
 	  func->size;
162
-	account_size = ttm_round_pot(alloc_size) + VMW_IDA_ACC_SIZE;
162
+	account_size = ttm_round_pot(alloc_size) + VMW_IDA_ACC_SIZE +
163
+		TTM_OBJ_EXTRA_SIZE;
163
164
 
164
165
 	ret = ttm_read_lock(&dev_priv->reservation_sem, true);
165
166
 	if (ret)
..
..
@@ -208,7 +209,7 @@
208
209
 		goto out_err;
209
210
 	}
210
211
 
211
-	func->set_arg_handle(data, usimple->base.hash.key);
212
+	func->set_arg_handle(data, usimple->base.handle);
212
213
 out_err:
213
214
 	vmw_resource_unreference(&res);
214
215
 out_ret:
..
..
@@ -238,17 +239,17 @@
238
239
 
239
240
 	base = ttm_base_object_lookup(tfile, handle);
240
241
 	if (!base) {
241
-		DRM_ERROR("Invalid %s handle 0x%08lx.\n",
242
-			  func->res_func.type_name,
243
-			  (unsigned long) handle);
242
+		VMW_DEBUG_USER("Invalid %s handle 0x%08lx.\n",
243
+			       func->res_func.type_name,
244
+			       (unsigned long) handle);
244
245
 		return ERR_PTR(-ESRCH);
245
246
 	}
246
247
 
247
248
 	if (ttm_base_object_type(base) != func->ttm_res_type) {
248
249
 		ttm_base_object_unref(&base);
249
-		DRM_ERROR("Invalid type of %s handle 0x%08lx.\n",
250
-			  func->res_func.type_name,
251
-			  (unsigned long) handle);
250
+		VMW_DEBUG_USER("Invalid type of %s handle 0x%08lx.\n",
251
+			       func->res_func.type_name,
252
+			       (unsigned long) handle);
252
253
 		return ERR_PTR(-EINVAL);
253
254
 	}
254
255