| Message ID | 96f62304bad202e4f920d2f4ed62c485@abrecht.li (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Implement .format_mod_supported in mxsfb | expand |
Hi Daniel, On Sat, Oct 24, 2020 at 04:59:16PM +0000, Daniel Abrecht wrote: > This will make sure applications which use the IN_FORMATS blob > to figure out which modifiers they can use will pick up the > linear modifier which is needed by mxsfb. Such applications > will not work otherwise if an incompatible implicit modifier > ends up being selected. Since this got broken by the switch away for the simple display pipeline helper (ae1ed0093281939b80664a687689f12436c0e874) could you add a fixes tag? Cheers, -- Guido > > Signed-off-by: Daniel Abrecht <public@danielabrecht.ch> > --- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > index 956f631997f2..fc4b1626261b 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > @@ -484,6 +484,13 @@ static void mxsfb_plane_overlay_atomic_update(struct > drm_plane *plane, > writel(ctrl, mxsfb->base + LCDC_AS_CTRL); > } > > +static bool mxsfb_format_mod_supported(struct drm_plane *plane, > + uint32_t format, > + uint64_t modifier) > +{ > + return modifier == DRM_FORMAT_MOD_LINEAR; > +} > + > static const struct drm_plane_helper_funcs mxsfb_plane_primary_helper_funcs > = { > .atomic_check = mxsfb_plane_atomic_check, > .atomic_update = mxsfb_plane_primary_atomic_update, > @@ -495,6 +502,7 @@ static const struct drm_plane_helper_funcs > mxsfb_plane_overlay_helper_funcs = { > }; > > static const struct drm_plane_funcs mxsfb_plane_funcs = { > + .format_mod_supported = mxsfb_format_mod_supported, > .update_plane = drm_atomic_helper_update_plane, > .disable_plane = drm_atomic_helper_disable_plane, > .destroy = drm_plane_cleanup, > -- > 2.20.1 > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Guido Am 2020-10-25 15:52, schrieb Guido Günther: > Since this got broken by the switch away for the simple display > pipeline helper (ae1ed0093281939b80664a687689f12436c0e874) could > you add a fixes tag? > Cheers, > -- Guido Thanks, I've sent a v2 with the fixes tag added. Regards, Daniel Abrecht
On Sun, Oct 25, 2020 at 4:52 PM Guido Günther <agx@sigxcpu.org> wrote: > > Hi Daniel, > On Sat, Oct 24, 2020 at 04:59:16PM +0000, Daniel Abrecht wrote: > > This will make sure applications which use the IN_FORMATS blob > > to figure out which modifiers they can use will pick up the > > linear modifier which is needed by mxsfb. Such applications > > will not work otherwise if an incompatible implicit modifier > > ends up being selected. > > Since this got broken by the switch away for the simple display > pipeline helper (ae1ed0093281939b80664a687689f12436c0e874) could > you add a fixes tag? mxsfb is also missing setting the allow_fb_modifiers flag, without which all this modifier stuff won't work great. Please add that too. I guess some igt testing for this might be useful too, but not sure we can do that with sufficient generality. It should fall over though since if you try to create an fb with modifiers you'll fail, so no idea what userspace you have here. -Daniel > Cheers, > -- Guido > > > > > Signed-off-by: Daniel Abrecht <public@danielabrecht.ch> > > --- > > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > > b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > > index 956f631997f2..fc4b1626261b 100644 > > --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > > +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > > @@ -484,6 +484,13 @@ static void mxsfb_plane_overlay_atomic_update(struct > > drm_plane *plane, > > writel(ctrl, mxsfb->base + LCDC_AS_CTRL); > > } > > > > +static bool mxsfb_format_mod_supported(struct drm_plane *plane, > > + uint32_t format, > > + uint64_t modifier) > > +{ > > + return modifier == DRM_FORMAT_MOD_LINEAR; > > +} > > + > > static const struct drm_plane_helper_funcs mxsfb_plane_primary_helper_funcs > > = { > > .atomic_check = mxsfb_plane_atomic_check, > > .atomic_update = mxsfb_plane_primary_atomic_update, > > @@ -495,6 +502,7 @@ static const struct drm_plane_helper_funcs > > mxsfb_plane_overlay_helper_funcs = { > > }; > > > > static const struct drm_plane_funcs mxsfb_plane_funcs = { > > + .format_mod_supported = mxsfb_format_mod_supported, > > .update_plane = drm_atomic_helper_update_plane, > > .disable_plane = drm_atomic_helper_disable_plane, > > .destroy = drm_plane_cleanup, > > -- > > 2.20.1 > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Mon, Oct 26, 2020 at 10:05:17AM +0100, Daniel Vetter wrote: > On Sun, Oct 25, 2020 at 4:52 PM Guido Günther <agx@sigxcpu.org> wrote: > > > > Hi Daniel, > > On Sat, Oct 24, 2020 at 04:59:16PM +0000, Daniel Abrecht wrote: > > > This will make sure applications which use the IN_FORMATS blob > > > to figure out which modifiers they can use will pick up the > > > linear modifier which is needed by mxsfb. Such applications > > > will not work otherwise if an incompatible implicit modifier > > > ends up being selected. > > > > Since this got broken by the switch away for the simple display > > pipeline helper (ae1ed0093281939b80664a687689f12436c0e874) could > > you add a fixes tag? > > mxsfb is also missing setting the allow_fb_modifiers flag, without > which all this modifier stuff won't work great. drm_universal_plane_init() automagically adds it if a modifier list is passed in.
On Mon, Oct 26, 2020 at 12:52:07PM +0200, Ville Syrjälä wrote: > On Mon, Oct 26, 2020 at 10:05:17AM +0100, Daniel Vetter wrote: > > On Sun, Oct 25, 2020 at 4:52 PM Guido Günther <agx@sigxcpu.org> wrote: > > > > > > Hi Daniel, > > > On Sat, Oct 24, 2020 at 04:59:16PM +0000, Daniel Abrecht wrote: > > > > This will make sure applications which use the IN_FORMATS blob > > > > to figure out which modifiers they can use will pick up the > > > > linear modifier which is needed by mxsfb. Such applications > > > > will not work otherwise if an incompatible implicit modifier > > > > ends up being selected. > > > > > > Since this got broken by the switch away for the simple display > > > pipeline helper (ae1ed0093281939b80664a687689f12436c0e874) could > > > you add a fixes tag? > > > > mxsfb is also missing setting the allow_fb_modifiers flag, without > > which all this modifier stuff won't work great. > > drm_universal_plane_init() automagically adds it if a modifier list > is passed in. Oh right I missed that :-/ I guess then removing the explicit setting from drivers would be good, and maybe adding a comment to the kerneldoc about that. And more of a mess indeed ... -Daniel
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c index 956f631997f2..fc4b1626261b 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c @@ -484,6 +484,13 @@ static void mxsfb_plane_overlay_atomic_update(struct drm_plane *plane, writel(ctrl, mxsfb->base + LCDC_AS_CTRL); } +static bool mxsfb_format_mod_supported(struct drm_plane *plane, + uint32_t format, + uint64_t modifier) +{ + return modifier == DRM_FORMAT_MOD_LINEAR; +} + static const struct drm_plane_helper_funcs mxsfb_plane_primary_helper_funcs = {
This will make sure applications which use the IN_FORMATS blob to figure out which modifiers they can use will pick up the linear modifier which is needed by mxsfb. Such applications will not work otherwise if an incompatible implicit modifier ends up being selected. Signed-off-by: Daniel Abrecht <public@danielabrecht.ch> --- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 8 ++++++++ 1 file changed, 8 insertions(+) .atomic_check = mxsfb_plane_atomic_check, .atomic_update = mxsfb_plane_primary_atomic_update, @@ -495,6 +502,7 @@ static const struct drm_plane_helper_funcs mxsfb_plane_overlay_helper_funcs = { }; static const struct drm_plane_funcs mxsfb_plane_funcs = { + .format_mod_supported = mxsfb_format_mod_supported, .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = drm_plane_cleanup,