From 9370bb92b2d16684ee45cf24e879c93c509162da Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Thu, 19 Dec 2024 01:47:39 +0000 Subject: [PATCH] add wifi6 8852be driver --- kernel/drivers/gpu/drm/drm_atomic_uapi.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/kernel/drivers/gpu/drm/drm_atomic_uapi.c b/kernel/drivers/gpu/drm/drm_atomic_uapi.c index 975ece7..b606283 100644 --- a/kernel/drivers/gpu/drm/drm_atomic_uapi.c +++ b/kernel/drivers/gpu/drm/drm_atomic_uapi.c @@ -75,15 +75,17 @@ state->mode_blob = NULL; if (mode) { + struct drm_property_blob *blob; + drm_mode_convert_to_umode(&umode, mode); - state->mode_blob = - drm_property_create_blob(state->crtc->dev, - sizeof(umode), - &umode); - if (IS_ERR(state->mode_blob)) - return PTR_ERR(state->mode_blob); + blob = drm_property_create_blob(crtc->dev, + sizeof(umode), &umode); + if (IS_ERR(blob)) + return PTR_ERR(blob); drm_mode_copy(&state->mode, mode); + + state->mode_blob = blob; state->enable = true; DRM_DEBUG_ATOMIC("Set [MODE:%s] for [CRTC:%d:%s] state %p\n", mode->name, crtc->base.id, crtc->name, state); @@ -459,16 +461,6 @@ &replaced); state->color_mgmt_changed |= replaced; return ret; -#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT) - } else if (property == config->cubic_lut_property) { - ret = drm_atomic_replace_property_blob_from_id(dev, - &state->cubic_lut, - val, - -1, sizeof(struct drm_color_lut), - &replaced); - state->color_mgmt_changed |= replaced; - return ret; -#endif } else if (property == config->prop_out_fence_ptr) { s32 __user *fence_ptr = u64_to_user_ptr(val); @@ -511,10 +503,6 @@ *val = (state->ctm) ? state->ctm->base.id : 0; else if (property == config->gamma_lut_property) *val = (state->gamma_lut) ? state->gamma_lut->base.id : 0; -#if defined(CONFIG_ROCKCHIP_DRM_CUBIC_LUT) - else if (property == config->cubic_lut_property) - *val = (state->cubic_lut) ? state->cubic_lut->base.id : 0; -#endif else if (property == config->prop_out_fence_ptr) *val = 0; else if (crtc->funcs->atomic_get_property) -- Gitblit v1.6.2