drm/msm/mdp: mark if a MDP format is YUV at definition

[deliverable/linux.git] / drivers / gpu / drm / msm / msm_drv.h

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index e7c5ea125d45ed42ebaa043522a88b4bcb2c2e3f..c89c9352d31e6af5ac40203dbe1b50d28a793349 100644 (file)
--- 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;
@@ -164,8 +174,8 @@ int msm_atomic_commit(struct drm_device *dev,
 
 int msm_register_mmu(struct drm_device *dev, struct msm_mmu *mmu);
 
-int msm_wait_fence_interruptable(struct drm_device *dev, uint32_t fence,
-               ktime_t *timeout);
+int msm_wait_fence(struct drm_device *dev, uint32_t fence,
+               ktime_t *timeout, bool interruptible);
 int msm_queue_fence_cb(struct drm_device *dev,
                struct msm_fence_cb *cb, uint32_t fence);
 void msm_update_fence(struct drm_device *dev, uint32_t fence);