hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/gpu/drm/drm_atomic_uapi.c
....@@ -75,15 +75,17 @@
7575 state->mode_blob = NULL;
7676
7777 if (mode) {
78
+ struct drm_property_blob *blob;
79
+
7880 drm_mode_convert_to_umode(&umode, mode);
79
- state->mode_blob =
80
- drm_property_create_blob(state->crtc->dev,
81
- sizeof(umode),
82
- &umode);
83
- if (IS_ERR(state->mode_blob))
84
- return PTR_ERR(state->mode_blob);
81
+ blob = drm_property_create_blob(crtc->dev,
82
+ sizeof(umode), &umode);
83
+ if (IS_ERR(blob))
84
+ return PTR_ERR(blob);
8585
8686 drm_mode_copy(&state->mode, mode);
87
+
88
+ state->mode_blob = blob;
8789 state->enable = true;
8890 DRM_DEBUG_ATOMIC("Set [MODE:%s] for [CRTC:%d:%s] state %p\n",
8991 mode->name, crtc->base.id, crtc->name, state);
....@@ -459,16 +461,6 @@
459461 &replaced);
460462 state->color_mgmt_changed |= replaced;
461463 return ret;
462
-#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT)
463
- } else if (property == config->cubic_lut_property) {
464
- ret = drm_atomic_replace_property_blob_from_id(dev,
465
- &state->cubic_lut,
466
- val,
467
- -1, sizeof(struct drm_color_lut),
468
- &replaced);
469
- state->color_mgmt_changed |= replaced;
470
- return ret;
471
-#endif
472464 } else if (property == config->prop_out_fence_ptr) {
473465 s32 __user *fence_ptr = u64_to_user_ptr(val);
474466
....@@ -511,10 +503,6 @@
511503 *val = (state->ctm) ? state->ctm->base.id : 0;
512504 else if (property == config->gamma_lut_property)
513505 *val = (state->gamma_lut) ? state->gamma_lut->base.id : 0;
514
-#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT)
515
- else if (property == config->cubic_lut_property)
516
- *val = (state->cubic_lut) ? state->cubic_lut->base.id : 0;
517
-#endif
518506 else if (property == config->prop_out_fence_ptr)
519507 *val = 0;
520508 else if (crtc->funcs->atomic_get_property)