From: Cristian Ciocaltea Date: Tue, 3 Mar 2026 19:24:19 +0000 (+0200) Subject: drm/vkms: Support setting custom background color X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b9eff726d5636a1638786d2f659b8897950533b;p=thirdparty%2Fkernel%2Flinux.git drm/vkms: Support setting custom background color Make use of the BACKGROUND_COLOR CRTC property when filling the background during blending. It already defaults to solid black. Since the internal representation of the pixel color in VKMS relies on 16 bits of precision, use the newly introduced DRM_ARGB64_GET{R|G|B}() helpers to access the individual components of the background color property, which is compliant with DRM_FORMAT_ARGB16161616. It's worth noting the alpha component is ignored, hence non-opaque background colors are not supported. Reviewed-by: Nícolas F. R. A. Prado Tested-by: Diederik de Haas Reviewed-by: Louis Chauvet Signed-off-by: Cristian Ciocaltea Link: https://patch.msgid.link/20260303-rk3588-bgcolor-v8-3-fee377037ad1@collabora.com Signed-off-by: Daniel Stone --- diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index cd85de4ffd03d..83d217085ad09 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -475,8 +475,14 @@ static void blend(struct vkms_writeback_job *wb, { struct vkms_plane_state **plane = crtc_state->active_planes; u32 n_active_planes = crtc_state->num_active_planes; - - const struct pixel_argb_u16 background_color = { .a = 0xffff }; + u64 bgcolor = crtc_state->base.background_color; + + const struct pixel_argb_u16 background_color = { + .a = 0xffff, + .r = DRM_ARGB64_GETR(bgcolor), + .g = DRM_ARGB64_GETG(bgcolor), + .b = DRM_ARGB64_GETB(bgcolor), + }; int crtc_y_limit = crtc_state->base.mode.vdisplay; int crtc_x_limit = crtc_state->base.mode.hdisplay; diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index ba2ff353e1a9a..35ddc553a5e66 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -227,6 +228,8 @@ struct vkms_output *vkms_crtc_init(struct drm_device *dev, struct drm_plane *pri drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE); + drm_crtc_attach_background_color_property(crtc); + spin_lock_init(&vkms_out->lock); spin_lock_init(&vkms_out->composer_lock);