* [PATCH v2 2/4] drm: Added plane alpha and color blending property
2014-03-25 14:32 ` [PATCH v2 1/4] drm: Adding new flag to restrict bitmask drm properties as 32 bit type and 32 bit value pair sagar.a.kamble
@ 2014-03-25 14:32 ` sagar.a.kamble
2014-04-10 10:39 ` [PATCH v2 1/4] drm: Adding new flag to restrict bitmask drm properties as 32 bit type and 32 bit value pair Sagar Arun Kamble
1 sibling, 0 replies; 3+ messages in thread
From: sagar.a.kamble @ 2014-03-25 14:32 UTC (permalink / raw)
To: intel-gfx; +Cc: Sagar Kamble, airlied, dri-devel, linux-kernel
From: Sagar Kamble <sagar.a.kamble@intel.com>
This patch creates a generic blending bitmask property modeled after
glBlendFunc. Drivers may support subset of these values.
v2: Removing blend properties that are not applicable
[Damien's Review Comments].
Adding DRM_MODE_PROP_32BIT_PAIR flag to blend property.
Cc: airlied@linux.ie
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Sagar Kamble <sagar.a.kamble@intel.com>
---
drivers/gpu/drm/drm_crtc.c | 27 +++++++++++++++++++++++++++
include/drm/drm_crtc.h | 19 +++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index d0d03ec..a1f254e 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -4157,3 +4157,30 @@ void drm_mode_config_cleanup(struct drm_device *dev)
idr_destroy(&dev->mode_config.crtc_idr);
}
EXPORT_SYMBOL(drm_mode_config_cleanup);
+
+struct drm_property *drm_mode_create_blend_property(struct drm_device *dev,
+ unsigned int supported_factors)
+{
+ static const struct drm_prop_enum_list props[] = {
+ { DRM_BLEND_ZERO, "zero" },
+ { DRM_BLEND_ONE, "one" },
+ { DRM_BLEND_SRC_COLOR, "src-color" },
+ { DRM_BLEND_ONE_MINUS_SRC_COLOR, "one-minus-src-color" },
+ { DRM_BLEND_DST_COLOR, "dst-color" },
+ { DRM_BLEND_ONE_MINUS_DST_COLOR, "one-minus-dst-color" },
+ { DRM_BLEND_SRC_ALPHA, "src-alpha" },
+ { DRM_BLEND_ONE_MINUS_SRC_ALPHA, "one-minus-src-alpha" },
+ { DRM_BLEND_DST_ALPHA, "dst-alpha" },
+ { DRM_BLEND_ONE_MINUS_DST_ALPHA, "one-minus-dst-alpha" },
+ { DRM_BLEND_CONSTANT_COLOR, "constant-color" },
+ { DRM_BLEND_ONE_MINUS_CONSTANT_COLOR, "one-minus-constant-color" },
+ { DRM_BLEND_CONSTANT_ALPHA, "constant-alpha" },
+ { DRM_BLEND_ONE_MINUS_CONSTANT_ALPHA, "one-minus-constant-alpha" },
+ { DRM_BLEND_SRC_ALPHA_SATURATE, "alpha-saturate" }
+ };
+
+ return drm_property_create_bitmask(dev, DRM_MODE_PROP_32BIT_PAIR, "blend",
+ props, ARRAY_SIZE(props),
+ supported_factors);
+}
+EXPORT_SYMBOL(drm_mode_create_blend_property);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 784a568..a9fbfec 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -65,6 +65,23 @@ struct drm_object_properties {
uint64_t values[DRM_OBJECT_MAX_PROPERTY];
};
+/* Blending property bits */
+#define DRM_BLEND_ZERO 0
+#define DRM_BLEND_ONE 1
+#define DRM_BLEND_SRC_COLOR 2
+#define DRM_BLEND_ONE_MINUS_SRC_COLOR 3
+#define DRM_BLEND_DST_COLOR 4
+#define DRM_BLEND_ONE_MINUS_DST_COLOR 5
+#define DRM_BLEND_SRC_ALPHA 6
+#define DRM_BLEND_ONE_MINUS_SRC_ALPHA 7
+#define DRM_BLEND_DST_ALPHA 8
+#define DRM_BLEND_ONE_MINUS_DST_ALPHA 9
+#define DRM_BLEND_CONSTANT_COLOR 10
+#define DRM_BLEND_ONE_MINUS_CONSTANT_COLOR 11
+#define DRM_BLEND_CONSTANT_ALPHA 12
+#define DRM_BLEND_ONE_MINUS_CONSTANT_ALPHA 13
+#define DRM_BLEND_SRC_ALPHA_SATURATE 14
+
/*
* Note on terminology: here, for brevity and convenience, we refer to connector
* control chips as 'CRTCs'. They can control any type of connector, VGA, LVDS,
@@ -1179,6 +1196,8 @@ extern int drm_format_plane_cpp(uint32_t format, int plane);
extern int drm_format_horz_chroma_subsampling(uint32_t format);
extern int drm_format_vert_chroma_subsampling(uint32_t format);
extern const char *drm_get_format_name(uint32_t format);
+extern struct drm_property *drm_mode_create_blend_property(struct drm_device *dev,
+ unsigned int supported_factors);
/* Helpers */
static inline struct drm_crtc *drm_crtc_find(struct drm_device *dev,
--
1.8.5
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/4] drm: Adding new flag to restrict bitmask drm properties as 32 bit type and 32 bit value pair
2014-03-25 14:32 ` [PATCH v2 1/4] drm: Adding new flag to restrict bitmask drm properties as 32 bit type and 32 bit value pair sagar.a.kamble
2014-03-25 14:32 ` [PATCH v2 2/4] drm: Added plane alpha and color blending property sagar.a.kamble
@ 2014-04-10 10:39 ` Sagar Arun Kamble
1 sibling, 0 replies; 3+ messages in thread
From: Sagar Arun Kamble @ 2014-04-10 10:39 UTC (permalink / raw)
To: intel-gfx; +Cc: airlied, dri-devel, linux-kernel, robdclark, rusty
Adding Rob and Rusty in the review thread.
Kindly review these patches for interface being proposed to set
color/alpha property of planes modeled after glBlendFunc.
http://lists.freedesktop.org/archives/intel-gfx/2014-March/042350.html
http://lists.freedesktop.org/archives/intel-gfx/2014-March/042351.html
http://lists.freedesktop.org/archives/intel-gfx/2014-March/042352.html
http://lists.freedesktop.org/archives/intel-gfx/2014-March/042587.html
http://lists.freedesktop.org/archives/intel-gfx/2014-March/042354.html
thanks,
Sagar
On Tue, 2014-03-25 at 20:02 +0530, sagar.a.kamble@intel.com wrote:
> From: Sagar Kamble <sagar.a.kamble@intel.com>
>
> With this patch new flag DRM_MODE_PROP_32BIT_PAIR is added that will help make use
> of 64 bit value of bitmask property as two 32 bit values.
>
> Cc: airlied@linux.ie
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Sagar Kamble <sagar.a.kamble@intel.com>
> ---
> drivers/gpu/drm/drm_crtc.c | 22 ++++++++++++++++------
> include/uapi/drm/drm_mode.h | 3 +++
> 2 files changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 4e43fc2..d0d03ec 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -2993,10 +2993,13 @@ int drm_property_add_enum(struct drm_property *property, int index,
>
> /*
> * Bitmask enum properties have the additional constraint of values
> - * from 0 to 63
> + * from 0 to 63. For properties with 32BIT_PAIR Flag set this constraint
> + * range is 0 to 31.
> */
> - if ((property->flags & DRM_MODE_PROP_BITMASK) && (value > 63))
> - return -EINVAL;
> + if (property->flags & DRM_MODE_PROP_BITMASK)
> + if (((property->flags & DRM_MODE_PROP_32BIT_PAIR) && (value > 31)) ||
> + (value > 63))
> + return -EINVAL;
>
> if (!list_empty(&property->enum_blob_list)) {
> list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
> @@ -3305,9 +3308,16 @@ static bool drm_property_change_is_valid(struct drm_property *property,
> } else if (property->flags & DRM_MODE_PROP_BITMASK) {
> int i;
> uint64_t valid_mask = 0;
> - for (i = 0; i < property->num_values; i++)
> - valid_mask |= (1ULL << property->values[i]);
> - return !(value & ~valid_mask);
> + uint32_t valid_32bit_mask = 0;
> + if (property->flags & DRM_MODE_PROP_32BIT_PAIR) {
> + for (i = 0; i < property->num_values; i++)
> + valid_32bit_mask |= (1UL << property->values[i]);
> + return !((value & 0xFFFFFFFF) & ~valid_32bit_mask);
> + } else {
> + for (i = 0; i < property->num_values; i++)
> + valid_mask |= (1ULL << property->values[i]);
> + return !(value & ~valid_mask);
> + }
> } else if (property->flags & DRM_MODE_PROP_BLOB) {
> /* Only the driver knows */
> return true;
> diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> index f104c26..5e3a7d9 100644
> --- a/include/uapi/drm/drm_mode.h
> +++ b/include/uapi/drm/drm_mode.h
> @@ -250,6 +250,9 @@ struct drm_mode_get_connector {
> #define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */
> #define DRM_MODE_PROP_BLOB (1<<4)
> #define DRM_MODE_PROP_BITMASK (1<<5) /* bitmask of enumerated types */
> +#define DRM_MODE_PROP_32BIT_PAIR (1<<6) /* 32 bit bitmask of enumerated types
> + * and 32 bit of value of the type */
> +
>
> struct drm_mode_property_enum {
> __u64 value;
^ permalink raw reply [flat|nested] 3+ messages in thread