移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/gpu/drm/drm_mode_object.c
..
..
@@ -21,9 +21,14 @@
21
21
  */
22
22
 
23
23
 #include <linux/export.h>
24
-#include <drm/drmP.h>
25
-#include <drm/drm_mode_object.h>
24
+#include <linux/uaccess.h>
25
+
26
26
 #include <drm/drm_atomic.h>
27
+#include <drm/drm_drv.h>
28
+#include <drm/drm_device.h>
29
+#include <drm/drm_file.h>
30
+#include <drm/drm_mode_object.h>
31
+#include <drm/drm_print.h>
27
32
 
28
33
 #include "drm_crtc_internal.h"
29
34
 
..
..
@@ -37,8 +42,11 @@
37
42
 {
38
43
 	int ret;
39
44
 
45
+	WARN_ON(!dev->driver->load && dev->registered && !obj_free_cb);
46
+
40
47
 	mutex_lock(&dev->mode_config.idr_mutex);
41
-	ret = idr_alloc(&dev->mode_config.crtc_idr, register_obj ? obj : NULL, 1, 0, GFP_KERNEL);
48
+	ret = idr_alloc(&dev->mode_config.object_idr, register_obj ? obj : NULL,
49
+			1, 0, GFP_KERNEL);
42
50
 	if (ret >= 0) {
43
51
 		/*
44
52
 		 * Set up the object linking under the protection of the idr
..
..
@@ -78,7 +86,7 @@
78
86
 			      struct drm_mode_object *obj)
79
87
 {
80
88
 	mutex_lock(&dev->mode_config.idr_mutex);
81
-	idr_replace(&dev->mode_config.crtc_idr, obj, obj->id);
89
+	idr_replace(&dev->mode_config.object_idr, obj, obj->id);
82
90
 	mutex_unlock(&dev->mode_config.idr_mutex);
83
91
 }
84
92
 
..
..
@@ -96,9 +104,11 @@
96
104
 void drm_mode_object_unregister(struct drm_device *dev,
97
105
 				struct drm_mode_object *object)
98
106
 {
107
+	WARN_ON(!dev->driver->load && dev->registered && !object->free_cb);
108
+
99
109
 	mutex_lock(&dev->mode_config.idr_mutex);
100
110
 	if (object->id) {
101
-		idr_remove(&dev->mode_config.crtc_idr, object->id);
111
+		idr_remove(&dev->mode_config.object_idr, object->id);
102
112
 		object->id = 0;
103
113
 	}
104
114
 	mutex_unlock(&dev->mode_config.idr_mutex);
..
..
@@ -130,7 +140,7 @@
130
140
 	struct drm_mode_object *obj = NULL;
131
141
 
132
142
 	mutex_lock(&dev->mode_config.idr_mutex);
133
-	obj = idr_find(&dev->mode_config.crtc_idr, id);
143
+	obj = idr_find(&dev->mode_config.object_idr, id);
134
144
 	if (obj && type != DRM_MODE_OBJECT_ANY && obj->type != type)
135
145
 		obj = NULL;
136
146
 	if (obj && obj->id != id)
..
..
@@ -214,12 +224,26 @@
214
224
  * This attaches the given property to the modeset object with the given initial
215
225
  * value. Currently this function cannot fail since the properties are stored in
216
226
  * a statically sized array.
227
+ *
228
+ * Note that all properties must be attached before the object itself is
229
+ * registered and accessible from userspace.
217
230
  */
218
231
 void drm_object_attach_property(struct drm_mode_object *obj,
219
232
 				struct drm_property *property,
220
233
 				uint64_t init_val)
221
234
 {
222
235
 	int count = obj->properties->count;
236
+	struct drm_device *dev = property->dev;
237
+
238
+
239
+	if (obj->type == DRM_MODE_OBJECT_CONNECTOR) {
240
+		struct drm_connector *connector = obj_to_connector(obj);
241
+
242
+		WARN_ON(!dev->driver->load &&
243
+			connector->registration_state == DRM_CONNECTOR_REGISTERED);
244
+	} else {
245
+		WARN_ON(!dev->driver->load && dev->registered);
246
+	}
223
247
 
224
248
 	if (count == DRM_OBJECT_MAX_PROPERTY) {
225
249
 		WARN(1, "Failed to attach object property (type: 0x%x). Please "
..
..
@@ -378,12 +402,13 @@
378
402
 {
379
403
 	struct drm_mode_obj_get_properties *arg = data;
380
404
 	struct drm_mode_object *obj;
405
+	struct drm_modeset_acquire_ctx ctx;
381
406
 	int ret = 0;
382
407
 
383
408
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
384
-		return -EINVAL;
409
+		return -EOPNOTSUPP;
385
410
 
386
-	drm_modeset_lock_all(dev);
411
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
387
412
 
388
413
 	obj = drm_mode_object_find(dev, file_priv, arg->obj_id, arg->obj_type);
389
414
 	if (!obj) {
..
..
@@ -403,7 +428,7 @@
403
428
 out_unref:
404
429
 	drm_mode_object_put(obj);
405
430
 out:
406
-	drm_modeset_unlock_all(dev);
431
+	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
407
432
 	return ret;
408
433
 }
409
434
 
..
..
@@ -425,12 +450,13 @@
425
450
 {
426
451
 	struct drm_device *dev = prop->dev;
427
452
 	struct drm_mode_object *ref;
453
+	struct drm_modeset_acquire_ctx ctx;
428
454
 	int ret = -EINVAL;
429
455
 
430
456
 	if (!drm_property_change_valid_get(prop, prop_value, &ref))
431
457
 		return -EINVAL;
432
458
 
433
-	drm_modeset_lock_all(dev);
459
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
434
460
 	switch (obj->type) {
435
461
 	case DRM_MODE_OBJECT_CONNECTOR:
436
462
 		ret = drm_connector_set_obj_prop(obj, prop, prop_value);
..
..
@@ -444,12 +470,13 @@
444
470
 		break;
445
471
 	}
446
472
 	drm_property_change_valid_put(prop, ref);
447
-	drm_modeset_unlock_all(dev);
473
+	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
448
474
 
449
475
 	return ret;
450
476
 }
451
477
 
452
478
 static int set_property_atomic(struct drm_mode_object *obj,
479
+			       struct drm_file *file_priv,
453
480
 			       struct drm_property *prop,
454
481
 			       uint64_t prop_value)
455
482
 {
..
..
@@ -476,7 +503,7 @@
476
503
 						       obj_to_connector(obj),
477
504
 						       prop_value);
478
505
 	} else {
479
-		ret = drm_atomic_set_property(state, obj, prop, prop_value);
506
+		ret = drm_atomic_set_property(state, file_priv, obj, prop, prop_value);
480
507
 		if (ret)
481
508
 			goto out;
482
509
 		ret = drm_atomic_commit(state);
..
..
@@ -505,7 +532,7 @@
505
532
 	int ret = -EINVAL;
506
533
 
507
534
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
508
-		return -EINVAL;
535
+		return -EOPNOTSUPP;
509
536
 
510
537
 	arg_obj = drm_mode_object_find(dev, file_priv, arg->obj_id, arg->obj_type);
511
538
 	if (!arg_obj)
..
..
@@ -519,7 +546,7 @@
519
546
 		goto out_unref;
520
547
 
521
548
 	if (drm_drv_uses_atomic_modeset(property->dev))
522
-		ret = set_property_atomic(arg_obj, property, arg->value);
549
+		ret = set_property_atomic(arg_obj, file_priv, property, arg->value);
523
550
 	else
524
551
 		ret = set_property_legacy(arg_obj, property, arg->value);
525
552