mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 21:52:29 -04:00
drm/colorop: Add BYPASS property
We want to be able to bypass each colorop at all times. Introduce a new BYPASS boolean property for this. Reviewed-by: Simon Ser <contact@emersion.fr> Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com> Signed-off-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Melissa Wen <mwen@igalia.com> Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com> Signed-off-by: Simon Ser <contact@emersion.fr> Link: https://patch.msgid.link/20251115000237.3561250-8-alex.hung@amd.com
This commit is contained in:
committed by
Simon Ser
parent
41651f9d42
commit
8c5ea1745f
@@ -655,7 +655,9 @@ static int drm_atomic_colorop_set_property(struct drm_colorop *colorop,
|
||||
struct drm_property *property,
|
||||
uint64_t val)
|
||||
{
|
||||
if (property == colorop->curve_1d_type_property) {
|
||||
if (property == colorop->bypass_property) {
|
||||
state->bypass = val;
|
||||
} else if (property == colorop->curve_1d_type_property) {
|
||||
state->curve_1d_type = val;
|
||||
} else {
|
||||
drm_dbg_atomic(colorop->dev,
|
||||
@@ -675,6 +677,8 @@ drm_atomic_colorop_get_property(struct drm_colorop *colorop,
|
||||
{
|
||||
if (property == colorop->type_property)
|
||||
*val = colorop->type;
|
||||
else if (property == colorop->bypass_property)
|
||||
*val = state->bypass;
|
||||
else if (property == colorop->curve_1d_type_property)
|
||||
*val = state->curve_1d_type;
|
||||
else
|
||||
|
||||
@@ -78,6 +78,17 @@ static int drm_plane_colorop_init(struct drm_device *dev, struct drm_colorop *co
|
||||
colorop->type_property,
|
||||
colorop->type);
|
||||
|
||||
/* bypass */
|
||||
prop = drm_property_create_bool(dev, DRM_MODE_PROP_ATOMIC,
|
||||
"BYPASS");
|
||||
if (!prop)
|
||||
return -ENOMEM;
|
||||
|
||||
colorop->bypass_property = prop;
|
||||
drm_object_attach_property(&colorop->base,
|
||||
colorop->bypass_property,
|
||||
1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -134,6 +145,7 @@ int drm_plane_colorop_curve_1d_init(struct drm_device *dev, struct drm_colorop *
|
||||
/* initialize 1D curve only attribute */
|
||||
prop = drm_property_create_enum(dev, DRM_MODE_PROP_ATOMIC, "CURVE_1D_TYPE",
|
||||
enum_list, len);
|
||||
|
||||
if (!prop)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -150,6 +162,8 @@ static void __drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colo
|
||||
struct drm_colorop_state *state)
|
||||
{
|
||||
memcpy(state, colorop->state, sizeof(*state));
|
||||
|
||||
state->bypass = true;
|
||||
}
|
||||
|
||||
struct drm_colorop_state *
|
||||
@@ -187,6 +201,7 @@ static void __drm_colorop_state_reset(struct drm_colorop_state *colorop_state,
|
||||
u64 val;
|
||||
|
||||
colorop_state->colorop = colorop;
|
||||
colorop_state->bypass = true;
|
||||
|
||||
if (colorop->curve_1d_type_property) {
|
||||
drm_object_property_get_default_value(&colorop->base,
|
||||
|
||||
@@ -81,6 +81,15 @@ struct drm_colorop_state {
|
||||
* information.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @bypass:
|
||||
*
|
||||
* When the property BYPASS exists on this colorop, this stores
|
||||
* the requested bypass state: true if colorop shall be bypassed,
|
||||
* false if colorop is enabled.
|
||||
*/
|
||||
bool bypass;
|
||||
|
||||
/**
|
||||
* @curve_1d_type:
|
||||
*
|
||||
@@ -170,6 +179,18 @@ struct drm_colorop {
|
||||
*/
|
||||
struct drm_property *type_property;
|
||||
|
||||
/**
|
||||
* @bypass_property:
|
||||
*
|
||||
* Boolean property to control enablement of the color
|
||||
* operation. Setting bypass to "true" shall always be supported
|
||||
* in order to allow compositors to quickly fall back to
|
||||
* alternate methods of color processing. This is important
|
||||
* since setting color operations can fail due to unique
|
||||
* HW constraints.
|
||||
*/
|
||||
struct drm_property *bypass_property;
|
||||
|
||||
/**
|
||||
* @curve_1d_type_property:
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user