From nobody Tue Dec 2 02:51:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE1802D4814 for ; Mon, 17 Nov 2025 23:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763423546; cv=none; b=M/brNo6Gc00gQfkk5KfU8dLzxgwBEzeT+ww29g2mHA6rmHxZ3k+Xwh9TmV5itdtI1gieLqVi/90QDAonvstJcSoSCqkJh9SJecAbHornuDkbiuf32RrpeYYN9hGXp5GAiNJPgJmGRJU67+/fijkbujXrWg50udjHwmALq/ClpRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763423546; c=relaxed/simple; bh=+lxsf3OSskd50eKCDyensIyhpCWxmlJP/CpAxjesv3E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EWPNX1gnB2EX4Dr34rSLSNVI6HnnY85ogk8NwYw/F3DujihqnSbvc4x2M3wv1oVj8wyoHIFuNui4m5W6L/xyUrVBnJ3tv3uhCyrLbHzpXFJrCBWSUqUt5gds3vy56RzYnhf/uNFYIv3844M/pZGPjptqvBb1+UGneyzZDuzBkq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=URzK9UyG; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="URzK9UyG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1763423543; bh=+lxsf3OSskd50eKCDyensIyhpCWxmlJP/CpAxjesv3E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=URzK9UyGZF6AiiIFblckM4+u31ZC9WG4xQg1l0Bh6kHlLBlS6vUAkXUzk4pCVTuVh WtMyWgujwPNcdNLvA3dkTHXtKcBW/IStI95wrI6fsVyerV+BnwFFbRv2qHteTYnaTT TDE7Bup+KICyEbdRWF9CLMPcwRzA4mfdEAYKRs7MtpARX3W6aDqnqGyeUI9J78nG+j swxw6CnAQQcRD99NsIO1aUCd2jAe8+j1XMzZZZ4WiT9QtTkBJf0vdwajPe7iErfuJJ epSrZSJHROAzVIokz8AHI9nGMHRDolTv2bV6OUb/jyq4SJsERWpifrlHDx8GN6Mu/Y /czw+VQF78qEw== Received: from localhost (unknown [82.79.138.145]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 0EBAC17E110D; Tue, 18 Nov 2025 00:52:23 +0100 (CET) From: Cristian Ciocaltea Date: Tue, 18 Nov 2025 01:51:59 +0200 Subject: [PATCH v3 1/4] uapi: Provide DIV_ROUND_CLOSEST() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251118-rk3588-bgcolor-v3-1-a2cc909428ea@collabora.com> References: <20251118-rk3588-bgcolor-v3-0-a2cc909428ea@collabora.com> In-Reply-To: <20251118-rk3588-bgcolor-v3-0-a2cc909428ea@collabora.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: Robert Mader , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org X-Mailer: b4 0.14.3 Currently DIV_ROUND_CLOSEST() is only available for the kernel via include/linux/math.h. Expose it to userland as well by adding __KERNEL_DIV_ROUND_CLOSEST() as a common definition in uapi. Additionally, ensure it allows building ISO C applications by switching from the 'typeof' GNU extension to the ISO-friendly __typeof__. Signed-off-by: Cristian Ciocaltea --- include/linux/math.h | 18 +----------------- include/uapi/linux/const.h | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/include/linux/math.h b/include/linux/math.h index 0198c92cbe3e..24bb868f971c 100644 --- a/include/linux/math.h +++ b/include/linux/math.h @@ -89,23 +89,7 @@ } \ ) =20 -/* - * Divide positive or negative dividend by positive or negative divisor - * and round to closest integer. Result is undefined for negative - * divisors if the dividend variable type is unsigned and for negative - * dividends if the divisor variable type is unsigned. - */ -#define DIV_ROUND_CLOSEST(x, divisor)( \ -{ \ - typeof(x) __x =3D x; \ - typeof(divisor) __d =3D divisor; \ - (((typeof(x))-1) > 0 || \ - ((typeof(divisor))-1) > 0 || \ - (((__x) > 0) =3D=3D ((__d) > 0))) ? \ - (((__x) + ((__d) / 2)) / (__d)) : \ - (((__x) - ((__d) / 2)) / (__d)); \ -} \ -) +#define DIV_ROUND_CLOSEST __KERNEL_DIV_ROUND_CLOSEST /* * Same as above but for u64 dividends. divisor must be a 32-bit * number. diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index b8f629ef135f..471877322f47 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -50,4 +50,21 @@ =20 #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) =20 +/* + * Divide positive or negative dividend by positive or negative divisor + * and round to closest integer. Result is undefined for negative + * divisors if the dividend variable type is unsigned and for negative + * dividends if the divisor variable type is unsigned. + */ +#define __KERNEL_DIV_ROUND_CLOSEST(x, divisor)( \ +{ \ + __typeof__(x) __x =3D x; \ + __typeof__(divisor) __d =3D divisor; \ + (((__typeof__(x))-1) > 0 || \ + ((__typeof__(divisor))-1) > 0 || \ + (((__x) > 0) =3D=3D ((__d) > 0))) ? \ + (((__x) + ((__d) / 2)) / (__d)) : \ + (((__x) - ((__d) / 2)) / (__d)); \ +} \ +) #endif /* _UAPI_LINUX_CONST_H */ --=20 2.51.2 From nobody Tue Dec 2 02:51:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F18DF2FB09C for ; Mon, 17 Nov 2025 23:52:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763423548; cv=none; b=DzjZ96A3V/L4jzc4L8gcfhhP+pBDCjJfkdeFZa0crLP3wqrTo1O+ErQzTyEkD7KyAQLGngSkv3mdCyADM3bpzhEZVJdsMgg0p22cVJjjI1+ZfgBSZlSUpymnw6Eb/VoG5O8FtLp81TAQcO9uSIxO+PsHUL418/Ozs7O17N7zLwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763423548; c=relaxed/simple; bh=TO4Q2w3DQU4y2yCP5EtzYi233sbVx1lxi/LEp43Lwxc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Zk7py3BzdwX2xEbtwOTJcFcNgU+FYv7XDQK+aw8qOmEtJluOajEPCWnD2Q19biJu8VtAVv6QSb/u5O9P9HKZxLM3oDfblsx3ql9iQCRIRY/9mh08Lzy8lPk81rs6aXUqTEP30GBAuoTn5eMr2lRM6qqHAEM6L2mzNOk17SVNlJE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=cIDw35Ep; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="cIDw35Ep" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1763423544; bh=TO4Q2w3DQU4y2yCP5EtzYi233sbVx1lxi/LEp43Lwxc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cIDw35EpHbretKZiT6jByIAZFjmN00bxDWefoyNufV8H8Rsa3eiQNkbRKNhZ/2d8r hqmcvMFJvKtnfY+SsYx1CMjrFtFeEuoVx6uwHfPvqrFrQojGdOUFsSi57C3yalKCg4 w/dJdIWbzkvHygdagvG95jLSA60S2bslHOh9tgzge+xbAXpNyCv3e6AcxKrV5qu1ld 35xwcXqe+J9bjiGATWRulpTKmK1o2b8IpdI1juJk1JbpGV82VrMShsc5ESZ4MabeuL Tn+58Gw37Yj4+bQeuazF8KkqAyMyrjEMjUh2xZBiH3z3aTDzQYM0FuC5qjYjTjQPUp +rCRbpOjKyiyw== Received: from localhost (unknown [82.79.138.145]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id D4E2E17E1389; Tue, 18 Nov 2025 00:52:23 +0100 (CET) From: Cristian Ciocaltea Date: Tue, 18 Nov 2025 01:52:00 +0200 Subject: [PATCH v3 2/4] drm: Add CRTC background color property Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251118-rk3588-bgcolor-v3-2-a2cc909428ea@collabora.com> References: <20251118-rk3588-bgcolor-v3-0-a2cc909428ea@collabora.com> In-Reply-To: <20251118-rk3588-bgcolor-v3-0-a2cc909428ea@collabora.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: Robert Mader , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Matt Roper X-Mailer: b4 0.14.3 Some display controllers can be hardware programmed to show non-black colors for pixels that are either not covered by any plane or are exposed through transparent regions of higher planes. This feature can help reduce memory bandwidth usage, e.g. in compositors managing a UI with a solid background color while using smaller planes to render the remaining content. To support this capability, introduce the BACKGROUND_COLOR standard DRM mode property, which can be attached to a CRTC through the drm_crtc_attach_background_color_property() helper function. Additionally, define a 64-bit ARGB format value to be built with the help of a couple of dedicated DRM_ARGB64_PREP*() helpers. Individual color components can be extracted with desired precision using the corresponding DRM_ARGB64_GET*() macros. Co-developed-by: Matt Roper Signed-off-by: Matt Roper Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/drm_atomic_state_helper.c | 1 + drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_blend.c | 39 ++++++++++++++++-- drivers/gpu/drm/drm_mode_config.c | 6 +++ include/drm/drm_blend.h | 4 +- include/drm/drm_crtc.h | 12 ++++++ include/drm/drm_mode_config.h | 5 +++ include/uapi/drm/drm_mode.h | 67 +++++++++++++++++++++++++++= ++++ 8 files changed, 133 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/dr= m_atomic_state_helper.c index 7142e163e618..fc93ef6eebc4 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -75,6 +75,7 @@ __drm_atomic_helper_crtc_state_reset(struct drm_crtc_stat= e *crtc_state, struct drm_crtc *crtc) { crtc_state->crtc =3D crtc; + crtc_state->background_color =3D DRM_ARGB64_PREP(0xffff, 0, 0, 0); } EXPORT_SYMBOL(__drm_atomic_helper_crtc_state_reset); =20 diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic= _uapi.c index b2cb5ae5a139..211541d753ce 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -407,6 +407,8 @@ static int drm_atomic_crtc_set_property(struct drm_crtc= *crtc, &replaced); state->color_mgmt_changed |=3D replaced; return ret; + } else if (property =3D=3D config->background_color_property) { + state->background_color =3D val; } else if (property =3D=3D config->prop_out_fence_ptr) { s32 __user *fence_ptr =3D u64_to_user_ptr(val); =20 @@ -454,6 +456,8 @@ drm_atomic_crtc_get_property(struct drm_crtc *crtc, *val =3D (state->ctm) ? state->ctm->base.id : 0; else if (property =3D=3D config->gamma_lut_property) *val =3D (state->gamma_lut) ? state->gamma_lut->base.id : 0; + else if (property =3D=3D config->background_color_property) + *val =3D state->background_color; else if (property =3D=3D config->prop_out_fence_ptr) *val =3D 0; else if (property =3D=3D crtc->scaling_filter_property) diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c index 6852d73c931c..f249af2a11af 100644 --- a/drivers/gpu/drm/drm_blend.c +++ b/drivers/gpu/drm/drm_blend.c @@ -191,10 +191,6 @@ * plane does not expose the "alpha" property, then this is * assumed to be 1.0 * - * Note that all the property extensions described here apply either to the - * plane or the CRTC (e.g. for the background color, which currently is not - * exposed and assumed to be black). - * * SCALING_FILTER: * Indicates scaling filter to be used for plane scaler * @@ -207,6 +203,25 @@ * * Drivers can set up this property for a plane by calling * drm_plane_create_scaling_filter_property + * + * The property extensions described above all apply to the plane. Drivers + * may also expose the following crtc property extension: + * + * BACKGROUND_COLOR: + * Background color is set up with drm_crtc_attach_background_color_proper= ty(), + * and expects a 64-bit ARGB value following DRM_FORMAT_ARGB16161616, as + * generated by the DRM_ARGB64_PREP*() helpers. It controls the color of a + * full-screen layer that exists below all planes. This color will be used + * for pixels not covered by any plane and may also be blended with plane + * contents as allowed by a plane's alpha values. + * The background color defaults to black, and is assumed to be black for + * drivers that do not expose this property. Although background color + * isn't a plane, it is assumed that the color provided here undergoes the + * CRTC degamma/CSC/gamma transformations applied after the planes blendin= g. + * Note that the color value includes an alpha channel, hence non-opaque + * background color values are allowed, but since physically transparent + * monitors do not (yet) exists, the final alpha value may not reach the + * video sink or it may simply ignore it. */ =20 /** @@ -621,3 +636,19 @@ int drm_plane_create_blend_mode_property(struct drm_pl= ane *plane, return 0; } EXPORT_SYMBOL(drm_plane_create_blend_mode_property); + +/** + * drm_crtc_attach_background_color_property - attach background color pro= perty + * @crtc: drm crtc + * + * Attaches the background color property to @crtc. The property defaults= to + * solid black and will accept 64-bit ARGB values in the format generated = by + * DRM_ARGB64_PREP*() helpers. + */ +void drm_crtc_attach_background_color_property(struct drm_crtc *crtc) +{ + drm_object_attach_property(&crtc->base, + crtc->dev->mode_config.background_color_property, + DRM_ARGB64_PREP(0xffff, 0, 0, 0)); +} +EXPORT_SYMBOL(drm_crtc_attach_background_color_property); diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_c= onfig.c index 25f376869b3a..6d70bfab45ca 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -375,6 +375,12 @@ static int drm_mode_create_standard_properties(struct = drm_device *dev) return -ENOMEM; dev->mode_config.gamma_lut_size_property =3D prop; =20 + prop =3D drm_property_create_range(dev, 0, + "BACKGROUND_COLOR", 0, U64_MAX); + if (!prop) + return -ENOMEM; + dev->mode_config.background_color_property =3D prop; + prop =3D drm_property_create(dev, DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB, "IN_FORMATS", 0); diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h index 88bdfec3bd88..c7e888767c81 100644 --- a/include/drm/drm_blend.h +++ b/include/drm/drm_blend.h @@ -31,8 +31,9 @@ #define DRM_MODE_BLEND_COVERAGE 1 #define DRM_MODE_BLEND_PIXEL_NONE 2 =20 -struct drm_device; struct drm_atomic_state; +struct drm_crtc; +struct drm_device; struct drm_plane; =20 static inline bool drm_rotation_90_or_270(unsigned int rotation) @@ -58,4 +59,5 @@ int drm_atomic_normalize_zpos(struct drm_device *dev, struct drm_atomic_state *state); int drm_plane_create_blend_mode_property(struct drm_plane *plane, unsigned int supported_modes); +void drm_crtc_attach_background_color_property(struct drm_crtc *crtc); #endif diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 66278ffeebd6..d99a74258d3d 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -274,6 +274,18 @@ struct drm_crtc_state { */ struct drm_property_blob *gamma_lut; =20 + /** + * @background_color: + * + * RGB value representing the pipe's background color. The background + * color (aka "canvas color") of a pipe is the color that will be used + * for pixels not covered by a plane, or covered by transparent pixels + * of a plane. The value here should be built using DRM_ARGB64_PREP*() + * helpers, while the individual color components can be extracted with + * desired precision via the DRM_ARGB64_GET*() macros. + */ + u64 background_color; + /** * @target_vblank: * diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index 2e848b816218..ea422afec5c4 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -814,6 +814,11 @@ struct drm_mode_config { * gamma LUT as supported by the driver (read-only). */ struct drm_property *gamma_lut_size_property; + /** + * @background_color_property: Optional CRTC property to set the + * background color. + */ + struct drm_property *background_color_property; =20 /** * @suggested_x_property: Optional connector property with a hint for diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 1e0e02a79b5c..63b9489fd582 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -27,6 +27,8 @@ #ifndef _DRM_MODE_H #define _DRM_MODE_H =20 +#include + #include "drm.h" =20 #if defined(__cplusplus) @@ -1411,6 +1413,71 @@ struct drm_mode_closefb { __u32 pad; }; =20 +/* + * Put 16-bit ARGB values into a standard 64-bit representation that can be + * used for ioctl parameters, inter-driver communication, etc. + * + * If the component values being provided contain less than 16 bits of + * precision, use a conversion ratio to get a better color approximation. + * The ratio is computed as (2^16 - 1) / (2^bpc - 1), where bpc and 16 are + * the input and output precision, respectively. + */ +#define __DRM_ARGB64_PREP(c, shift) \ + (((__u64)(c) & 0xffffU) << (shift)) + +#define __DRM_ARGB64_PREP_BPC(c, shift, bpc)( \ +{ \ + __u16 mask =3D (1U << (bpc)) - 1; \ + __u16 conv =3D __KERNEL_DIV_ROUND_CLOSEST((mask & (c)) * \ + 0xffffU, mask); \ + __DRM_ARGB64_PREP(conv, shift); \ +} \ +) + +#define DRM_ARGB64_PREP_BPC(alpha, red, green, blue, bpc)( \ +{ \ + __typeof__(bpc) __bpc =3D bpc; \ + __DRM_ARGB64_PREP_BPC(alpha, 48, __bpc) | \ + __DRM_ARGB64_PREP_BPC(red, 32, __bpc) | \ + __DRM_ARGB64_PREP_BPC(green, 16, __bpc) | \ + __DRM_ARGB64_PREP_BPC(blue, 0, __bpc); \ +} \ +) + +#define DRM_ARGB64_PREP(alpha, red, green, blue) \ + (__DRM_ARGB64_PREP(alpha, 48) | \ + __DRM_ARGB64_PREP(red, 32) | \ + __DRM_ARGB64_PREP(green, 16) | \ + __DRM_ARGB64_PREP(blue, 0)) + +/* + * Extract the specified color component from a standard 64-bit ARGB value. + * + * If the requested precision is less than 16 bits, make use of a conversi= on + * ratio calculated as (2^bpc - 1) / (2^16 - 1), where bpc and 16 are the + * output and input precision, respectively. + */ +#define __DRM_ARGB64_GET(c, shift) \ + ((__u16)(((__u64)(c) >> (shift)) & 0xffffU)) + +#define __DRM_ARGB64_GET_BPC(c, shift, bpc)( \ +{ \ + __u16 comp =3D __DRM_ARGB64_GET(c, shift); \ + __KERNEL_DIV_ROUND_CLOSEST(comp * ((1U << (bpc)) - 1), \ + 0xffffU); \ +} \ +) + +#define DRM_ARGB64_GETA_BPC(c, bpc) __DRM_ARGB64_GET_BPC(c, 48, bpc) +#define DRM_ARGB64_GETR_BPC(c, bpc) __DRM_ARGB64_GET_BPC(c, 32, bpc) +#define DRM_ARGB64_GETG_BPC(c, bpc) __DRM_ARGB64_GET_BPC(c, 16, bpc) +#define DRM_ARGB64_GETB_BPC(c, bpc) __DRM_ARGB64_GET_BPC(c, 0, bpc) + +#define DRM_ARGB64_GETA(c) __DRM_ARGB64_GET(c, 48) +#define DRM_ARGB64_GETR(c) __DRM_ARGB64_GET(c, 32) +#define DRM_ARGB64_GETG(c) __DRM_ARGB64_GET(c, 16) +#define DRM_ARGB64_GETB(c) __DRM_ARGB64_GET(c, 0) + #if defined(__cplusplus) } #endif --=20 2.51.2 From nobody Tue Dec 2 02:51:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75D9B308F3B for ; Mon, 17 Nov 2025 23:52:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763423548; cv=none; b=hiB9qxsFdq22bIpD1rbVGMwisXIBqr4JPb6Sm/RSJLC7TxBl8iuNMc1XOWEIUmez6FURrcEqwZhuMguYhU5l/cOo/jqq9/wV+hwyvNpLAeuvsM2qgVQtw2goBGURQERcY42mh64wCZwok3QKISFmvzPBLAdhYgcdJ8EMzuo71N8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763423548; c=relaxed/simple; bh=dIOwX9G/bnHkpO+u+K2WCU5k3EZnJIIE/FI3gW8sb58=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZLGnHrgNqeAfb1Ru92YziaN4r4qmrZ0KA0o/TPNHknXNVZofOW6HE4qVECNrkfiaJk3kgYvfjE7YuHkEPVcy+3TJzIdFCYLIcX3IQVzqX4+1/E3cXFW3hwK3NlEKgS26/nja2o8wPJ498BVm6eac1NwOQV4G2ByrzZUCaJNZRx8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=IuePNmMz; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="IuePNmMz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1763423544; bh=dIOwX9G/bnHkpO+u+K2WCU5k3EZnJIIE/FI3gW8sb58=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IuePNmMzQ3tCwvsz+dDnjvkQF9cS/tX2c3nEN2IRp/vb6zjUDvDTaN/gsSSjTkQ+K Lx9NWNYtxwU1TP+VxHWI9HPgxeFjgdCoJ9xNOBkmL3oZ0l5vcmNQFY83pUyWAxicqC GC+lVBhsXt5M1xK97+iWEd49KM8LVUgpmM4kJmL5az1Cmlo7SZxDK1u4G/Rsx0+/Xi JPNgxU0Lo6dtw/iWH006DjNczyAQhJTy9fAqJrcKWIK4xG3/7v65/RynelegBdEqwI eX/MHvZgOVOjTe43vCTlh7VIJuzoOkMTHk9T/Q18sCmG7jrycQBBwkBRabUJrtn+Eo m0RygKFP/rzGg== Received: from localhost (unknown [82.79.138.145]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 9A44917E13D0; Tue, 18 Nov 2025 00:52:24 +0100 (CET) From: Cristian Ciocaltea Date: Tue, 18 Nov 2025 01:52:01 +0200 Subject: [PATCH v3 3/4] drm/vkms: Support setting custom background color Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251118-rk3588-bgcolor-v3-3-a2cc909428ea@collabora.com> References: <20251118-rk3588-bgcolor-v3-0-a2cc909428ea@collabora.com> In-Reply-To: <20251118-rk3588-bgcolor-v3-0-a2cc909428ea@collabora.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: Robert Mader , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org X-Mailer: b4 0.14.3 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. Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/vkms/vkms_composer.c | 10 ++++++++-- drivers/gpu/drm/vkms/vkms_crtc.c | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index c1ab12a44621..19e73817bf78 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -373,8 +373,14 @@ static void blend(struct vkms_writeback_job *wb, { struct vkms_plane_state **plane =3D crtc_state->active_planes; u32 n_active_planes =3D crtc_state->num_active_planes; - - const struct pixel_argb_u16 background_color =3D { .a =3D 0xffff }; + u64 bgcolor =3D crtc_state->base.background_color; + + const struct pixel_argb_u16 background_color =3D { + .a =3D 0xffff, + .r =3D DRM_ARGB64_GETR(bgcolor), + .g =3D DRM_ARGB64_GETG(bgcolor), + .b =3D DRM_ARGB64_GETB(bgcolor), + }; =20 int crtc_y_limit =3D crtc_state->base.mode.vdisplay; int crtc_x_limit =3D crtc_state->base.mode.hdisplay; diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 9a7db1d51022..2514c367f710 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -4,6 +4,7 @@ =20 #include #include +#include #include #include #include @@ -228,6 +229,8 @@ struct vkms_output *vkms_crtc_init(struct drm_device *d= ev, struct drm_plane *pri =20 drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE); =20 + drm_crtc_attach_background_color_property(crtc); + spin_lock_init(&vkms_out->lock); spin_lock_init(&vkms_out->composer_lock); =20 --=20 2.51.2 From nobody Tue Dec 2 02:51:45 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 373C930AD1A for ; Mon, 17 Nov 2025 23:52:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763423549; cv=none; b=EDthHxM9gwlFYEBobctOjWsMYvlZkYFVTK4gRjmEIpnJGX5TeWuvp9+pvm0jvPYTj1XvbmqYjxz9O+hold49NHtfyeikrkVcrTJjsJCDqgTLKRg2kWWkZUW6gbPNBIEWZfh9+xWW4LIYTvVZ2z5DvKtaK6BH+RBeuP2q5so9TKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763423549; c=relaxed/simple; bh=Yi8YFilCFELNvKt975DJMvkmB1E3qHmlHkHzrFziLIg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iE5ZtpCVIz+ip1oKluMp+gDaJvYT3At4LA99OffVtWl1m/5C97Pj1dvWLIdYJccXswaIdoolmrZtgfQq5BEHf/Xk39sybqExsh0eHbHNPAZgoywG4MC9HTrUfxqB/keGweVhrVjX3eH8OwpEiN+AQe7+l+OF+HgCFR0BWUiWEdA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=CS8VGMPC; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="CS8VGMPC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1763423545; bh=Yi8YFilCFELNvKt975DJMvkmB1E3qHmlHkHzrFziLIg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CS8VGMPCCfq3DQtRCA4tSmpLJVUgrlwuG1ERRSCLszldXVDERXgAlq1S3X1BytW/i 5De3C8t2j0EzCSm5FO4Rym0abqXWt4ooRrIz4qYgo5nnl638yRXsJFnqllZLGpcMro ajddAa4oke9My+BQ1tIR0aqGFDdbH8LZ8LKIU8k4v1I7ANk1dTNA7Az8E3MmLi3jQ4 ZcHapS9WNJQzU7YCeOUYCrblyVNCnqmgiHvP0OOy5cS7kUMLX++Y0kDfHU7fvVHFrg Db7m4xDzcKmj+vgnGASeN9XUtDMBx4hG1ltyCMozy6qrUsoo969lZyA1k8ysUsvdF6 pY1jA4lk9+UKw== Received: from localhost (unknown [82.79.138.145]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 68C8017E13E4; Tue, 18 Nov 2025 00:52:25 +0100 (CET) From: Cristian Ciocaltea Date: Tue, 18 Nov 2025 01:52:02 +0200 Subject: [PATCH v3 4/4] drm/rockchip: vop2: Support setting custom background color Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251118-rk3588-bgcolor-v3-4-a2cc909428ea@collabora.com> References: <20251118-rk3588-bgcolor-v3-0-a2cc909428ea@collabora.com> In-Reply-To: <20251118-rk3588-bgcolor-v3-0-a2cc909428ea@collabora.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: Robert Mader , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org X-Mailer: b4 0.14.3 The Rockchip VOP2 display controller allows configuring the background color of each video output port. Since a previous patch introduced the BACKGROUND_COLOR CRTC property, which defaults to solid black, make use of it when programming the hardware. Note the maximum precision allowed by the display controller is 10bpc, while the alpha component is not supported, hence ignored. Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 13 ++++++++++++- drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 498df0ce4680..87110beba366 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1554,6 +1554,7 @@ static void vop2_post_config(struct drm_crtc *crtc) struct vop2_video_port *vp =3D to_vop2_video_port(crtc); struct vop2 *vop2 =3D vp->vop2; struct drm_display_mode *mode =3D &crtc->state->adjusted_mode; + u64 bgcolor =3D crtc->state->background_color; u16 vtotal =3D mode->crtc_vtotal; u16 hdisplay =3D mode->crtc_hdisplay; u16 hact_st =3D mode->crtc_htotal - mode->crtc_hsync_start; @@ -1599,7 +1600,11 @@ static void vop2_post_config(struct drm_crtc *crtc) vop2_vp_write(vp, RK3568_VP_POST_DSP_VACT_INFO_F1, val); } =20 - vop2_vp_write(vp, RK3568_VP_DSP_BG, 0); + /* Background color is programmed with 10 bits of precision */ + val =3D FIELD_PREP(RK3568_VP_DSP_BG__DSP_BG_RED, DRM_ARGB64_GETR_BPC(bgco= lor, 10)); + val |=3D FIELD_PREP(RK3568_VP_DSP_BG__DSP_BG_GREEN, DRM_ARGB64_GETG_BPC(b= gcolor, 10)); + val |=3D FIELD_PREP(RK3568_VP_DSP_BG__DSP_BG_BLUE, DRM_ARGB64_GETB_BPC(bg= color, 10)); + vop2_vp_write(vp, RK3568_VP_DSP_BG, val); } =20 static int us_to_vertical_line(struct drm_display_mode *mode, int us) @@ -1984,6 +1989,10 @@ static int vop2_crtc_state_dump(struct drm_crtc *crt= c, struct seq_file *s) drm_get_bus_format_name(vcstate->bus_format)); seq_printf(s, "\toutput_mode[%x]", vcstate->output_mode); seq_printf(s, " color_space[%d]\n", vcstate->color_space); + seq_printf(s, "\tbackground color (10bpc): r=3D0x%x g=3D0x%x b=3D0x%x\n", + DRM_ARGB64_GETR_BPC(cstate->background_color, 10), + DRM_ARGB64_GETG_BPC(cstate->background_color, 10), + DRM_ARGB64_GETB_BPC(cstate->background_color, 10)); seq_printf(s, " Display mode: %dx%d%s%d\n", mode->hdisplay, mode->vdisplay, interlaced ? "i" : "p", drm_mode_vrefresh(mode)); @@ -2473,6 +2482,8 @@ static int vop2_create_crtcs(struct vop2 *vop2) return dev_err_probe(drm->dev, ret, "crtc init for video_port%d failed\n", i); =20 + drm_crtc_attach_background_color_property(&vp->crtc); + drm_crtc_helper_add(&vp->crtc, &vop2_crtc_helper_funcs); if (vop2->lut_regs) { const struct vop2_video_port_data *vp_data =3D &vop2_data->vp[vp->id]; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.h index 9124191899ba..37722652844a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h @@ -658,6 +658,10 @@ enum dst_factor_mode { #define RK3588_VP_CLK_CTRL__DCLK_OUT_DIV GENMASK(3, 2) #define RK3588_VP_CLK_CTRL__DCLK_CORE_DIV GENMASK(1, 0) =20 +#define RK3568_VP_DSP_BG__DSP_BG_RED GENMASK(29, 20) +#define RK3568_VP_DSP_BG__DSP_BG_GREEN GENMASK(19, 10) +#define RK3568_VP_DSP_BG__DSP_BG_BLUE GENMASK(9, 0) + #define RK3568_VP_POST_SCL_CTRL__VSCALEDOWN BIT(1) #define RK3568_VP_POST_SCL_CTRL__HSCALEDOWN BIT(0) =20 --=20 2.51.2