From: sagar.a.kamble@intel.com To: intel-gfx@lists.freedesktop.org Cc: Sagar Kamble <sagar.a.kamble@intel.com>, airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] drm: Added plane alpha and color blending property Date: Tue, 25 Mar 2014 20:02:25 +0530 [thread overview] Message-ID: <1395757947-16492-2-git-send-email-sagar.a.kamble@intel.com> (raw) In-Reply-To: <1395757947-16492-1-git-send-email-sagar.a.kamble@intel.com> 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
WARNING: multiple messages have this Message-ID (diff)
From: sagar.a.kamble@intel.com To: intel-gfx@lists.freedesktop.org Cc: Sagar Kamble <sagar.a.kamble@intel.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/4] drm: Added plane alpha and color blending property Date: Tue, 25 Mar 2014 20:02:25 +0530 [thread overview] Message-ID: <1395757947-16492-2-git-send-email-sagar.a.kamble@intel.com> (raw) In-Reply-To: <1395757947-16492-1-git-send-email-sagar.a.kamble@intel.com> 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
next prev parent reply other threads:[~2014-03-25 14:31 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-19 10:08 [RFC 1/1] drm/i915: Added support for setting plane alpha through drm property sagar.a.kamble 2014-02-24 15:44 ` Sagar Arun Kamble 2014-03-06 12:03 ` Damien Lespiau 2014-03-06 12:09 ` Damien Lespiau 2014-02-25 18:18 ` Ville Syrjälä 2014-03-04 9:42 ` [Intel-gfx] " Daniel Vetter 2014-03-04 12:06 ` Ville Syrjälä 2014-03-06 10:28 ` [Intel-gfx] " Sagar Arun Kamble 2014-03-06 11:24 ` Daniel Vetter 2014-03-08 8:21 ` [PATCH 0/4] Adding support for plane alpha/color blending " sagar.a.kamble 2014-03-08 8:21 ` [PATCH 1/4] drm: Added plane alpha and color blending property sagar.a.kamble 2014-03-08 8:21 ` sagar.a.kamble 2014-03-20 11:58 ` [Intel-gfx] " Damien Lespiau 2014-03-20 11:58 ` Damien Lespiau 2014-03-20 14:21 ` [Intel-gfx] " Damien Lespiau 2014-03-08 8:21 ` [PATCH 2/4] drm/i915: Enabling constant alpha drm property sagar.a.kamble 2014-03-20 13:51 ` Damien Lespiau 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-03-25 14:32 ` sagar.a.kamble [this message] 2014-03-25 14:32 ` [PATCH v2 2/4] drm: Added plane alpha and color blending property sagar.a.kamble 2014-03-25 14:32 ` [PATCH v2 3/4] drm/i915: Enabling constant alpha drm property sagar.a.kamble 2014-04-01 4:51 ` Sagar Arun Kamble 2014-04-02 6:12 ` Sagar Arun Kamble 2014-04-03 5:43 ` Sagar Arun Kamble 2014-04-15 9:44 ` Sagar Arun Kamble 2014-04-15 10:35 ` Ville Syrjälä 2014-04-15 11:23 ` Sagar Arun Kamble 2014-04-15 11:44 ` Ville Syrjälä 2014-03-25 14:32 ` [PATCH v2 4/4] Documentation: drm: describing plane alpha and color blending property sagar.a.kamble 2014-03-26 12:30 ` David Herrmann 2014-03-27 9:03 ` [PATCH v3 1/1] " sagar.a.kamble 2014-03-27 9:50 ` sagar.a.kamble 2014-03-27 12:38 ` David Herrmann 2014-03-27 17:31 ` [PATCH v4 " 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 2014-04-10 10:39 ` Sagar Arun Kamble 2014-03-08 8:21 ` [PATCH 3/4] drm/i915: Enabling pre-multiplied alpha drm property sagar.a.kamble 2014-03-19 15:10 ` Damien Lespiau 2014-03-20 9:59 ` Sagar Arun Kamble 2014-03-20 11:38 ` Damien Lespiau 2014-03-20 13:51 ` Daniel Vetter 2014-03-20 14:00 ` Damien Lespiau 2014-03-08 8:21 ` [PATCH 4/4] Documentation: drm: describing plane alpha and color blending property sagar.a.kamble 2014-03-10 14:43 ` Laurent Pinchart 2014-03-20 14:11 ` [PATCH 0/4] Adding support for plane alpha/color blending through drm property Damien Lespiau 2014-03-20 14:45 ` Damien Lespiau 2014-03-21 13:36 ` Sagar Arun Kamble 2014-03-21 19:23 ` Damien Lespiau 2014-04-02 19:36 ` Ville Syrjälä 2014-03-25 10:03 ` Sagar Arun Kamble 2014-03-25 10:51 ` Daniel Vetter 2014-03-25 12:26 ` Damien Lespiau
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1395757947-16492-2-git-send-email-sagar.a.kamble@intel.com \ --to=sagar.a.kamble@intel.com \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.