summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/msm/msm_drv.h
diff options
context:
space:
mode:
authorjilai wang <jilaiw@codeaurora.org>2015-06-25 17:37:42 -0400
committerRob Clark <robdclark@gmail.com>2015-08-15 18:27:15 -0400
commit129877819c0a5f8d419fe67ae08a8a7c811afa5e (patch)
treedc093d220897efd68d1beecf5aed0078a45aff05 /drivers/gpu/drm/msm/msm_drv.h
parent4ff696eafaa50d6d649d256d20528b475104a500 (diff)
downloadlwn-129877819c0a5f8d419fe67ae08a8a7c811afa5e.tar.gz
lwn-129877819c0a5f8d419fe67ae08a8a7c811afa5e.zip
drm/msm/mdp5: Add plane blending operation support for MDP5 (v2)
This change is to add properties alpha/zpos/blend_mode to mdp5 plane for alpha blending operation to generate the blended output. v1: Initial change v2: Change "premultilied" property to enum (Rob's comment) Signed-off-by: Jilai Wang <jilaiw@codeaurora.org> [Don't actually expose alpha/premultiplied props to userspace yet pending a chance for discussion and some userspace to exercise it] Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.h')
-rw-r--r--drivers/gpu/drm/msm/msm_drv.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index 4ff0ec9c994b..c89c9352d31e 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -64,6 +64,13 @@ struct msm_file_private {
int dummy;
};
+enum msm_mdp_plane_property {
+ PLANE_PROP_ZPOS,
+ PLANE_PROP_ALPHA,
+ PLANE_PROP_PREMULTIPLIED,
+ PLANE_PROP_MAX_NUM
+};
+
struct msm_drm_private {
struct msm_kms *kms;
@@ -128,6 +135,9 @@ struct msm_drm_private {
unsigned int num_connectors;
struct drm_connector *connectors[8];
+ /* Properties */
+ struct drm_property *plane_property[PLANE_PROP_MAX_NUM];
+
/* VRAM carveout, used when no IOMMU: */
struct {
unsigned long size;