drm/blend: Add per-plane pixel blend mode property
Subsystems (4)
v4 cover drm/blend: Add per-plane pixel blend mode property
Hi,
This serie aims at adding the support for pixel blend modes represent the alpha blending equation selection in the driver. It also introduces to use it in the malidp driver.
Let me know what you think,
Lowry
Changes for v4:
- Refines drm_plane_create_blend_mode_property(). drm_property_add_enum() can calculate the index itself just fine, so no point in having the caller pass it in.
- Since the current DRM assumption is that alpha is premultiplied as default, define DRM_MODE_BLEND_PREMULTI as 0 will be better.
- Refines some comments.
- Updates on drm/malidp, hardware limitation check only when the format has alpha pixel.
- Rebases on drm-misc-next and fixed the confilcts
Changes for v3:
- Refines the comments of drm_plane_create_blend_mode_property:
1) Puts the descriptions (after the ":") on a new line
2) Adds explaining why @supported_modes need PREMUL as default
- Refines the comments of drm/mali-dp patchset
- Rebased on drm-misc-next and fixed the confilcts with plane alpha patch
Changes for v2:
- Moves the blending equation into the DOC comment
- Refines the comments of drm_plane_create_blend_mode_property to not enumerate the #defines, but instead the string values
- Uses fg.* instead of pixel.* and plane_alpha instead of plane.alpha
- Introduces to use it in the malidp driver, which depends on the plane alpha patch
Changes from v1:
- v1 is just the core changes to request for commments
- Adds a pixel_blend_mode to drm_plane_state and a blend_mode_property to drm_plane, and related support functions
- Defines three blend modes in drm_blend.h
- Rebased on current drm-next
Lowry Li (2):
drm: Add per-plane pixel blend mode property drm/mali-dp: Implement plane alpha and pixel blend on malidp
drivers/gpu/drm/arm/malidp_planes.c | 74 ++++++++++++--------- drivers/gpu/drm/drm_atomic.c | 4 ++ drivers/gpu/drm/drm_atomic_helper.c | 1 + drivers/gpu/drm/drm_blend.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_blend.h | 6 ++ include/drm/drm_plane.h | 2 + 6 files changed, 182 insertions(+), 31 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 1/2 drm: Add per-plane pixel blend mode property
Pixel blend modes represent the alpha blending equation selection, describing how the pixels from the current plane are composited with the background.
Adds a pixel_blend_mode to drm_plane_state and a blend_mode_property to drm_plane, and related support functions.
Defines three blend modes in drm_blend.h.
Changes since v1:
- Moves the blending equation into the DOC comment
- Refines the comments of drm_plane_create_blend_mode_property to not enumerate the #defines, but instead the string values
- Uses fg.* instead of pixel.* and plane_alpha instead of plane.alpha
Changes since v2:
- Refines the comments of drm_plane_create_blend_mode_property:
1) Puts the descriptions (after the ":") on a new line
2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
- Refines drm_plane_create_blend_mode_property(). drm_property_add_enum() can calculate the index itself just fine, so no point in having the caller pass it in.
- Since the current DRM assumption is that alpha is premultiplied as default, define DRM_MODE_BLEND_PREMULTI as 0 will be better.
- Refines some comments.
--- drivers/gpu/drm/drm_atomic.c | 4 ++ drivers/gpu/drm/drm_atomic_helper.c | 1 + drivers/gpu/drm/drm_blend.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_blend.h | 6 ++ include/drm/drm_plane.h | 2 + 5 files changed, 139 insertions(+)
drivers/gpu/drm/drm_atomic.c +4 -0
@@ -895,6 +895,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, state->src_h = val; }else if (property == plane->alpha_property) { state->alpha = val; + }else if (property == plane->blend_mode_property) { + state->pixel_blend_mode = val; }else if (property == plane->rotation_property) {if (!is_power_of_2 (val &DRM_MODE_ROTATE_MASK )) { DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%llx\n",
@@ -968,6 +970,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, *val = state->src_h; }else if (property == plane->alpha_property) { *val = state->alpha; + }else if (property == plane->blend_mode_property) { + *val = state->pixel_blend_mode; }else if (property == plane->rotation_property) { *val = state->rotation; }else if (property == plane->zpos_property) {
drivers/gpu/drm/drm_atomic_helper.c +1 -0
@@ -3569,6 +3569,7 @@ void __drm_atomic_helper_plane_reset(struct drm_plane *plane,/* Reset the alpha value to fully opaque if it matters */ if (plane->alpha_property) state->alpha = plane->alpha_property->values[1 ]; + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ; plane->state = state; }
drivers/gpu/drm/drm_blend.c +126 -0
135 lines not on this page · raw message
include/drm/drm_blend.h +6 -0
@@ -27,6 +27,10 @@#include <linux/ctype.h> #include <drm/drm_mode.h> +#define DRM_MODE_BLEND_PREMULTI 0 +#define DRM_MODE_BLEND_COVERAGE 1 +#define DRM_MODE_BLEND_PIXEL_NONE 2 +struct drm_device ;struct drm_atomic_state ;struct drm_plane ;
@@ -52,4 +56,6 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane, unsigned int zpos);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);#endif
include/drm/drm_plane.h +2 -0
@@ -117,6 +117,7 @@ struct drm_plane_state {* details. */ u16 alpha; +uint16_t pixel_blend_mode;/** * @rotation:
@@ -659,6 +660,7 @@ struct drm_plane {* drm_plane_create_rotation_property(). */ struct drm_property *rotation_property; +struct drm_property *blend_mode_property;/** * @color_encoding_property:
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 1/2] drm: Add per-plane pixel blend mode property
Quoted 27 lines · Lowry Li
Pixel blend modes represent the alpha blending equation selection, describing how the pixels from the current plane are composited with the background.
Adds a
pixel_blend_modetodrm_plane_stateand ablend_mode_propertytodrm_plane, and related support functions.Defines three blend modes in
drm_blend.h.Changes since v1:
- Moves the blending equation into the DOC comment
- Refines the comments ofdrm_plane_create_blend_mode_propertyto not enumerate the #defines, but instead the string values
- Uses fg.* instead of pixel.* andplane_alphainstead of plane.alpha
Changes since v2:
- Refines the comments ofdrm_plane_create_blend_mode_property:
1) Puts the descriptions (after the ":") on a new line
2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
- Refinesdrm_plane_create_blend_mode_property().drm_property_add_enum()can calculate the index itself just fine, so no point in having the caller pass it in.
- Since the current DRM assumption is that alpha is premultiplied as default, defineDRM_MODE_BLEND_PREMULTIas 0 will be better.
- Refines some comments.
Quoted 1 line
Signed-off-by Lowry Li <[email protected]>
Looks good to me!
Thanks,
Liviu
Quoted 228 lines
--- drivers/gpu/drm/drm_atomic.c | 4 ++ drivers/gpu/drm/drm_atomic_helper.c | 1 + drivers/gpu/drm/drm_blend.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_blend.h | 6 ++ include/drm/drm_plane.h | 2 + 5 files changed, 139 insertions(+)drivers/gpu/drm/drm_atomic.c +4
-0@@ -895,6 +895,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, state->src_h = val; }else if (property == plane->alpha_property) { state->alpha = val; + }else if (property == plane->blend_mode_property) { + state->pixel_blend_mode = val; }else if (property == plane->rotation_property) {if (!is_power_of_2 (val &DRM_MODE_ROTATE_MASK )) { DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%llx\n",@@ -968,6 +970,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, *val = state->src_h; }else if (property == plane->alpha_property) { *val = state->alpha; + }else if (property == plane->blend_mode_property) { + *val = state->pixel_blend_mode; }else if (property == plane->rotation_property) { *val = state->rotation; }else if (property == plane->zpos_property) {drivers/gpu/drm/drm_atomic_helper.c +1
-0@@ -3569,6 +3569,7 @@ void __drm_atomic_helper_plane_reset(struct drm_plane *plane,/* Reset the alpha value to fully opaque if it matters */ if (plane->alpha_property) state->alpha = plane->alpha_property->values[1 ]; + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ; plane->state = state; }drivers/gpu/drm/drm_blend.c +126
-0@@ -107,6 +107,52 @@* planes. Without this property the primary plane is always below the cursor * plane, and ordering between all other planes is undefined. * +* pixel blend mode: +* Pixel blend mode is set up with drm_plane_create_blend_mode_property(). +* It adds a blend mode for alpha blending equation selection, describing +* how the pixels from the current plane are composited with the +* background. +* +* Three alpha blending equations are defined: +* +* "None": +* Blend formula that ignores the pixel alpha:: +* +* out.rgb = plane_alpha * fg.rgb + +* (1 - plane_alpha) * bg.rgb +* +* "Pre-multiplied": +* Blend formula that assumes the pixel color values +* have been already pre-multiplied with the alpha +* channel values:: +* +* out.rgb = plane_alpha * fg.rgb + +* (1 - (plane_alpha * fg.alpha)) * bg.rgb +* +* "Coverage": +* Blend formula that assumes the pixel color values have not +* been pre-multiplied and will do so when blending them to the +* background color values:: +* +* out.rgb = plane_alpha * fg.alpha * fg.rgb + +* (1 - (plane_alpha * fg.alpha)) * bg.rgb +* +* Using the following symbols: +* +* "fg.rgb": +* Each of the RGB component values from the plane's pixel +* "fg.alpha": +* Alpha component value from the plane's pixel. If the plane's +* pixel format has no alpha component, then this is assumed to be +* 1.0. In these cases, this property has no effect, as all three +* equations become equivalent. +* "bg.rgb": +* Each of the RGB component values from the background +* "plane_alpha": +* Plane alpha value set by the plane "alpha" property. If the +* 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). @@ -448,3 +494,83 @@ int drm_atomic_normalize_zpos(struct drm_device *dev,return 0 ; }EXPORT_SYMBOL (drm_atomic_normalize_zpos); + +/** +* drm_plane_create_blend_mode_property - create a new blend mode property +* @plane: drm plane +* @supported_modes: bitmask of supported modes, must include +* BIT(DRM_MODE_BLEND_PREMULTI). Current DRM assumption is +* that alpha is premultiplied, and old userspace can break if +* the property defaults to anything else. +* +* This creates a new property describing the blend mode. +* +* The property exposed to userspace is an enumeration property (see +* drm_property_create_enum()) called "pixel blend mode" and has the +* following enumeration values: +* +* "None": +* Blend formula that ignores the pixel alpha. +* +* "Pre-multiplied": +* Blend formula that assumes the pixel color values have been already +* pre-multiplied with the alpha channel values. +* +* "Coverage": +* Blend formula that assumes the pixel color values have not been +* pre-multiplied and will do so when blending them to the background color +* values. +* +* RETURNS: +* Zero for success or -errno +*/ +int drm_plane_create_blend_mode_property (struct drm_plane *plane, +unsigned int supported_modes) +{ +struct drm_device *dev = plane->dev; +struct drm_property *prop; +static const struct drm_prop_enum_list props[] = { + {DRM_MODE_BLEND_PIXEL_NONE ,"None" }, + {DRM_MODE_BLEND_PREMULTI ,"Pre-multiplied" }, + {DRM_MODE_BLEND_COVERAGE ,"Coverage" }, + }; +unsigned int valid_mode_mask =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE ); +int i; + +if (WARN_ON ((supported_modes & ~valid_mode_mask) || + ((supported_modes &BIT (DRM_MODE_BLEND_PREMULTI )) ==0 ))) +return -EINVAL ; + + prop =drm_property_create (dev,DRM_MODE_PROP_ENUM , +"pixel blend mode" , +hweight32 (supported_modes)); +if (!prop) +return -ENOMEM ; + +for (i =0 ; i <ARRAY_SIZE (props); i++) { +int ret; + +if (!(BIT (props[i].type) & supported_modes)) +continue ; + + ret =drm_property_add_enum (prop, props[i].type, + props[i].name); + +if (ret) { +drm_property_destroy (dev, prop); + +return ret; + } + } + +drm_object_attach_property (&plane->base, prop,DRM_MODE_BLEND_PREMULTI ); + plane->blend_mode_property = prop; + +if (plane->state) + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ; + +return 0 ; +} +EXPORT_SYMBOL (drm_plane_create_blend_mode_property);include/drm/drm_blend.h +6
-0@@ -27,6 +27,10 @@#include <linux/ctype.h> #include <drm/drm_mode.h> +#define DRM_MODE_BLEND_PREMULTI 0 +#define DRM_MODE_BLEND_COVERAGE 1 +#define DRM_MODE_BLEND_PIXEL_NONE 2 +struct drm_device ;struct drm_atomic_state ;struct drm_plane ;@@ -52,4 +56,6 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane, unsigned int zpos);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);#endif include/drm/drm_plane.h +2
-0@@ -117,6 +117,7 @@ struct drm_plane_state {* details. */ u16 alpha; +uint16_t pixel_blend_mode;/** * @rotation: @@ -659,6 +660,7 @@ struct drm_plane {* drm_plane_create_rotation_property(). */ struct drm_property *rotation_property; +struct drm_property *blend_mode_property;/** * @color_encoding_property: Signature · 1 line
1.9.1
Signature · 12 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-develRe: [PATCH v4 1/2] drm: Add per-plane pixel blend mode property
In reply to Lowry LiQuoted 63 lines · Lowry Li
Pixel blend modes represent the alpha blending equation selection, describing how the pixels from the current plane are composited with the background.
Adds a
pixel_blend_modetodrm_plane_stateand ablend_mode_propertytodrm_plane, and related support functions.Defines three blend modes in
drm_blend.h.Changes since v1:
- Moves the blending equation into the DOC comment
- Refines the comments ofdrm_plane_create_blend_mode_propertyto not enumerate the #defines, but instead the string values
- Uses fg.* instead of pixel.* andplane_alphainstead of plane.alpha
Changes since v2:
- Refines the comments ofdrm_plane_create_blend_mode_property:
1) Puts the descriptions (after the ":") on a new line
2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
- Refinesdrm_plane_create_blend_mode_property().drm_property_add_enum()can calculate the index itself just fine, so no point in having the caller pass it in.
- Since the current DRM assumption is that alpha is premultiplied as default, defineDRM_MODE_BLEND_PREMULTIas 0 will be better.
- Refines some comments.Signed-off-by Lowry Li <[email protected]>--- drivers/gpu/drm/drm_atomic.c | 4 ++ drivers/gpu/drm/drm_atomic_helper.c | 1 + drivers/gpu/drm/drm_blend.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_blend.h | 6 ++ include/drm/drm_plane.h | 2 + 5 files changed, 139 insertions(+)drivers/gpu/drm/drm_atomic.c +4
-0@@ -895,6 +895,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, state->src_h = val; }else if (property == plane->alpha_property) { state->alpha = val; + }else if (property == plane->blend_mode_property) { + state->pixel_blend_mode = val; }else if (property == plane->rotation_property) {if (!is_power_of_2 (val &DRM_MODE_ROTATE_MASK )) { DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%llx\n",@@ -968,6 +970,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, *val = state->src_h; }else if (property == plane->alpha_property) { *val = state->alpha; + }else if (property == plane->blend_mode_property) { + *val = state->pixel_blend_mode; }else if (property == plane->rotation_property) { *val = state->rotation; }else if (property == plane->zpos_property) {drivers/gpu/drm/drm_atomic_helper.c +0
-0
drivers/gpu/drm/drm_atomic_helper.c void __drm_atomic_helper_plane_reset(struct drm_plane *plane, · line 3572
Quoted 4 lines
drivers/gpu/drm/drm_atomic_helper.c +1
-0@@ -3569,6 +3569,7 @@ void __drm_atomic_helper_plane_reset(struct drm_plane *plane,/* Reset the alpha value to fully opaque if it matters */ if (plane->alpha_property) state->alpha = plane->alpha_property->values[1 ]; + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ;
Shouldn't this be state->pixel_blend_mode instead of plane->state->pixel_blend_mode?
drivers/gpu/drm/drm_atomic_helper.c void __drm_atomic_helper_plane_reset(struct drm_plane *plane, · line 3575
Quoted 3 lines
drivers/gpu/drm/drm_atomic_helper.c +0
-0plane->state = state; }
/snip
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 1/2] drm: Add per-plane pixel blend mode property
Quoted 63 lines · Sean Paul
Quoted 62 lines · Lowry Li
Pixel blend modes represent the alpha blending equation selection, describing how the pixels from the current plane are composited with the background.
Adds a
pixel_blend_modetodrm_plane_stateand ablend_mode_propertytodrm_plane, and related support functions.Defines three blend modes in
drm_blend.h.Changes since v1:
- Moves the blending equation into the DOC comment
- Refines the comments ofdrm_plane_create_blend_mode_propertyto not enumerate the #defines, but instead the string values
- Uses fg.* instead of pixel.* andplane_alphainstead of plane.alpha
Changes since v2:
- Refines the comments ofdrm_plane_create_blend_mode_property:
1) Puts the descriptions (after the ":") on a new line
2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
- Refinesdrm_plane_create_blend_mode_property().drm_property_add_enum()can calculate the index itself just fine, so no point in having the caller pass it in.
- Since the current DRM assumption is that alpha is premultiplied as default, defineDRM_MODE_BLEND_PREMULTIas 0 will be better.
- Refines some comments.Signed-off-by Lowry Li <[email protected]>--- drivers/gpu/drm/drm_atomic.c | 4 ++ drivers/gpu/drm/drm_atomic_helper.c | 1 + drivers/gpu/drm/drm_blend.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_blend.h | 6 ++ include/drm/drm_plane.h | 2 + 5 files changed, 139 insertions(+)drivers/gpu/drm/drm_atomic.c +4
-0@@ -895,6 +895,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, state->src_h = val; }else if (property == plane->alpha_property) { state->alpha = val; + }else if (property == plane->blend_mode_property) { + state->pixel_blend_mode = val; }else if (property == plane->rotation_property) {if (!is_power_of_2 (val &DRM_MODE_ROTATE_MASK )) { DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%llx\n",@@ -968,6 +970,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, *val = state->src_h; }else if (property == plane->alpha_property) { *val = state->alpha; + }else if (property == plane->blend_mode_property) { + *val = state->pixel_blend_mode; }else if (property == plane->rotation_property) { *val = state->rotation; }else if (property == plane->zpos_property) {drivers/gpu/drm/drm_atomic_helper.c +0
-0
Quoted 8 lines
drivers/gpu/drm/drm_atomic_helper.c void __drm_atomic_helper_plane_reset(struct drm_plane *plane, · line 3572
Quoted 5 lines
drivers/gpu/drm/drm_atomic_helper.c +1
-0@@ -3569,6 +3569,7 @@ void __drm_atomic_helper_plane_reset(struct drm_plane *plane,/* Reset the alpha value to fully opaque if it matters */ if (plane->alpha_property) state->alpha = plane->alpha_property->values[1 ]; + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ;Shouldn't this be
state->pixel_blend_modeinstead ofplane->state->pixel_blend_mode?
Hi Sean,
Yeah, will refine this. Thanks for your comments:)
Quoted 8 lines
drivers/gpu/drm/drm_atomic_helper.c void __drm_atomic_helper_plane_reset(struct drm_plane *plane, · line 3575
Quoted 3 lines
drivers/gpu/drm/drm_atomic_helper.c +0
-0plane->state = state; }/snip
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
Regards, Lowry _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 1/2] drm: Add per-plane pixel blend mode property
In reply to Lowry LiOp 15-08-18 om 08:35 schreef Lowry Li:
Quoted 193 lines
Pixel blend modes represent the alpha blending equation selection, describing how the pixels from the current plane are composited with the background.
Adds a
pixel_blend_modetodrm_plane_stateand ablend_mode_propertytodrm_plane, and related support functions.Defines three blend modes in
drm_blend.h.Changes since v1:
- Moves the blending equation into the DOC comment
- Refines the comments ofdrm_plane_create_blend_mode_propertyto not enumerate the #defines, but instead the string values
- Uses fg.* instead of pixel.* andplane_alphainstead of plane.alpha
Changes since v2:
- Refines the comments ofdrm_plane_create_blend_mode_property:
1) Puts the descriptions (after the ":") on a new line
2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
- Refinesdrm_plane_create_blend_mode_property().drm_property_add_enum()can calculate the index itself just fine, so no point in having the caller pass it in.
- Since the current DRM assumption is that alpha is premultiplied as default, defineDRM_MODE_BLEND_PREMULTIas 0 will be better.
- Refines some comments.Signed-off-by Lowry Li <[email protected]>--- drivers/gpu/drm/drm_atomic.c | 4 ++ drivers/gpu/drm/drm_atomic_helper.c | 1 + drivers/gpu/drm/drm_blend.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_blend.h | 6 ++ include/drm/drm_plane.h | 2 + 5 files changed, 139 insertions(+)drivers/gpu/drm/drm_atomic.c +4
-0@@ -895,6 +895,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, state->src_h = val; }else if (property == plane->alpha_property) { state->alpha = val; + }else if (property == plane->blend_mode_property) { + state->pixel_blend_mode = val; }else if (property == plane->rotation_property) {if (!is_power_of_2 (val &DRM_MODE_ROTATE_MASK )) { DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%llx\n",@@ -968,6 +970,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, *val = state->src_h; }else if (property == plane->alpha_property) { *val = state->alpha; + }else if (property == plane->blend_mode_property) { + *val = state->pixel_blend_mode; }else if (property == plane->rotation_property) { *val = state->rotation; }else if (property == plane->zpos_property) {drivers/gpu/drm/drm_atomic_helper.c +1
-0@@ -3569,6 +3569,7 @@ void __drm_atomic_helper_plane_reset(struct drm_plane *plane,/* Reset the alpha value to fully opaque if it matters */ if (plane->alpha_property) state->alpha = plane->alpha_property->values[1 ]; + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ; plane->state = state; }drivers/gpu/drm/drm_blend.c +108
-0@@ -107,6 +107,52 @@* planes. Without this property the primary plane is always below the cursor * plane, and ordering between all other planes is undefined. * +* pixel blend mode: +* Pixel blend mode is set up with drm_plane_create_blend_mode_property(). +* It adds a blend mode for alpha blending equation selection, describing +* how the pixels from the current plane are composited with the +* background. +* +* Three alpha blending equations are defined: +* +* "None": +* Blend formula that ignores the pixel alpha:: +* +* out.rgb = plane_alpha * fg.rgb + +* (1 - plane_alpha) * bg.rgb +* +* "Pre-multiplied": +* Blend formula that assumes the pixel color values +* have been already pre-multiplied with the alpha +* channel values:: +* +* out.rgb = plane_alpha * fg.rgb + +* (1 - (plane_alpha * fg.alpha)) * bg.rgb +* +* "Coverage": +* Blend formula that assumes the pixel color values have not +* been pre-multiplied and will do so when blending them to the +* background color values:: +* +* out.rgb = plane_alpha * fg.alpha * fg.rgb + +* (1 - (plane_alpha * fg.alpha)) * bg.rgb +* +* Using the following symbols: +* +* "fg.rgb": +* Each of the RGB component values from the plane's pixel +* "fg.alpha": +* Alpha component value from the plane's pixel. If the plane's +* pixel format has no alpha component, then this is assumed to be +* 1.0. In these cases, this property has no effect, as all three +* equations become equivalent. +* "bg.rgb": +* Each of the RGB component values from the background +* "plane_alpha": +* Plane alpha value set by the plane "alpha" property. If the +* 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). @@ -448,3 +494,83 @@ int drm_atomic_normalize_zpos(struct drm_device *dev,return 0 ; }EXPORT_SYMBOL (drm_atomic_normalize_zpos); + +/** +* drm_plane_create_blend_mode_property - create a new blend mode property +* @plane: drm plane +* @supported_modes: bitmask of supported modes, must include +* BIT(DRM_MODE_BLEND_PREMULTI). Current DRM assumption is +* that alpha is premultiplied, and old userspace can break if +* the property defaults to anything else. +* +* This creates a new property describing the blend mode. +* +* The property exposed to userspace is an enumeration property (see +* drm_property_create_enum()) called "pixel blend mode" and has the +* following enumeration values: +* +* "None": +* Blend formula that ignores the pixel alpha. +* +* "Pre-multiplied": +* Blend formula that assumes the pixel color values have been already +* pre-multiplied with the alpha channel values. +* +* "Coverage": +* Blend formula that assumes the pixel color values have not been +* pre-multiplied and will do so when blending them to the background color +* values. +* +* RETURNS: +* Zero for success or -errno +*/ +int drm_plane_create_blend_mode_property (struct drm_plane *plane, +unsigned int supported_modes) +{ +struct drm_device *dev = plane->dev; +struct drm_property *prop; +static const struct drm_prop_enum_list props[] = { + {DRM_MODE_BLEND_PIXEL_NONE ,"None" }, + {DRM_MODE_BLEND_PREMULTI ,"Pre-multiplied" }, + {DRM_MODE_BLEND_COVERAGE ,"Coverage" }, + }; +unsigned int valid_mode_mask =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE ); +int i; + +if (WARN_ON ((supported_modes & ~valid_mode_mask) || + ((supported_modes &BIT (DRM_MODE_BLEND_PREMULTI )) ==0 ))) +return -EINVAL ; + + prop =drm_property_create (dev,DRM_MODE_PROP_ENUM , +"pixel blend mode" , +hweight32 (supported_modes)); +if (!prop) +return -ENOMEM ; + +for (i =0 ; i <ARRAY_SIZE (props); i++) { +int ret; + +if (!(BIT (props[i].type) & supported_modes)) +continue ; + + ret = drm_property_add_enum(prop, props[i].type,
drivers/gpu/drm/drm_blend.c int drm_atomic_normalize_zpos(struct drm_device *dev, · line 568
Quoted 10 lines
drivers/gpu/drm/drm_blend.c +10
-0+ props[i].name); + +if (ret) { +drm_property_destroy (dev, prop); + +return ret; + } + } + +drm_object_attach_property (&plane->base, prop,DRM_MODE_BLEND_PREMULTI );
Do we still care about !atomic kernel drivers?
drivers/gpu/drm/drm_blend.c int drm_atomic_normalize_zpos(struct drm_device *dev, · line 572
Quoted 4 lines
drivers/gpu/drm/drm_blend.c +4
-0+ plane->blend_mode_property = prop; + +if (plane->state) + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ;
Is this still needed with the hunk in __drm_atomic_helper_plane_reset() ? I would just remove it.
Quoted 39 lines
drivers/gpu/drm/drm_blend.c +4
-0+ +return 0 ; +} +EXPORT_SYMBOL (drm_plane_create_blend_mode_property);include/drm/drm_blend.h +6
-0@@ -27,6 +27,10 @@#include <linux/ctype.h> #include <drm/drm_mode.h> +#define DRM_MODE_BLEND_PREMULTI 0 +#define DRM_MODE_BLEND_COVERAGE 1 +#define DRM_MODE_BLEND_PIXEL_NONE 2 +struct drm_device ;struct drm_atomic_state ;struct drm_plane ;@@ -52,4 +56,6 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane, unsigned int zpos);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);#endif include/drm/drm_plane.h +1
-0@@ -117,6 +117,7 @@ struct drm_plane_state {* details. */ u16 alpha; +uint16_t pixel_blend_mode;/** * @rotation:
include/drm/drm_plane.h struct drm_plane { · line 666
Quoted 7 lines
include/drm/drm_plane.h +1
-0@@ -659,6 +660,7 @@ struct drm_plane {* drm_plane_create_rotation_property(). */ struct drm_property *rotation_property; +struct drm_property *blend_mode_property;/** * @color_encoding_property:
These need to be documented.
With those changes:
~Maarten
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 1/2] drm: Add per-plane pixel blend mode property
Quoted 197 lines · Maarten Lankhorst
Op 15-08-18 om 08:35 schreef Lowry Li:
Quoted 196 lines
Pixel blend modes represent the alpha blending equation selection, describing how the pixels from the current plane are composited with the background.
Adds a
pixel_blend_modetodrm_plane_stateand ablend_mode_propertytodrm_plane, and related support functions.Defines three blend modes in
drm_blend.h.Changes since v1:
- Moves the blending equation into the DOC comment
- Refines the comments ofdrm_plane_create_blend_mode_propertyto not enumerate the #defines, but instead the string values
- Uses fg.* instead of pixel.* andplane_alphainstead of plane.alpha
Changes since v2:
- Refines the comments ofdrm_plane_create_blend_mode_property:
1) Puts the descriptions (after the ":") on a new line
2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
- Refinesdrm_plane_create_blend_mode_property().drm_property_add_enum()can calculate the index itself just fine, so no point in having the caller pass it in.
- Since the current DRM assumption is that alpha is premultiplied as default, defineDRM_MODE_BLEND_PREMULTIas 0 will be better.
- Refines some comments.Signed-off-by Lowry Li <[email protected]>--- drivers/gpu/drm/drm_atomic.c | 4 ++ drivers/gpu/drm/drm_atomic_helper.c | 1 + drivers/gpu/drm/drm_blend.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_blend.h | 6 ++ include/drm/drm_plane.h | 2 + 5 files changed, 139 insertions(+)drivers/gpu/drm/drm_atomic.c +4
-0@@ -895,6 +895,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, state->src_h = val; }else if (property == plane->alpha_property) { state->alpha = val; + }else if (property == plane->blend_mode_property) { + state->pixel_blend_mode = val; }else if (property == plane->rotation_property) {if (!is_power_of_2 (val &DRM_MODE_ROTATE_MASK )) { DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%llx\n",@@ -968,6 +970,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, *val = state->src_h; }else if (property == plane->alpha_property) { *val = state->alpha; + }else if (property == plane->blend_mode_property) { + *val = state->pixel_blend_mode; }else if (property == plane->rotation_property) { *val = state->rotation; }else if (property == plane->zpos_property) {drivers/gpu/drm/drm_atomic_helper.c +1
-0@@ -3569,6 +3569,7 @@ void __drm_atomic_helper_plane_reset(struct drm_plane *plane,/* Reset the alpha value to fully opaque if it matters */ if (plane->alpha_property) state->alpha = plane->alpha_property->values[1 ]; + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ; plane->state = state; }drivers/gpu/drm/drm_blend.c +111
-0@@ -107,6 +107,52 @@* planes. Without this property the primary plane is always below the cursor * plane, and ordering between all other planes is undefined. * +* pixel blend mode: +* Pixel blend mode is set up with drm_plane_create_blend_mode_property(). +* It adds a blend mode for alpha blending equation selection, describing +* how the pixels from the current plane are composited with the +* background. +* +* Three alpha blending equations are defined: +* +* "None": +* Blend formula that ignores the pixel alpha:: +* +* out.rgb = plane_alpha * fg.rgb + +* (1 - plane_alpha) * bg.rgb +* +* "Pre-multiplied": +* Blend formula that assumes the pixel color values +* have been already pre-multiplied with the alpha +* channel values:: +* +* out.rgb = plane_alpha * fg.rgb + +* (1 - (plane_alpha * fg.alpha)) * bg.rgb +* +* "Coverage": +* Blend formula that assumes the pixel color values have not +* been pre-multiplied and will do so when blending them to the +* background color values:: +* +* out.rgb = plane_alpha * fg.alpha * fg.rgb + +* (1 - (plane_alpha * fg.alpha)) * bg.rgb +* +* Using the following symbols: +* +* "fg.rgb": +* Each of the RGB component values from the plane's pixel +* "fg.alpha": +* Alpha component value from the plane's pixel. If the plane's +* pixel format has no alpha component, then this is assumed to be +* 1.0. In these cases, this property has no effect, as all three +* equations become equivalent. +* "bg.rgb": +* Each of the RGB component values from the background +* "plane_alpha": +* Plane alpha value set by the plane "alpha" property. If the +* 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). @@ -448,3 +494,83 @@ int drm_atomic_normalize_zpos(struct drm_device *dev,return 0 ; }EXPORT_SYMBOL (drm_atomic_normalize_zpos); + +/** +* drm_plane_create_blend_mode_property - create a new blend mode property +* @plane: drm plane +* @supported_modes: bitmask of supported modes, must include +* BIT(DRM_MODE_BLEND_PREMULTI). Current DRM assumption is +* that alpha is premultiplied, and old userspace can break if +* the property defaults to anything else. +* +* This creates a new property describing the blend mode. +* +* The property exposed to userspace is an enumeration property (see +* drm_property_create_enum()) called "pixel blend mode" and has the +* following enumeration values: +* +* "None": +* Blend formula that ignores the pixel alpha. +* +* "Pre-multiplied": +* Blend formula that assumes the pixel color values have been already +* pre-multiplied with the alpha channel values. +* +* "Coverage": +* Blend formula that assumes the pixel color values have not been +* pre-multiplied and will do so when blending them to the background color +* values. +* +* RETURNS: +* Zero for success or -errno +*/ +int drm_plane_create_blend_mode_property (struct drm_plane *plane, +unsigned int supported_modes) +{ +struct drm_device *dev = plane->dev; +struct drm_property *prop; +static const struct drm_prop_enum_list props[] = { + {DRM_MODE_BLEND_PIXEL_NONE ,"None" }, + {DRM_MODE_BLEND_PREMULTI ,"Pre-multiplied" }, + {DRM_MODE_BLEND_COVERAGE ,"Coverage" }, + }; +unsigned int valid_mode_mask =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE ); +int i; + +if (WARN_ON ((supported_modes & ~valid_mode_mask) || + ((supported_modes &BIT (DRM_MODE_BLEND_PREMULTI )) ==0 ))) +return -EINVAL ; + + prop =drm_property_create (dev,DRM_MODE_PROP_ENUM , +"pixel blend mode" , +hweight32 (supported_modes)); +if (!prop) +return -ENOMEM ; + +for (i =0 ; i <ARRAY_SIZE (props); i++) { +int ret; + +if (!(BIT (props[i].type) & supported_modes)) +continue ; + + ret =drm_property_add_enum (prop, props[i].type, + props[i].name); + +if (ret) {
Quoted 8 lines
drivers/gpu/drm/drm_blend.c int drm_atomic_normalize_zpos(struct drm_device *dev, · line 568
Quoted 7 lines
drivers/gpu/drm/drm_blend.c +7
-0+drm_property_destroy (dev, prop); + +return ret; + } + } + +drm_object_attach_property (&plane->base, prop,DRM_MODE_BLEND_PREMULTI );Do we still care about !atomic kernel drivers?
Hi Maarten,
Thanks for your comments. We don't need to care about this. And DRM_MODE_BLEND_PREMULTI is zero as default.
Quoted 6 lines
drivers/gpu/drm/drm_blend.c int drm_atomic_normalize_zpos(struct drm_device *dev, · line 572
Quoted 4 lines
drivers/gpu/drm/drm_blend.c +4
-0+ plane->blend_mode_property = prop; + +if (plane->state) + plane->state->pixel_blend_mode =DRM_MODE_BLEND_PREMULTI ;Is this still needed with the hunk in
__drm_atomic_helper_plane_reset()? I would just remove it.
Totally agree. Will remove this. Thanks a lot:)
Quoted 44 lines
Quoted 44 lines
drivers/gpu/drm/drm_blend.c +4
-0+ +return 0 ; +} +EXPORT_SYMBOL (drm_plane_create_blend_mode_property);include/drm/drm_blend.h +6
-0@@ -27,6 +27,10 @@#include <linux/ctype.h> #include <drm/drm_mode.h> +#define DRM_MODE_BLEND_PREMULTI 0 +#define DRM_MODE_BLEND_COVERAGE 1 +#define DRM_MODE_BLEND_PIXEL_NONE 2 +struct drm_device ;struct drm_atomic_state ;struct drm_plane ;@@ -52,4 +56,6 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane, unsigned int zpos);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);#endif include/drm/drm_plane.h +2
-0@@ -117,6 +117,7 @@ struct drm_plane_state {* details. */ u16 alpha; +uint16_t pixel_blend_mode;/** * @rotation: @@ -659,6 +660,7 @@ struct drm_plane {* drm_plane_create_rotation_property(). */ struct drm_property *rotation_property; +struct drm_property *blend_mode_property;
Quoted 4 lines
include/drm/drm_plane.h struct drm_plane { · line 666
Quoted 2 lines
include/drm/drm_plane.h +0
-0/** * @color_encoding_property: These need to be documented.
Yes, will add this. Thanks.
Quoted 5 lines
With those changes:
Reviewed-by Maarten Lankhorst <[email protected]>~Maarten
Signature · 6 lines
Regards, Lowry _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 2/2 drm/mali-dp: Implement plane alpha and pixel blend on malidp
In reply to Lowry LiChecks the pixel blending mode and plane alpha value when do the plane_check. Mali DP supports blending the current plane with the background either based on the pixel alpha blending mode or by using the layer's alpha value, but not both at the same time. If both case, plane_check will return failed.
Sets the HW when doing plane_update accordingly. If plane alpha is the 0xffff, set the pixel blending bits accordingly. If not we'd set ALPHA bit as zero and layer alpha value.
Changes since v1:
- Introduces to use it in the malidp driver, which depends on the plane alpha patch
Changes since v2:
- Refines the comments of drm/mali-dp patchset
Changes since v3:
- Updates on drm/malidp, hardware limitation check only when the format has alpha pixel.
--- drivers/gpu/drm/arm/malidp_planes.c | 74 +++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 31 deletions(-)
drivers/gpu/drm/arm/malidp_planes.c +43 -31
@@ -36,6 +36,7 @@#define LAYER_COMP_MASK (0x3 << 12)#define LAYER_COMP_PIXEL (0x3 << 12)#define LAYER_COMP_PLANE (0x2 << 12) +#define LAYER_PMUL_ENABLE (0x1 << 14)#define LAYER_ALPHA_OFFSET (16)#define LAYER_ALPHA_MASK (0xff)#define LAYER_ALPHA (x) (((x) & LAYER_ALPHA_MASK) << LAYER_ALPHA_OFFSET)
@@ -180,6 +181,7 @@ static int malidp_de_plane_check(struct drm_plane *plane,struct malidp_plane_state *ms =to_malidp_plane_state (state);bool rotated = state->rotation &MALIDP_ROTATED_MASK ;struct drm_framebuffer *fb; +u16 pixel_alpha = state->pixel_blend_mode;int i, ret;if (!state->crtc || !state->fb)
@@ -242,6 +244,11 @@ static int malidp_de_plane_check(struct drm_plane *plane, ms->rotmem_size = val; } +/* HW can't support plane + pixel blending */ +if ((state->alpha !=DRM_BLEND_ALPHA_OPAQUE ) && + (pixel_alpha !=DRM_MODE_BLEND_PIXEL_NONE )) +return -EINVAL ; +return 0 ; }
@@ -323,17 +330,19 @@ static void malidp_de_plane_update(struct drm_plane *plane, {struct malidp_plane *mp;struct malidp_plane_state *ms =to_malidp_plane_state (plane->state); +struct drm_plane_state *state = plane->state; +u16 pixel_alpha = state->pixel_blend_mode; +u8 plane_alpha = state->alpha >>8 ;u32 src_w, src_h, dest_w, dest_h, val;int i; -bool format_has_alpha = plane->state->fb->format->has_alpha; mp =to_malidp_plane (plane);/* convert src values from Q16 fixed point to integer */ - src_w = plane->state->src_w >>16 ; - src_h = plane->state->src_h >>16 ; - dest_w = plane->state->crtc_w; - dest_h = plane->state->crtc_h; + src_w = state->src_w >>16 ; + src_h = state->src_h >>16 ; + dest_w = state->crtc_w; + dest_h = state->crtc_h; val =malidp_hw_read (mp->hwdev, mp->layer->base); val = (val & ~LAYER_FORMAT_MASK ) | ms->format;
@@ -342,14 +351,14 @@ static void malidp_de_plane_update(struct drm_plane *plane,for (i =0 ; i < ms->n_planes; i++) {/* calculate the offset for the layer's plane registers */ u16 ptr = mp->layer->ptr + (i <<4 ); -dma_addr_t fb_addr =drm_fb_cma_get_gem_addr (plane->state->fb, - plane->state, i); +dma_addr_t fb_addr =drm_fb_cma_get_gem_addr (state->fb, + state, i);malidp_hw_write (mp->hwdev,lower_32_bits (fb_addr), ptr);malidp_hw_write (mp->hwdev,upper_32_bits (fb_addr), ptr +4 ); }malidp_de_set_plane_pitches (mp, ms->n_planes, - plane->state->fb->pitches); + state->fb->pitches);if ((plane->state->color_encoding != old_state->color_encoding) || (plane->state->color_range != old_state->color_range))
@@ -362,8 +371,8 @@ static void malidp_de_plane_update(struct drm_plane *plane,malidp_hw_write (mp->hwdev,LAYER_H_VAL (dest_w) |LAYER_V_VAL (dest_h), mp->layer->base +MALIDP_LAYER_COMP_SIZE ); -malidp_hw_write (mp->hwdev,LAYER_H_VAL (plane->state->crtc_x) | -LAYER_V_VAL (plane->state->crtc_y), +malidp_hw_write (mp->hwdev,LAYER_H_VAL (state->crtc_x) | +LAYER_V_VAL (state->crtc_y), mp->layer->base +MALIDP_LAYER_OFFSET );if (mp->layer->id ==DE_SMART )
@@ -376,38 +385,35 @@ static void malidp_de_plane_update(struct drm_plane *plane, val &= ~LAYER_ROT_MASK ;/* setup the rotation and axis flip bits */ -if (plane->state->rotation &DRM_MODE_ROTATE_MASK ) +if (state->rotation &DRM_MODE_ROTATE_MASK ) val |=ilog2 (plane->state->rotation &DRM_MODE_ROTATE_MASK ) <<LAYER_ROT_OFFSET ; -if (plane->state->rotation &DRM_MODE_REFLECT_X ) +if (state->rotation &DRM_MODE_REFLECT_X ) val |=LAYER_H_FLIP ; -if (plane->state->rotation &DRM_MODE_REFLECT_Y ) +if (state->rotation &DRM_MODE_REFLECT_Y ) val |=LAYER_V_FLIP ; - val &= ~LAYER_COMP_MASK ; -if (format_has_alpha) { - -/* -* always enable pixel alpha blending until we have a way -* to change blend modes -*/ - val |=LAYER_COMP_PIXEL ; - }else { + val &= ~(LAYER_COMP_MASK |LAYER_PMUL_ENABLE |LAYER_ALPHA (0xff )); -/* -* do not enable pixel alpha blending as the color channel -* does not have any alpha information -*/ +if (state->alpha !=DRM_BLEND_ALPHA_OPAQUE ) { val |=LAYER_COMP_PLANE ; - -/* Set layer alpha coefficient to 0xff ie fully opaque */ - val |=LAYER_ALPHA (0xff ); + }else if (state->fb->format->has_alpha) { +/* We only care about blend mode if the format has alpha */ +switch (pixel_alpha) { +case DRM_MODE_BLEND_PREMULTI : + val |=LAYER_COMP_PIXEL |LAYER_PMUL_ENABLE ; +break ; +case DRM_MODE_BLEND_COVERAGE : + val |=LAYER_COMP_PIXEL ; +break ; + } } + val |=LAYER_ALPHA (plane_alpha); val &= ~LAYER_FLOWCFG (LAYER_FLOWCFG_MASK ); -if (plane->state->crtc) { +if (state->crtc) {struct malidp_crtc_state *m = -to_malidp_crtc_state (plane->state->crtc->state); +to_malidp_crtc_state (state->crtc->state);if (m->scaler_config.scale_enable && m->scaler_config.plane_src_id == mp->layer->id)
@@ -446,6 +452,9 @@ int malidp_de_planes_init(struct drm_device *drm)unsigned long crtcs =1 << drm->mode_config.num_crtc;unsigned long flags =DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_90 |DRM_MODE_ROTATE_180 |DRM_MODE_ROTATE_270 |DRM_MODE_REFLECT_X |DRM_MODE_REFLECT_Y ; +unsigned int blend_caps =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE );u32 *formats;int ret, i, j, n;
@@ -498,6 +507,9 @@ int malidp_de_planes_init(struct drm_device *drm)malidp_hw_write (malidp->dev,MALIDP_ALPHA_LUT , plane->layer->base +MALIDP_LAYER_COMPOSE ); +drm_plane_create_alpha_property (&plane->base); +drm_plane_create_blend_mode_property (&plane->base, blend_caps); +/* Attach the YUV->RGB property only to video layers */ if (id & (DE_VIDEO1 |DE_VIDEO2 )) {/* default encoding for YUV->RGB is BT601 NARROW */
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 2/2] drm/mali-dp: Implement plane alpha and pixel blend on malidp
Quoted 19 lines · Lowry Li
Checks the pixel blending mode and plane alpha value when do the
plane_check. Mali DP supports blending the current plane with the background either based on the pixel alpha blending mode or by using the layer's alpha value, but not both at the same time. If both case,plane_checkwill return failed.Sets the HW when doing
plane_updateaccordingly. If plane alpha is the0xffff, set the pixel blending bits accordingly. If not we'd set ALPHA bit as zero and layer alpha value.Changes since v1:
- Introduces to use it in the malidp driver, which depends on the plane alpha patch
Changes since v2:
- Refines the comments of drm/mali-dp patchset
Changes since v3:
- Updates on drm/malidp, hardware limitation check only when the format has alpha pixel.
Quoted 1 line
Signed-off-by Lowry Li <[email protected]>
Thanks,
Liviu
Quoted 170 lines
--- drivers/gpu/drm/arm/malidp_planes.c | 74 +++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 31 deletions(-)drivers/gpu/drm/arm/malidp_planes.c +43
-31@@ -36,6 +36,7 @@#define LAYER_COMP_MASK (0x3 << 12)#define LAYER_COMP_PIXEL (0x3 << 12)#define LAYER_COMP_PLANE (0x2 << 12) +#define LAYER_PMUL_ENABLE (0x1 << 14)#define LAYER_ALPHA_OFFSET (16)#define LAYER_ALPHA_MASK (0xff)#define LAYER_ALPHA (x) (((x) & LAYER_ALPHA_MASK) << LAYER_ALPHA_OFFSET)@@ -180,6 +181,7 @@ static int malidp_de_plane_check(struct drm_plane *plane,struct malidp_plane_state *ms =to_malidp_plane_state (state);bool rotated = state->rotation &MALIDP_ROTATED_MASK ;struct drm_framebuffer *fb; +u16 pixel_alpha = state->pixel_blend_mode;int i, ret;if (!state->crtc || !state->fb)@@ -242,6 +244,11 @@ static int malidp_de_plane_check(struct drm_plane *plane, ms->rotmem_size = val; } +/* HW can't support plane + pixel blending */ +if ((state->alpha !=DRM_BLEND_ALPHA_OPAQUE ) && + (pixel_alpha !=DRM_MODE_BLEND_PIXEL_NONE )) +return -EINVAL ; +return 0 ; }@@ -323,17 +330,19 @@ static void malidp_de_plane_update(struct drm_plane *plane, {struct malidp_plane *mp;struct malidp_plane_state *ms =to_malidp_plane_state (plane->state); +struct drm_plane_state *state = plane->state; +u16 pixel_alpha = state->pixel_blend_mode; +u8 plane_alpha = state->alpha >>8 ;u32 src_w, src_h, dest_w, dest_h, val;int i; -bool format_has_alpha = plane->state->fb->format->has_alpha; mp =to_malidp_plane (plane);/* convert src values from Q16 fixed point to integer */ - src_w = plane->state->src_w >>16 ; - src_h = plane->state->src_h >>16 ; - dest_w = plane->state->crtc_w; - dest_h = plane->state->crtc_h; + src_w = state->src_w >>16 ; + src_h = state->src_h >>16 ; + dest_w = state->crtc_w; + dest_h = state->crtc_h; val =malidp_hw_read (mp->hwdev, mp->layer->base); val = (val & ~LAYER_FORMAT_MASK ) | ms->format;@@ -342,14 +351,14 @@ static void malidp_de_plane_update(struct drm_plane *plane,for (i =0 ; i < ms->n_planes; i++) {/* calculate the offset for the layer's plane registers */ u16 ptr = mp->layer->ptr + (i <<4 ); -dma_addr_t fb_addr =drm_fb_cma_get_gem_addr (plane->state->fb, - plane->state, i); +dma_addr_t fb_addr =drm_fb_cma_get_gem_addr (state->fb, + state, i);malidp_hw_write (mp->hwdev,lower_32_bits (fb_addr), ptr);malidp_hw_write (mp->hwdev,upper_32_bits (fb_addr), ptr +4 ); }malidp_de_set_plane_pitches (mp, ms->n_planes, - plane->state->fb->pitches); + state->fb->pitches);if ((plane->state->color_encoding != old_state->color_encoding) || (plane->state->color_range != old_state->color_range))@@ -362,8 +371,8 @@ static void malidp_de_plane_update(struct drm_plane *plane,malidp_hw_write (mp->hwdev,LAYER_H_VAL (dest_w) |LAYER_V_VAL (dest_h), mp->layer->base +MALIDP_LAYER_COMP_SIZE ); -malidp_hw_write (mp->hwdev,LAYER_H_VAL (plane->state->crtc_x) | -LAYER_V_VAL (plane->state->crtc_y), +malidp_hw_write (mp->hwdev,LAYER_H_VAL (state->crtc_x) | +LAYER_V_VAL (state->crtc_y), mp->layer->base +MALIDP_LAYER_OFFSET );if (mp->layer->id ==DE_SMART )@@ -376,38 +385,35 @@ static void malidp_de_plane_update(struct drm_plane *plane, val &= ~LAYER_ROT_MASK ;/* setup the rotation and axis flip bits */ -if (plane->state->rotation &DRM_MODE_ROTATE_MASK ) +if (state->rotation &DRM_MODE_ROTATE_MASK ) val |=ilog2 (plane->state->rotation &DRM_MODE_ROTATE_MASK ) <<LAYER_ROT_OFFSET ; -if (plane->state->rotation &DRM_MODE_REFLECT_X ) +if (state->rotation &DRM_MODE_REFLECT_X ) val |=LAYER_H_FLIP ; -if (plane->state->rotation &DRM_MODE_REFLECT_Y ) +if (state->rotation &DRM_MODE_REFLECT_Y ) val |=LAYER_V_FLIP ; - val &= ~LAYER_COMP_MASK ; -if (format_has_alpha) { - -/* -* always enable pixel alpha blending until we have a way -* to change blend modes -*/ - val |=LAYER_COMP_PIXEL ; - }else { + val &= ~(LAYER_COMP_MASK |LAYER_PMUL_ENABLE |LAYER_ALPHA (0xff )); -/* -* do not enable pixel alpha blending as the color channel -* does not have any alpha information -*/ +if (state->alpha !=DRM_BLEND_ALPHA_OPAQUE ) { val |=LAYER_COMP_PLANE ; - -/* Set layer alpha coefficient to 0xff ie fully opaque */ - val |=LAYER_ALPHA (0xff ); + }else if (state->fb->format->has_alpha) { +/* We only care about blend mode if the format has alpha */ +switch (pixel_alpha) { +case DRM_MODE_BLEND_PREMULTI : + val |=LAYER_COMP_PIXEL |LAYER_PMUL_ENABLE ; +break ; +case DRM_MODE_BLEND_COVERAGE : + val |=LAYER_COMP_PIXEL ; +break ; + } } + val |=LAYER_ALPHA (plane_alpha); val &= ~LAYER_FLOWCFG (LAYER_FLOWCFG_MASK ); -if (plane->state->crtc) { +if (state->crtc) {struct malidp_crtc_state *m = -to_malidp_crtc_state (plane->state->crtc->state); +to_malidp_crtc_state (state->crtc->state);if (m->scaler_config.scale_enable && m->scaler_config.plane_src_id == mp->layer->id)@@ -446,6 +452,9 @@ int malidp_de_planes_init(struct drm_device *drm)unsigned long crtcs =1 << drm->mode_config.num_crtc;unsigned long flags =DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_90 |DRM_MODE_ROTATE_180 |DRM_MODE_ROTATE_270 |DRM_MODE_REFLECT_X |DRM_MODE_REFLECT_Y ; +unsigned int blend_caps =BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE );u32 *formats;int ret, i, j, n;@@ -498,6 +507,9 @@ int malidp_de_planes_init(struct drm_device *drm)malidp_hw_write (malidp->dev,MALIDP_ALPHA_LUT , plane->layer->base +MALIDP_LAYER_COMPOSE ); +drm_plane_create_alpha_property (&plane->base); +drm_plane_create_blend_mode_property (&plane->base, blend_caps); +/* Attach the YUV->RGB property only to video layers */ if (id & (DE_VIDEO1 |DE_VIDEO2 )) {/* default encoding for YUV->RGB is BT601 NARROW */ Signature · 1 line
1.9.1
Signature · 12 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-develMaarten Lankhorst
maintainerPATCH 1/1 drm/i915: Add plane alpha blending support, v2.
In reply to Lowry LiAdd plane alpha blending support with the different blend modes. This has been tested on a icl to show the correct results, on earlier platforms small rounding errors cause issues. But this already happens case with fully transparant or fully opaque RGB8888 fb's.
The recommended HW workaround is to disable alpha blending when the plane alpha is 0 (transparant, hide plane) or 0xff (opaque, disable blending). This is easy to implement on any platform, so just do that.
The tests for userspace are also available, and pass on gen11.
Changes since v1:
- Change mistaken < 0xff0 to 0xff00.
- Only set PLANE_KEYMSK_ALPHA_ENABLE when plane alpha < 0xff00, ignore blend mode.
- Rework disabling FBC when per pixel alpha is used.
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++--------- drivers/gpu/drm/i915/intel_fbc.c | 8 ++++ drivers/gpu/drm/i915/intel_sprite.c | 23 ++++++++++- 5 files changed, 73 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -545,6 +545,8 @@ struct intel_fbc {int adjusted_y;int y; + +uint16_t pixel_blend_mode; } plane;struct {
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -6561,8 +6561,10 @@ enum {#define _PLANE_KEYVAL_2_A 0x70294#define _PLANE_KEYMSK_1_A 0x70198#define _PLANE_KEYMSK_2_A 0x70298 +#define PLANE_KEYMSK_ALPHA_ENABLE (1 << 31)#define _PLANE_KEYMAX_1_A 0x701a0#define _PLANE_KEYMAX_2_A 0x702a0 +#define PLANE_KEYMAX_ALPHA_SHIFT 24#define _PLANE_AUX_DIST_1_A 0x701c0#define _PLANE_AUX_DIST_2_A 0x702c0#define _PLANE_AUX_OFFSET_1_A 0x701c4
drivers/gpu/drm/i915/intel_display.c +40 -18
103 lines not on this page · raw message
drivers/gpu/drm/i915/intel_fbc.c +8 -0
@@ -674,6 +674,8 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->plane.adjusted_y = plane_state->main.y; cache->plane.y = plane_state->base.src.y1 >>16 ; + cache->plane.pixel_blend_mode = plane_state->base.pixel_blend_mode; +if (!cache->plane.visible)return ;
@@ -748,6 +750,12 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)return false; } +if (cache->plane.pixel_blend_mode !=DRM_MODE_BLEND_PIXEL_NONE && + cache->fb.format->has_alpha) { + fbc->no_fbc_reason ="per-pixel alpha blending is incompatible with FBC" ; +return false; + } +/* WaFbcExceedCdClockThreshold:hsw,bdw */ if ((IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) && cache->crtc.hsw_bdw_pixel_rate >= dev_priv->cdclk.hw.cdclk *95 /100 ) {
drivers/gpu/drm/i915/intel_sprite.c +21 -2
@@ -252,6 +252,7 @@ skl_update_plane(struct intel_plane *plane,uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 keymsk =0 , keymax =0 ;/* Sizes are 0 based */ src_w--;
@@ -267,10 +268,19 @@ skl_update_plane(struct intel_plane *plane,if (key->flags) {I915_WRITE_FW (PLANE_KEYVAL (pipe, plane_id), key->min_value); -I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), key->max_value); -I915_WRITE_FW (PLANE_KEYMSK (pipe, plane_id), key->channel_mask); + + keymax |= key->max_value &0xffffff ; + keymsk |= key->channel_mask &0x3ffffff ; } + keymax |= (plane_state->base.alpha >>8 ) <<PLANE_KEYMAX_ALPHA_SHIFT ; + +if (plane_state->base.alpha <0xff00 ) + keymsk |=PLANE_KEYMSK_ALPHA_ENABLE ; + +I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), keymax); +I915_WRITE_FW (PLANE_KEYMSK (pipe, plane_id), keymsk); +I915_WRITE_FW (PLANE_OFFSET (pipe, plane_id), (y <<16 ) | x);I915_WRITE_FW (PLANE_STRIDE (pipe, plane_id), stride);I915_WRITE_FW (PLANE_SIZE (pipe, plane_id), (src_h <<16 ) | src_w);
@@ -1650,6 +1660,15 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); +if (INTEL_GEN (dev_priv) >=9 ) { +drm_plane_create_alpha_property (&intel_plane->base); + +drm_plane_create_blend_mode_property (&intel_plane->base, +BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE )); + } +drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs);return intel_plane;
Signature · 6 lines
2.18.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Add plane alpha blending support, v2.
Quoted 10 lines · Maarten Lankhorst
Add plane alpha blending support with the different blend modes. This has been tested on a icl to show the correct results, on earlier platforms small rounding errors cause issues. But this already happens case with fully transparant or fully opaque RGB8888 fb's.
The recommended HW workaround is to disable alpha blending when the plane alpha is 0 (transparant, hide plane) or
0xff(opaque, disable blending). This is easy to implement on any platform, so just do that.
Quoted 8 lines
The tests for userspace are also available, and pass on gen11.
Changes since v1:
- Change mistaken <0xff0to0xff00.
- Only setPLANE_KEYMSK_ALPHA_ENABLEwhen plane alpha <0xff00, ignore blend mode.
- Rework disabling FBC when per pixel alpha is used.Signed-off-by Maarten Lankhorst <[email protected]>
One question and one minor suggestion inline below, but otherwise,
Quoted 72 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++--------- drivers/gpu/drm/i915/intel_fbc.c | 8 ++++ drivers/gpu/drm/i915/intel_sprite.c | 23 ++++++++++- 5 files changed, 73 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -545,6 +545,8 @@ struct intel_fbc {int adjusted_y;int y; + +uint16_t pixel_blend_mode; } plane;struct {drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -6561,8 +6561,10 @@ enum {#define _PLANE_KEYVAL_2_A 0x70294#define _PLANE_KEYMSK_1_A 0x70198#define _PLANE_KEYMSK_2_A 0x70298 +#define PLANE_KEYMSK_ALPHA_ENABLE (1 << 31)#define _PLANE_KEYMAX_1_A 0x701a0#define _PLANE_KEYMAX_2_A 0x702a0 +#define PLANE_KEYMAX_ALPHA_SHIFT 24#define _PLANE_AUX_DIST_1_A 0x701c0#define _PLANE_AUX_DIST_2_A 0x702c0#define _PLANE_AUX_OFFSET_1_A 0x701c4drivers/gpu/drm/i915/intel_display.c +11
-9@@ -3167,6 +3167,12 @@ int skl_check_plane_surface(const struct intel_crtc_state *crtc_state,return -EINVAL ; } +/* HW only has 8 bits pixel precision, disable plane if invisible */ +if (!(plane_state->base.alpha >>8 )) { + plane_state->base.visible = false; +return 0 ; + } +if (!plane_state->base.visible)return 0 ;@@ -3512,30 +3518,39 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return 0 ; } -/* -* XXX: For ARBG/ABGR formats we default to expecting scanout buffers -* to be already pre-multiplied. We need to add a knob (or a different -* DRM_FORMAT) for user-space to configure that. -*/ -static u32 skl_plane_ctl_alpha (uint32_t pixel_format) +static u32 skl_plane_ctl_alpha (const struct intel_plane_state *plane_state) { -switch (pixel_format) { -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_ARGB8888 : +if (!plane_state->base.fb->format->has_alpha) +return PLANE_CTL_ALPHA_DISABLE ; + +switch (plane_state->base.pixel_blend_mode) {
drivers/gpu/drm/i915/intel_display.c static u32 skl_plane_ctl_format(uint32_t pixel_format) · line 3535
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-1+case DRM_MODE_BLEND_PIXEL_NONE : +return PLANE_CTL_ALPHA_DISABLE ; +case DRM_MODE_BLEND_PREMULTI :return PLANE_CTL_ALPHA_SW_PREMULTIPLY ; +case DRM_MODE_BLEND_COVERAGE : +return PLANE_CTL_ALPHA_HW_PREMULTIPLY ;default : -return PLANE_CTL_ALPHA_DISABLE ; +MISSING_CASE (plane_state->base.pixel_blend_mode); +return 0 ;
Maybe just add the MISSING_CASE line before the current return? The macro still expands to 0, so leaving that makes it slightly more clear what the default fallback is. Same for the glk_ function below.
Quoted 81 lines
drivers/gpu/drm/i915/intel_display.c +22
-8} } -static u32 glk_plane_color_ctl_alpha (uint32_t pixel_format) +static u32 glk_plane_color_ctl_alpha (const struct intel_plane_state *plane_state) { -switch (pixel_format) { -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_ARGB8888 : +if (!plane_state->base.fb->format->has_alpha) +return PLANE_COLOR_ALPHA_DISABLE ; + +switch (plane_state->base.pixel_blend_mode) { +case DRM_MODE_BLEND_PIXEL_NONE : +return PLANE_COLOR_ALPHA_DISABLE ; +case DRM_MODE_BLEND_PREMULTI :return PLANE_COLOR_ALPHA_SW_PREMULTIPLY ; +case DRM_MODE_BLEND_COVERAGE : +return PLANE_COLOR_ALPHA_HW_PREMULTIPLY ;default : -return PLANE_COLOR_ALPHA_DISABLE ; +MISSING_CASE (plane_state->base.pixel_blend_mode); +return 0 ; } }@@ -3611,7 +3626,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, plane_ctl =PLANE_CTL_ENABLE ;if (INTEL_GEN (dev_priv) <10 && !IS_GEMINILAKE (dev_priv)) { - plane_ctl |=skl_plane_ctl_alpha (fb->format->format); + plane_ctl |=skl_plane_ctl_alpha (plane_state); plane_ctl |=PLANE_CTL_PIPE_GAMMA_ENABLE | PLANE_CTL_PIPE_CSC_ENABLE |@@ -3653,7 +3668,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, plane_color_ctl |=PLANE_COLOR_PIPE_CSC_ENABLE ; } plane_color_ctl |=PLANE_COLOR_PLANE_GAMMA_DISABLE ; - plane_color_ctl |=glk_plane_color_ctl_alpha (fb->format->format); + plane_color_ctl |=glk_plane_color_ctl_alpha (plane_state);if (fb->format->is_yuv) {if (plane_state->base.color_encoding ==DRM_COLOR_YCBCR_BT709 )@@ -13792,7 +13807,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_MODE_ROTATE_0 , supported_rotations); -if (INTEL_GEN (dev_priv) >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) { drm_plane_create_color_properties(&primary->base, BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709),@@ -13801,6 +13816,13 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); +drm_plane_create_alpha_property (&primary->base); +drm_plane_create_blend_mode_property (&primary->base, +BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE )); + } +drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return primary;drivers/gpu/drm/i915/intel_fbc.c +2
-0@@ -674,6 +674,8 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->plane.adjusted_y = plane_state->main.y; cache->plane.y = plane_state->base.src.y1 >>16 ; + cache->plane.pixel_blend_mode = plane_state->base.pixel_blend_mode; +if (!cache->plane.visible)return ;
drivers/gpu/drm/i915/intel_fbc.c static bool intel_fbc_can_activate(struct intel_crtc *crtc) · line 757
Quoted 8 lines
drivers/gpu/drm/i915/intel_fbc.c +5
-0@@ -748,6 +750,12 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)return false; } +if (cache->plane.pixel_blend_mode !=DRM_MODE_BLEND_PIXEL_NONE && + cache->fb.format->has_alpha) { + fbc->no_fbc_reason ="per-pixel alpha blending is incompatible with FBC" ; +return false; + }
This sounds reasonable, but is there somewhere in the b-spec that explains this explicitly? The FBC_CTL description lists pixel format restrictions (16 or 32 bit 888 RGB), but nothing explicitly about blending or alpha.
Matt
Quoted 61 lines
drivers/gpu/drm/i915/intel_fbc.c +1
-0+/* WaFbcExceedCdClockThreshold:hsw,bdw */ if ((IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) && cache->crtc.hsw_bdw_pixel_rate >= dev_priv->cdclk.hw.cdclk *95 /100 ) {drivers/gpu/drm/i915/intel_sprite.c +21
-2@@ -252,6 +252,7 @@ skl_update_plane(struct intel_plane *plane,uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 keymsk =0 , keymax =0 ;/* Sizes are 0 based */ src_w--;@@ -267,10 +268,19 @@ skl_update_plane(struct intel_plane *plane,if (key->flags) {I915_WRITE_FW (PLANE_KEYVAL (pipe, plane_id), key->min_value); -I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), key->max_value); -I915_WRITE_FW (PLANE_KEYMSK (pipe, plane_id), key->channel_mask); + + keymax |= key->max_value &0xffffff ; + keymsk |= key->channel_mask &0x3ffffff ; } + keymax |= (plane_state->base.alpha >>8 ) <<PLANE_KEYMAX_ALPHA_SHIFT ; + +if (plane_state->base.alpha <0xff00 ) + keymsk |=PLANE_KEYMSK_ALPHA_ENABLE ; + +I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), keymax); +I915_WRITE_FW (PLANE_KEYMSK (pipe, plane_id), keymsk); +I915_WRITE_FW (PLANE_OFFSET (pipe, plane_id), (y <<16 ) | x);I915_WRITE_FW (PLANE_STRIDE (pipe, plane_id), stride);I915_WRITE_FW (PLANE_SIZE (pipe, plane_id), (src_h <<16 ) | src_w);@@ -1650,6 +1660,15 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); +if (INTEL_GEN (dev_priv) >=9 ) { +drm_plane_create_alpha_property (&intel_plane->base); + +drm_plane_create_blend_mode_property (&intel_plane->base, +BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE )); + } +drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs);return intel_plane;Signature · 6 lines
2.18.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 9 lines
Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH] drm/i915: Add plane alpha blending support, v2.
Op 23-08-18 om 00:57 schreef Matt Roper:
Quoted 100 lines · Maarten Lankhorst
Quoted 10 lines
Add plane alpha blending support with the different blend modes. This has been tested on a icl to show the correct results, on earlier platforms small rounding errors cause issues. But this already happens case with fully transparant or fully opaque RGB8888 fb's.
The recommended HW workaround is to disable alpha blending when the plane alpha is 0 (transparant, hide plane) or
0xff(opaque, disable blending). This is easy to implement on any platform, so just do that.Quoted 8 lines
The tests for userspace are also available, and pass on gen11.
Changes since v1:
- Change mistaken <0xff0to0xff00.
- Only setPLANE_KEYMSK_ALPHA_ENABLEwhen plane alpha <0xff00, ignore blend mode.
- Rework disabling FBC when per pixel alpha is used.Signed-off-by Maarten Lankhorst <[email protected]>One question and one minor suggestion inline below, but otherwise,
Reviewed-by Matt Roper <[email protected]>Quoted 77 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++--------- drivers/gpu/drm/i915/intel_fbc.c | 8 ++++ drivers/gpu/drm/i915/intel_sprite.c | 23 ++++++++++- 5 files changed, 73 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -545,6 +545,8 @@ struct intel_fbc {int adjusted_y;int y; + +uint16_t pixel_blend_mode; } plane;struct {drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -6561,8 +6561,10 @@ enum {#define _PLANE_KEYVAL_2_A 0x70294#define _PLANE_KEYMSK_1_A 0x70198#define _PLANE_KEYMSK_2_A 0x70298 +#define PLANE_KEYMSK_ALPHA_ENABLE (1 << 31)#define _PLANE_KEYMAX_1_A 0x701a0#define _PLANE_KEYMAX_2_A 0x702a0 +#define PLANE_KEYMAX_ALPHA_SHIFT 24#define _PLANE_AUX_DIST_1_A 0x701c0#define _PLANE_AUX_DIST_2_A 0x702c0#define _PLANE_AUX_OFFSET_1_A 0x701c4drivers/gpu/drm/i915/intel_display.c +15
-9@@ -3167,6 +3167,12 @@ int skl_check_plane_surface(const struct intel_crtc_state *crtc_state,return -EINVAL ; } +/* HW only has 8 bits pixel precision, disable plane if invisible */ +if (!(plane_state->base.alpha >>8 )) { + plane_state->base.visible = false; +return 0 ; + } +if (!plane_state->base.visible)return 0 ;@@ -3512,30 +3518,39 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return 0 ; } -/* -* XXX: For ARBG/ABGR formats we default to expecting scanout buffers -* to be already pre-multiplied. We need to add a knob (or a different -* DRM_FORMAT) for user-space to configure that. -*/ -static u32 skl_plane_ctl_alpha (uint32_t pixel_format) +static u32 skl_plane_ctl_alpha (const struct intel_plane_state *plane_state) { -switch (pixel_format) { -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_ARGB8888 : +if (!plane_state->base.fb->format->has_alpha) +return PLANE_CTL_ALPHA_DISABLE ; + +switch (plane_state->base.pixel_blend_mode) { +case DRM_MODE_BLEND_PIXEL_NONE : +return PLANE_CTL_ALPHA_DISABLE ; +case DRM_MODE_BLEND_PREMULTI :return PLANE_CTL_ALPHA_SW_PREMULTIPLY ; +case DRM_MODE_BLEND_COVERAGE :
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c static u32 skl_plane_ctl_format(uint32_t pixel_format) · line 3535
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +3
-1+return PLANE_CTL_ALPHA_HW_PREMULTIPLY ;default : -return PLANE_CTL_ALPHA_DISABLE ; +MISSING_CASE (plane_state->base.pixel_blend_mode); +return 0 ;Maybe just add the
MISSING_CASEline before the current return? The macro still expands to 0, so leaving that makes it slightly more clear what the default fallback is. Same for theglk_function below.
Makes sense, will change that in v3. :)
Quoted 84 lines
Quoted 84 lines
drivers/gpu/drm/i915/intel_display.c +22
-8} } -static u32 glk_plane_color_ctl_alpha (uint32_t pixel_format) +static u32 glk_plane_color_ctl_alpha (const struct intel_plane_state *plane_state) { -switch (pixel_format) { -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_ARGB8888 : +if (!plane_state->base.fb->format->has_alpha) +return PLANE_COLOR_ALPHA_DISABLE ; + +switch (plane_state->base.pixel_blend_mode) { +case DRM_MODE_BLEND_PIXEL_NONE : +return PLANE_COLOR_ALPHA_DISABLE ; +case DRM_MODE_BLEND_PREMULTI :return PLANE_COLOR_ALPHA_SW_PREMULTIPLY ; +case DRM_MODE_BLEND_COVERAGE : +return PLANE_COLOR_ALPHA_HW_PREMULTIPLY ;default : -return PLANE_COLOR_ALPHA_DISABLE ; +MISSING_CASE (plane_state->base.pixel_blend_mode); +return 0 ; } }@@ -3611,7 +3626,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, plane_ctl =PLANE_CTL_ENABLE ;if (INTEL_GEN (dev_priv) <10 && !IS_GEMINILAKE (dev_priv)) { - plane_ctl |=skl_plane_ctl_alpha (fb->format->format); + plane_ctl |=skl_plane_ctl_alpha (plane_state); plane_ctl |=PLANE_CTL_PIPE_GAMMA_ENABLE | PLANE_CTL_PIPE_CSC_ENABLE |@@ -3653,7 +3668,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, plane_color_ctl |=PLANE_COLOR_PIPE_CSC_ENABLE ; } plane_color_ctl |=PLANE_COLOR_PLANE_GAMMA_DISABLE ; - plane_color_ctl |=glk_plane_color_ctl_alpha (fb->format->format); + plane_color_ctl |=glk_plane_color_ctl_alpha (plane_state);if (fb->format->is_yuv) {if (plane_state->base.color_encoding ==DRM_COLOR_YCBCR_BT709 )@@ -13792,7 +13807,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_MODE_ROTATE_0 , supported_rotations); -if (INTEL_GEN (dev_priv) >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) { drm_plane_create_color_properties(&primary->base, BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709),@@ -13801,6 +13816,13 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); +drm_plane_create_alpha_property (&primary->base); +drm_plane_create_blend_mode_property (&primary->base, +BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE )); + } +drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return primary;drivers/gpu/drm/i915/intel_fbc.c +2
-0@@ -674,6 +674,8 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->plane.adjusted_y = plane_state->main.y; cache->plane.y = plane_state->base.src.y1 >>16 ; + cache->plane.pixel_blend_mode = plane_state->base.pixel_blend_mode; +if (!cache->plane.visible)return ;@@ -748,6 +750,12 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)return false; }
Quoted 9 lines
drivers/gpu/drm/i915/intel_fbc.c static bool intel_fbc_can_activate(struct intel_crtc *crtc) · line 757
Quoted 5 lines
drivers/gpu/drm/i915/intel_fbc.c +5
-0+if (cache->plane.pixel_blend_mode !=DRM_MODE_BLEND_PIXEL_NONE && + cache->fb.format->has_alpha) { + fbc->no_fbc_reason ="per-pixel alpha blending is incompatible with FBC" ; +return false; + }This sounds reasonable, but is there somewhere in the b-spec that explains this explicitly? The
FBC_CTLdescription lists pixel format restrictions (16 or 32 bit 888 RGB), but nothing explicitly about blending or alpha.
PLANE_COLOR_CTL alpha mode, and PLANE_CTL's alpha mode both mention in bspec that per pixel alpha is not compatible with FBC. :)
~Maarten
Quoted 56 lines
Matt
Quoted 53 lines
drivers/gpu/drm/i915/intel_fbc.c +1
-0+/* WaFbcExceedCdClockThreshold:hsw,bdw */ if ((IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) && cache->crtc.hsw_bdw_pixel_rate >= dev_priv->cdclk.hw.cdclk *95 /100 ) {drivers/gpu/drm/i915/intel_sprite.c +21
-2@@ -252,6 +252,7 @@ skl_update_plane(struct intel_plane *plane,uint32_t src_w =drm_rect_width (&plane_state->base.src) >>16 ;uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; +u32 keymsk =0 , keymax =0 ;/* Sizes are 0 based */ src_w--;@@ -267,10 +268,19 @@ skl_update_plane(struct intel_plane *plane,if (key->flags) {I915_WRITE_FW (PLANE_KEYVAL (pipe, plane_id), key->min_value); -I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), key->max_value); -I915_WRITE_FW (PLANE_KEYMSK (pipe, plane_id), key->channel_mask); + + keymax |= key->max_value &0xffffff ; + keymsk |= key->channel_mask &0x3ffffff ; } + keymax |= (plane_state->base.alpha >>8 ) <<PLANE_KEYMAX_ALPHA_SHIFT ; + +if (plane_state->base.alpha <0xff00 ) + keymsk |=PLANE_KEYMSK_ALPHA_ENABLE ; + +I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), keymax); +I915_WRITE_FW (PLANE_KEYMSK (pipe, plane_id), keymsk); +I915_WRITE_FW (PLANE_OFFSET (pipe, plane_id), (y <<16 ) | x);I915_WRITE_FW (PLANE_STRIDE (pipe, plane_id), stride);I915_WRITE_FW (PLANE_SIZE (pipe, plane_id), (src_h <<16 ) | src_w);@@ -1650,6 +1660,15 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); +if (INTEL_GEN (dev_priv) >=9 ) { +drm_plane_create_alpha_property (&intel_plane->base); + +drm_plane_create_blend_mode_property (&intel_plane->base, +BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE )); + } +drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs);
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_sprite.c +0
-0return intel_plane;Signature · 6 lines
2.18.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH] drm/i915: Add plane alpha blending support, v2.
In reply to Matt RoperOp 23-08-18 om 00:57 schreef Matt Roper:
Quoted 193 lines · Maarten Lankhorst
Quoted 10 lines
Add plane alpha blending support with the different blend modes. This has been tested on a icl to show the correct results, on earlier platforms small rounding errors cause issues. But this already happens case with fully transparant or fully opaque RGB8888 fb's.
The recommended HW workaround is to disable alpha blending when the plane alpha is 0 (transparant, hide plane) or
0xff(opaque, disable blending). This is easy to implement on any platform, so just do that.Quoted 8 lines
The tests for userspace are also available, and pass on gen11.
Changes since v1:
- Change mistaken <0xff0to0xff00.
- Only setPLANE_KEYMSK_ALPHA_ENABLEwhen plane alpha <0xff00, ignore blend mode.
- Rework disabling FBC when per pixel alpha is used.Signed-off-by Maarten Lankhorst <[email protected]>One question and one minor suggestion inline below, but otherwise,
Reviewed-by Matt Roper <[email protected]>Quoted 72 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++--------- drivers/gpu/drm/i915/intel_fbc.c | 8 ++++ drivers/gpu/drm/i915/intel_sprite.c | 23 ++++++++++- 5 files changed, 73 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -545,6 +545,8 @@ struct intel_fbc {int adjusted_y;int y; + +uint16_t pixel_blend_mode; } plane;struct {drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -6561,8 +6561,10 @@ enum {#define _PLANE_KEYVAL_2_A 0x70294#define _PLANE_KEYMSK_1_A 0x70198#define _PLANE_KEYMSK_2_A 0x70298 +#define PLANE_KEYMSK_ALPHA_ENABLE (1 << 31)#define _PLANE_KEYMAX_1_A 0x701a0#define _PLANE_KEYMAX_2_A 0x702a0 +#define PLANE_KEYMAX_ALPHA_SHIFT 24#define _PLANE_AUX_DIST_1_A 0x701c0#define _PLANE_AUX_DIST_2_A 0x702c0#define _PLANE_AUX_OFFSET_1_A 0x701c4drivers/gpu/drm/i915/intel_display.c +11
-9@@ -3167,6 +3167,12 @@ int skl_check_plane_surface(const struct intel_crtc_state *crtc_state,return -EINVAL ; } +/* HW only has 8 bits pixel precision, disable plane if invisible */ +if (!(plane_state->base.alpha >>8 )) { + plane_state->base.visible = false; +return 0 ; + } +if (!plane_state->base.visible)return 0 ;@@ -3512,30 +3518,39 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return 0 ; } -/* -* XXX: For ARBG/ABGR formats we default to expecting scanout buffers -* to be already pre-multiplied. We need to add a knob (or a different -* DRM_FORMAT) for user-space to configure that. -*/ -static u32 skl_plane_ctl_alpha (uint32_t pixel_format) +static u32 skl_plane_ctl_alpha (const struct intel_plane_state *plane_state) { -switch (pixel_format) { -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_ARGB8888 : +if (!plane_state->base.fb->format->has_alpha) +return PLANE_CTL_ALPHA_DISABLE ; + +switch (plane_state->base.pixel_blend_mode) {drivers/gpu/drm/i915/intel_display.c static u32 skl_plane_ctl_format(uint32_t pixel_format) · line 3535
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-1+case DRM_MODE_BLEND_PIXEL_NONE : +return PLANE_CTL_ALPHA_DISABLE ; +case DRM_MODE_BLEND_PREMULTI :return PLANE_CTL_ALPHA_SW_PREMULTIPLY ; +case DRM_MODE_BLEND_COVERAGE : +return PLANE_CTL_ALPHA_HW_PREMULTIPLY ;default : -return PLANE_CTL_ALPHA_DISABLE ; +MISSING_CASE (plane_state->base.pixel_blend_mode); +return 0 ;Maybe just add the
MISSING_CASEline before the current return? The macro still expands to 0, so leaving that makes it slightly more clear what the default fallback is. Same for theglk_function below.Quoted 84 lines
drivers/gpu/drm/i915/intel_display.c +22
-8} } -static u32 glk_plane_color_ctl_alpha (uint32_t pixel_format) +static u32 glk_plane_color_ctl_alpha (const struct intel_plane_state *plane_state) { -switch (pixel_format) { -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_ARGB8888 : +if (!plane_state->base.fb->format->has_alpha) +return PLANE_COLOR_ALPHA_DISABLE ; + +switch (plane_state->base.pixel_blend_mode) { +case DRM_MODE_BLEND_PIXEL_NONE : +return PLANE_COLOR_ALPHA_DISABLE ; +case DRM_MODE_BLEND_PREMULTI :return PLANE_COLOR_ALPHA_SW_PREMULTIPLY ; +case DRM_MODE_BLEND_COVERAGE : +return PLANE_COLOR_ALPHA_HW_PREMULTIPLY ;default : -return PLANE_COLOR_ALPHA_DISABLE ; +MISSING_CASE (plane_state->base.pixel_blend_mode); +return 0 ; } }@@ -3611,7 +3626,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, plane_ctl =PLANE_CTL_ENABLE ;if (INTEL_GEN (dev_priv) <10 && !IS_GEMINILAKE (dev_priv)) { - plane_ctl |=skl_plane_ctl_alpha (fb->format->format); + plane_ctl |=skl_plane_ctl_alpha (plane_state); plane_ctl |=PLANE_CTL_PIPE_GAMMA_ENABLE | PLANE_CTL_PIPE_CSC_ENABLE |@@ -3653,7 +3668,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, plane_color_ctl |=PLANE_COLOR_PIPE_CSC_ENABLE ; } plane_color_ctl |=PLANE_COLOR_PLANE_GAMMA_DISABLE ; - plane_color_ctl |=glk_plane_color_ctl_alpha (fb->format->format); + plane_color_ctl |=glk_plane_color_ctl_alpha (plane_state);if (fb->format->is_yuv) {if (plane_state->base.color_encoding ==DRM_COLOR_YCBCR_BT709 )@@ -13792,7 +13807,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_MODE_ROTATE_0 , supported_rotations); -if (INTEL_GEN (dev_priv) >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) { drm_plane_create_color_properties(&primary->base, BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709),@@ -13801,6 +13816,13 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); +drm_plane_create_alpha_property (&primary->base); +drm_plane_create_blend_mode_property (&primary->base, +BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE )); + } +drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return primary;drivers/gpu/drm/i915/intel_fbc.c +2
-0@@ -674,6 +674,8 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->plane.adjusted_y = plane_state->main.y; cache->plane.y = plane_state->base.src.y1 >>16 ; + cache->plane.pixel_blend_mode = plane_state->base.pixel_blend_mode; +if (!cache->plane.visible)return ;@@ -748,6 +750,12 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)return false; }
Quoted 10 lines
drivers/gpu/drm/i915/intel_fbc.c static bool intel_fbc_can_activate(struct intel_crtc *crtc) · line 757
Quoted 5 lines
drivers/gpu/drm/i915/intel_fbc.c +5
-0+if (cache->plane.pixel_blend_mode !=DRM_MODE_BLEND_PIXEL_NONE && + cache->fb.format->has_alpha) { + fbc->no_fbc_reason ="per-pixel alpha blending is incompatible with FBC" ; +return false; + }This sounds reasonable, but is there somewhere in the b-spec that explains this explicitly? The
FBC_CTLdescription lists pixel format restrictions (16 or 32 bit 888 RGB), but nothing explicitly about blending or alpha.
Thanks for review btw, finally pushed now that DINQ backmerged the original patch. :)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Add plane alpha blending support, v2.
Quoting Maarten Lankhorst (2018-10-02 11:51:45)
Quoted 204 lines
Op 23-08-18 om 00:57 schreef Matt Roper:
Quoted 193 lines · Maarten Lankhorst
Quoted 10 lines
Add plane alpha blending support with the different blend modes. This has been tested on a icl to show the correct results, on earlier platforms small rounding errors cause issues. But this already happens case with fully transparant or fully opaque RGB8888 fb's.
The recommended HW workaround is to disable alpha blending when the plane alpha is 0 (transparant, hide plane) or
0xff(opaque, disable blending). This is easy to implement on any platform, so just do that.Quoted 8 lines
The tests for userspace are also available, and pass on gen11.
Changes since v1:
- Change mistaken <0xff0to0xff00.
- Only setPLANE_KEYMSK_ALPHA_ENABLEwhen plane alpha <0xff00, ignore blend mode.
- Rework disabling FBC when per pixel alpha is used.Signed-off-by Maarten Lankhorst <[email protected]>One question and one minor suggestion inline below, but otherwise,
Reviewed-by Matt Roper <[email protected]>Quoted 72 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++--------- drivers/gpu/drm/i915/intel_fbc.c | 8 ++++ drivers/gpu/drm/i915/intel_sprite.c | 23 ++++++++++- 5 files changed, 73 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -545,6 +545,8 @@ struct intel_fbc {int adjusted_y;int y; + +uint16_t pixel_blend_mode; } plane;struct {drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -6561,8 +6561,10 @@ enum {#define _PLANE_KEYVAL_2_A 0x70294#define _PLANE_KEYMSK_1_A 0x70198#define _PLANE_KEYMSK_2_A 0x70298 +#define PLANE_KEYMSK_ALPHA_ENABLE (1 << 31)#define _PLANE_KEYMAX_1_A 0x701a0#define _PLANE_KEYMAX_2_A 0x702a0 +#define PLANE_KEYMAX_ALPHA_SHIFT 24#define _PLANE_AUX_DIST_1_A 0x701c0#define _PLANE_AUX_DIST_2_A 0x702c0#define _PLANE_AUX_OFFSET_1_A 0x701c4drivers/gpu/drm/i915/intel_display.c +11
-9@@ -3167,6 +3167,12 @@ int skl_check_plane_surface(const struct intel_crtc_state *crtc_state,return -EINVAL ; } +/* HW only has 8 bits pixel precision, disable plane if invisible */ +if (!(plane_state->base.alpha >>8 )) { + plane_state->base.visible = false; +return 0 ; + } +if (!plane_state->base.visible)return 0 ;@@ -3512,30 +3518,39 @@ static u32 skl_plane_ctl_format(uint32_t pixel_format)return 0 ; } -/* -* XXX: For ARBG/ABGR formats we default to expecting scanout buffers -* to be already pre-multiplied. We need to add a knob (or a different -* DRM_FORMAT) for user-space to configure that. -*/ -static u32 skl_plane_ctl_alpha (uint32_t pixel_format) +static u32 skl_plane_ctl_alpha (const struct intel_plane_state *plane_state) { -switch (pixel_format) { -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_ARGB8888 : +if (!plane_state->base.fb->format->has_alpha) +return PLANE_CTL_ALPHA_DISABLE ; + +switch (plane_state->base.pixel_blend_mode) {drivers/gpu/drm/i915/intel_display.c static u32 skl_plane_ctl_format(uint32_t pixel_format) · line 3535
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +7
-1+case DRM_MODE_BLEND_PIXEL_NONE : +return PLANE_CTL_ALPHA_DISABLE ; +case DRM_MODE_BLEND_PREMULTI :return PLANE_CTL_ALPHA_SW_PREMULTIPLY ; +case DRM_MODE_BLEND_COVERAGE : +return PLANE_CTL_ALPHA_HW_PREMULTIPLY ;default : -return PLANE_CTL_ALPHA_DISABLE ; +MISSING_CASE (plane_state->base.pixel_blend_mode); +return 0 ;Maybe just add the
MISSING_CASEline before the current return? The macro still expands to 0, so leaving that makes it slightly more clear what the default fallback is. Same for theglk_function below.Quoted 84 lines
drivers/gpu/drm/i915/intel_display.c +22
-8} } -static u32 glk_plane_color_ctl_alpha (uint32_t pixel_format) +static u32 glk_plane_color_ctl_alpha (const struct intel_plane_state *plane_state) { -switch (pixel_format) { -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_ARGB8888 : +if (!plane_state->base.fb->format->has_alpha) +return PLANE_COLOR_ALPHA_DISABLE ; + +switch (plane_state->base.pixel_blend_mode) { +case DRM_MODE_BLEND_PIXEL_NONE : +return PLANE_COLOR_ALPHA_DISABLE ; +case DRM_MODE_BLEND_PREMULTI :return PLANE_COLOR_ALPHA_SW_PREMULTIPLY ; +case DRM_MODE_BLEND_COVERAGE : +return PLANE_COLOR_ALPHA_HW_PREMULTIPLY ;default : -return PLANE_COLOR_ALPHA_DISABLE ; +MISSING_CASE (plane_state->base.pixel_blend_mode); +return 0 ; } }@@ -3611,7 +3626,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, plane_ctl =PLANE_CTL_ENABLE ;if (INTEL_GEN (dev_priv) <10 && !IS_GEMINILAKE (dev_priv)) { - plane_ctl |=skl_plane_ctl_alpha (fb->format->format); + plane_ctl |=skl_plane_ctl_alpha (plane_state); plane_ctl |=PLANE_CTL_PIPE_GAMMA_ENABLE | PLANE_CTL_PIPE_CSC_ENABLE |@@ -3653,7 +3668,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, plane_color_ctl |=PLANE_COLOR_PIPE_CSC_ENABLE ; } plane_color_ctl |=PLANE_COLOR_PLANE_GAMMA_DISABLE ; - plane_color_ctl |=glk_plane_color_ctl_alpha (fb->format->format); + plane_color_ctl |=glk_plane_color_ctl_alpha (plane_state);if (fb->format->is_yuv) {if (plane_state->base.color_encoding ==DRM_COLOR_YCBCR_BT709 )@@ -13792,7 +13807,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_MODE_ROTATE_0 , supported_rotations); -if (INTEL_GEN (dev_priv) >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) { drm_plane_create_color_properties(&primary->base, BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709),@@ -13801,6 +13816,13 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); +drm_plane_create_alpha_property (&primary->base); +drm_plane_create_blend_mode_property (&primary->base, +BIT (DRM_MODE_BLEND_PIXEL_NONE ) | +BIT (DRM_MODE_BLEND_PREMULTI ) | +BIT (DRM_MODE_BLEND_COVERAGE )); + } +drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs);return primary;drivers/gpu/drm/i915/intel_fbc.c +2
-0@@ -674,6 +674,8 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->plane.adjusted_y = plane_state->main.y; cache->plane.y = plane_state->base.src.y1 >>16 ; + cache->plane.pixel_blend_mode = plane_state->base.pixel_blend_mode; +if (!cache->plane.visible)return ;@@ -748,6 +750,12 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc)return false; }Quoted 10 lines
drivers/gpu/drm/i915/intel_fbc.c static bool intel_fbc_can_activate(struct intel_crtc *crtc) · line 757
Quoted 5 lines
drivers/gpu/drm/i915/intel_fbc.c +5
-0+if (cache->plane.pixel_blend_mode !=DRM_MODE_BLEND_PIXEL_NONE && + cache->fb.format->has_alpha) { + fbc->no_fbc_reason ="per-pixel alpha blending is incompatible with FBC" ; +return false; + }This sounds reasonable, but is there somewhere in the b-spec that explains this explicitly? The
FBC_CTLdescription lists pixel format restrictions (16 or 32 bit 888 RGB), but nothing explicitly about blending or alpha.
Quoted 1 line
Thanks for review btw, finally pushed now that DINQ backmerged the original patch. :)
Since landing, we now have sporadic failures, but frequent enough across the whole set of subtests, on kms_cursor_crc for gen9+. Coincidence?
I'd be tempted to say that we don't reset some residual state. -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Add plane alpha blending support, v2.
In reply to Lowry Li== Series Details ==
== Series Details ==
Series: drm/i915: Add plane alpha blending support, v2.
URL : https://patchwork.freedesktop.org/series/48243/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/intel_display.odrivers/gpu/drm/i915/intel_display.c: In function ‘skl_plane_ctl_alpha’:drivers/gpu/drm/i915/intel_display.c:3528:27: error: ‘const struct drm_plane_state’ has no member named ‘pixel_blend_mode’
switch (plane_state->base.pixel_blend_mode) {
^
drivers/gpu/drm/i915/intel_display.c:3529:7: error: ‘DRM_MODE_BLEND_PIXEL_NONE’ undeclared (first use in this function); did you mean ‘DRM_MODE_ENCODER_NONE’?
case DRM_MODE_BLEND_PIXEL_NONE:
^~~~~~~~~~~~~~~~~~~~~~~~~
DRM_MODE_ENCODER_NONE
drivers/gpu/drm/i915/intel_display.c:3529:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/i915/intel_display.c:3531:7: error: ‘DRM_MODE_BLEND_PREMULTI’ undeclared (first use in this function); did you mean ‘DRM_MODE_BLEND_PIXEL_NONE’?
case DRM_MODE_BLEND_PREMULTI:
^~~~~~~~~~~~~~~~~~~~~~~
DRM_MODE_BLEND_PIXEL_NONE
drivers/gpu/drm/i915/intel_display.c:3533:7: error: ‘DRM_MODE_BLEND_COVERAGE’ undeclared (first use in this function); did you mean ‘DRM_MODE_BLEND_PREMULTI’?
case DRM_MODE_BLEND_COVERAGE:
^~~~~~~~~~~~~~~~~~~~~~~
DRM_MODE_BLEND_PREMULTI
In file included from ./arch/x86/include/asm/bug.h:83:0,
from ./include/linux/bug.h:5,
from ./include/linux/debug_locks.h:7,
from ./include/linux/lockdep.h:28,
from ./include/linux/spinlock_types.h:18,
from ./include/linux/mutex.h:16,
from ./include/linux/kernfs.h:13,
from ./include/linux/sysfs.h:16,
from ./include/linux/kobject.h:20,
from ./include/linux/dmi.h:6,
from drivers/gpu/drm/i915/intel_display.c:27:
drivers/gpu/drm/i915/intel_display.c:3536:33: error: ‘const struct drm_plane_state’ has no member named ‘pixel_blend_mode’
MISSING_CASE(plane_state->base.pixel_blend_mode);
^
./include/asm-generic/bug.h:98:50: note: in definition of macro ‘__WARN_printf’
#define __WARN_printf(arg...) do { __warn_printk(arg); __WARN(); } while (0)
^~~
drivers/gpu/drm/i915/i915_utils.h:43:25: note: in expansion of macro ‘WARN’
#define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
^~~~drivers/gpu/drm/i915/intel_display.c:3536:3: note: in expansion of macro ‘MISSING_CASE’
MISSING_CASE(plane_state->base.pixel_blend_mode);
^~~~~~~~~~~~drivers/gpu/drm/i915/intel_display.c: In function ‘glk_plane_color_ctl_alpha’:drivers/gpu/drm/i915/intel_display.c:3546:27: error: ‘const struct drm_plane_state’ has no member named ‘pixel_blend_mode’
switch (plane_state->base.pixel_blend_mode) {
^
drivers/gpu/drm/i915/intel_display.c:3547:7: error: ‘DRM_MODE_BLEND_PIXEL_NONE’ undeclared (first use in this function); did you mean ‘DRM_MODE_ENCODER_NONE’?
case DRM_MODE_BLEND_PIXEL_NONE:
^~~~~~~~~~~~~~~~~~~~~~~~~
DRM_MODE_ENCODER_NONE
drivers/gpu/drm/i915/intel_display.c:3549:7: error: ‘DRM_MODE_BLEND_PREMULTI’ undeclared (first use in this function); did you mean ‘DRM_MODE_BLEND_PIXEL_NONE’?
case DRM_MODE_BLEND_PREMULTI:
^~~~~~~~~~~~~~~~~~~~~~~
DRM_MODE_BLEND_PIXEL_NONE
drivers/gpu/drm/i915/intel_display.c:3551:7: error: ‘DRM_MODE_BLEND_COVERAGE’ undeclared (first use in this function); did you mean ‘DRM_MODE_BLEND_PREMULTI’?
case DRM_MODE_BLEND_COVERAGE:
^~~~~~~~~~~~~~~~~~~~~~~
DRM_MODE_BLEND_PREMULTI
In file included from ./arch/x86/include/asm/bug.h:83:0,
from ./include/linux/bug.h:5,
from ./include/linux/debug_locks.h:7,
from ./include/linux/lockdep.h:28,
from ./include/linux/spinlock_types.h:18,
from ./include/linux/mutex.h:16,
from ./include/linux/kernfs.h:13,
from ./include/linux/sysfs.h:16,
from ./include/linux/kobject.h:20,
from ./include/linux/dmi.h:6,
from drivers/gpu/drm/i915/intel_display.c:27:
drivers/gpu/drm/i915/intel_display.c:3554:33: error: ‘const struct drm_plane_state’ has no member named ‘pixel_blend_mode’
MISSING_CASE(plane_state->base.pixel_blend_mode);
^
./include/asm-generic/bug.h:98:50: note: in definition of macro ‘__WARN_printf’
#define __WARN_printf(arg...) do { __warn_printk(arg); __WARN(); } while (0)
^~~
drivers/gpu/drm/i915/i915_utils.h:43:25: note: in expansion of macro ‘WARN’
#define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
^~~~drivers/gpu/drm/i915/intel_display.c:3554:3: note: in expansion of macro ‘MISSING_CASE’
MISSING_CASE(plane_state->base.pixel_blend_mode);
^~~~~~~~~~~~drivers/gpu/drm/i915/intel_display.c: In function ‘intel_primary_plane_create’:drivers/gpu/drm/i915/intel_display.c:13822:3: error: implicit declaration of function ‘drm_plane_create_blend_mode_property’; did you mean ‘drm_plane_create_zpos_property’? [-Werror=implicit-function-declaration]
drm_plane_create_blend_mode_property(&primary->base,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drm_plane_create_zpos_property
In file included from ./include/linux/kernel.h:11:0,
from ./include/linux/list.h:9,
from ./include/linux/dmi.h:5,
from drivers/gpu/drm/i915/intel_display.c:27:
drivers/gpu/drm/i915/intel_display.c:13823:16: error: ‘DRM_MODE_BLEND_PIXEL_NONE’ undeclared (first use in this function); did you mean ‘DRM_MODE_ENCODER_NONE’?
BIT(DRM_MODE_BLEND_PIXEL_NONE) |
^
./include/linux/bitops.h:7:28: note: in definition of macro ‘BIT’
#define BIT(nr) (1UL << (nr))
^~
drivers/gpu/drm/i915/intel_display.c:13824:16: error: ‘DRM_MODE_BLEND_PREMULTI’ undeclared (first use in this function); did you mean ‘DRM_MODE_BLEND_PIXEL_NONE’?
BIT(DRM_MODE_BLEND_PREMULTI) |
^
./include/linux/bitops.h:7:28: note: in definition of macro ‘BIT’
#define BIT(nr) (1UL << (nr))
^~
drivers/gpu/drm/i915/intel_display.c:13825:16: error: ‘DRM_MODE_BLEND_COVERAGE’ undeclared (first use in this function); did you mean ‘DRM_MODE_BLEND_PREMULTI’?
BIT(DRM_MODE_BLEND_COVERAGE));
^
./include/linux/bitops.h:7:28: note: in definition of macro ‘BIT’
#define BIT(nr) (1UL << (nr))
^~drivers/gpu/drm/i915/intel_display.c: In function ‘skl_plane_ctl_alpha’:drivers/gpu/drm/i915/intel_display.c:3539:1: error: control reaches end of non-void function [-Werror=return-type]
}
^drivers/gpu/drm/i915/intel_display.c: In function ‘glk_plane_color_ctl_alpha’:drivers/gpu/drm/i915/intel_display.c:3557:1: error: control reaches end of non-void function [-Werror=return-type]
}
^
cc1: all warnings being treated as errorsscripts/Makefile.build:317: recipe for target 'drivers/gpu/drm/i915/intel_display.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_display.o] Error 1scripts/Makefile.build:558: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:558: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:558: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1029: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx