diff options
Diffstat (limited to 'bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0355-gpu-drm-rcar-du-Extend-VSP1-DRM-interface.patch')
| -rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0355-gpu-drm-rcar-du-Extend-VSP1-DRM-interface.patch | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0355-gpu-drm-rcar-du-Extend-VSP1-DRM-interface.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0355-gpu-drm-rcar-du-Extend-VSP1-DRM-interface.patch index 538ca4a6..5e455335 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0355-gpu-drm-rcar-du-Extend-VSP1-DRM-interface.patch +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0355-gpu-drm-rcar-du-Extend-VSP1-DRM-interface.patch @@ -14,9 +14,9 @@ Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com> drivers/gpu/drm/rcar-du/rcar_du_kms.c | 38 ++++++ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 5 + - drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 228 +++++++++++++++++++++++++++----- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 229 ++++++++++++++++++++++++++------ drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 7 +- - 7 files changed, 249 insertions(+), 37 deletions(-) + 7 files changed, 249 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c index 9c0152d..5f1a175 100644 @@ -110,7 +110,7 @@ index d66ae53..f74bc6a 100644 } diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c -index 1b70db3..e934b4c 100644 +index 5818c59..74e0bb1 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -11,6 +11,7 @@ @@ -146,7 +146,7 @@ index e0ddecf..3e9dfdb 100644 static inline struct rcar_du_plane_state * diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c -index c44d336..2b076cf 100644 +index 0c352a0..e53c20e 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -11,6 +11,7 @@ @@ -492,34 +492,33 @@ index c44d336..2b076cf 100644 else return -EINVAL; -@@ -633,8 +777,10 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp, struct device_node *np, +@@ -633,7 +777,8 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp, struct device_node *np, drm_plane_helper_add(&plane->plane, &rcar_du_vsp_plane_helper_funcs); -+#if 0 // ...use same set of properties for all planes - if (type == DRM_PLANE_TYPE_PRIMARY) - continue; -+#endif - - drm_object_attach_property(&plane->plane.base, - rcdu->props.alpha, 255); -@@ -647,6 +793,16 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp, struct device_node *np, +- if (type == DRM_PLANE_TYPE_PRIMARY) { ++ // ...use same set of properties for all planes ++ if (0 && type == DRM_PLANE_TYPE_PRIMARY) { + drm_plane_create_zpos_immutable_property(&plane->plane, + 0); + } else { +@@ -648,6 +793,16 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp, struct device_node *np, 0); - drm_plane_create_zpos_property(&plane->plane, 1, 1, + drm_plane_create_zpos_property(&plane->plane, 1, 1, vsp->num_planes - 1); -+ drm_object_attach_property(&plane->plane.base, -+ rcdu->props.alphaplane, 0); -+ drm_object_attach_property(&plane->plane.base, -+ rcdu->props.blend, 0); -+ drm_object_attach_property(&plane->plane.base, -+ rcdu->props.ckey, 0); -+ drm_object_attach_property(&plane->plane.base, -+ rcdu->props.ckey_set0, 0); -+ drm_object_attach_property(&plane->plane.base, -+ rcdu->props.ckey_set1, 0); ++ drm_object_attach_property(&plane->plane.base, ++ rcdu->props.alphaplane, 0); ++ drm_object_attach_property(&plane->plane.base, ++ rcdu->props.blend, 0); ++ drm_object_attach_property(&plane->plane.base, ++ rcdu->props.ckey, 0); ++ drm_object_attach_property(&plane->plane.base, ++ rcdu->props.ckey_set0, 0); ++ drm_object_attach_property(&plane->plane.base, ++ rcdu->props.ckey_set1, 0); + } } - return 0; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.h b/drivers/gpu/drm/rcar-du/rcar_du_vsp.h index 93dbb9e..083d065 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.h |