2019-04-03 09:26:48

by Yannick FERTRE

Subject: [PATCH] drm/stm: ltdc: add modifier support

Signed-off-by: Mickael Reulier <[email protected]>
Signed-off-by: Yannick Fertré <[email protected]>
---
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;
+
ret = ltdc_crtc_init(ddev, crtc);
if (ret) {
DRM_ERROR("Failed to init crtc\n");
--
2.7.4

2019-04-05 16:34:35

by Philippe Cornu

Subject: Re: [PATCH] drm/stm: ltdc: add modifier support

On 4/3/19 11:25 AM, Yannick Fertré wrote:
> Signed-off-by: Mickael Reulier <[email protected]>
> Signed-off-by: Yannick Fertré <[email protected]>
> ---
> 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 <[email protected]>

Philippe :)

> ret = ltdc_crtc_init(ddev, crtc);
> if (ret) {
> DRM_ERROR("Failed to init crtc\n");
>

2019-04-24 12:32:47

by Benjamin Gaignard

Subject: Re: [PATCH] drm/stm: ltdc: add modifier support

Le ven. 5 avr. 2019 à 18:32, Philippe CORNU <[email protected]> a écrit :
>
>
>
> On 4/3/19 11:25 AM, Yannick Fertré wrote:
> > Signed-off-by: Mickael Reulier <[email protected]>
> > Signed-off-by: Yannick Fertré <[email protected]>
> > ---
> > 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 <[email protected]>
>

Applied on drm-misc-next even if I got issue with the author name encoding

Thanks,
Benjamin

> Philippe :)
>
> > ret = ltdc_crtc_init(ddev, crtc);
> > if (ret) {
> > DRM_ERROR("Failed to init crtc\n");
> >
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel