lkml.org 
[lkml]   [2019]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] drm/stm: ltdc: add modifier support
Date


On 4/3/19 11:25 AM, Yannick Fertré wrote:
> Signed-off-by: Mickael Reulier <mickael.reulier@st.com>
> Signed-off-by: Yannick Fertré <yannick.fertre@st.com>
> ---
> drivers/gpu/drm/stm/ltdc.c | 21 ++++++++++++++++++++-
> 1 file changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> index b1741a9..6fa8fbc 100644
> --- a/drivers/gpu/drm/stm/ltdc.c
> +++ b/drivers/gpu/drm/stm/ltdc.c
> @@ -232,6 +232,11 @@ static const enum ltdc_pix_fmt ltdc_pix_fmt_a1[NB_PF] = {
> PF_ARGB4444 /* 0x07 */
> };
>
> +static const u64 ltdc_format_modifiers[] = {
> + DRM_FORMAT_MOD_LINEAR,
> + DRM_FORMAT_MOD_INVALID
> +};
> +
> static inline u32 reg_read(void __iomem *base, u32 reg)
> {
> return readl_relaxed(base + reg);
> @@ -864,6 +869,16 @@ static void ltdc_plane_atomic_print_state(struct drm_printer *p,
> fpsi->counter = 0;
> }
>
> +static bool ltdc_plane_format_mod_supported(struct drm_plane *plane,
> + u32 format,
> + u64 modifier)
> +{
> + if (modifier == DRM_FORMAT_MOD_LINEAR)
> + return true;
> +
> + return false;
> +}
> +
> static const struct drm_plane_funcs ltdc_plane_funcs = {
> .update_plane = drm_atomic_helper_update_plane,
> .disable_plane = drm_atomic_helper_disable_plane,
> @@ -872,6 +887,7 @@ static const struct drm_plane_funcs ltdc_plane_funcs = {
> .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
> .atomic_print_state = ltdc_plane_atomic_print_state,
> + .format_mod_supported = ltdc_plane_format_mod_supported,
> };
>
> static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = {
> @@ -890,6 +906,7 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev,
> unsigned int i, nb_fmt = 0;
> u32 formats[NB_PF * 2];
> u32 drm_fmt, drm_fmt_no_alpha;
> + const u64 *modifiers = ltdc_format_modifiers;
> int ret;
>
> /* Get supported pixel formats */
> @@ -918,7 +935,7 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev,
>
> ret = drm_universal_plane_init(ddev, plane, possible_crtcs,
> &ltdc_plane_funcs, formats, nb_fmt,
> - NULL, type, NULL);
> + modifiers, type, NULL);
> if (ret < 0)
> return NULL;
>
> @@ -1179,6 +1196,8 @@ int ltdc_load(struct drm_device *ddev)
> goto err;
> }
>
> + ddev->mode_config.allow_fb_modifiers = true;
> +


Acked-by: Philippe Cornu <philippe.cornu@st.com>

Philippe :)

> ret = ltdc_crtc_init(ddev, crtc);
> if (ret) {
> DRM_ERROR("Failed to init crtc\n");
>
\
 
 \ /
  Last update: 2019-04-05 18:33    [W:0.048 / U:35.472 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site