drm/stm: attach gem fence to atomic state

Submitted by Lucas Stach on July 12, 2019, 8:42 a.m.

Details

Message ID 20190712084228.8338-1-l.stach@pengutronix.de
State Accepted
Commit 8fabc9c3109a71b3577959a05408153ae69ccd8d
Headers show
Series "drm/stm: attach gem fence to atomic state" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Lucas Stach July 12, 2019, 8:42 a.m.
From: Ahmad Fatoum <a.fatoum@pengutronix.de>

To properly synchronize with other devices the fence from the GEM
object backing the framebuffer needs to be attached to the atomic
state, so the commit work can wait on fence signaling.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/gpu/drm/stm/ltdc.c | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index 2fe6c4a8d915..3ab4fbf8eb0d 100644
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -26,6 +26,7 @@ 
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_of.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
@@ -922,6 +923,7 @@  static const struct drm_plane_funcs ltdc_plane_funcs = {
 };
 
 static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = {
+	.prepare_fb = drm_gem_fb_prepare_fb,
 	.atomic_check = ltdc_plane_atomic_check,
 	.atomic_update = ltdc_plane_atomic_update,
 	.atomic_disable = ltdc_plane_atomic_disable,

Comments

Hi Lucas & Ahmad,

Many thanks for your patch,

Tested successfully on stm32mp157-dk2 (weston & drm).

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

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


Philippe :-)

On 7/12/19 10:42 AM, Lucas Stach wrote:
> From: Ahmad Fatoum <a.fatoum@pengutronix.de>

> 

> To properly synchronize with other devices the fence from the GEM

> object backing the framebuffer needs to be attached to the atomic

> state, so the commit work can wait on fence signaling.

> 

> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>

> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

> ---

>   drivers/gpu/drm/stm/ltdc.c | 2 ++

>   1 file changed, 2 insertions(+)

> 

> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c

> index 2fe6c4a8d915..3ab4fbf8eb0d 100644

> --- a/drivers/gpu/drm/stm/ltdc.c

> +++ b/drivers/gpu/drm/stm/ltdc.c

> @@ -26,6 +26,7 @@

>   #include <drm/drm_fb_cma_helper.h>

>   #include <drm/drm_fourcc.h>

>   #include <drm/drm_gem_cma_helper.h>

> +#include <drm/drm_gem_framebuffer_helper.h>

>   #include <drm/drm_of.h>

>   #include <drm/drm_plane_helper.h>

>   #include <drm/drm_probe_helper.h>

> @@ -922,6 +923,7 @@ static const struct drm_plane_funcs ltdc_plane_funcs = {

>   };

>   

>   static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = {

> +	.prepare_fb = drm_gem_fb_prepare_fb,

>   	.atomic_check = ltdc_plane_atomic_check,

>   	.atomic_update = ltdc_plane_atomic_update,

>   	.atomic_disable = ltdc_plane_atomic_disable,

>
Le ven. 19 juil. 2019 à 15:35, Philippe CORNU <philippe.cornu@st.com> a écrit :
>
> Hi Lucas & Ahmad,
>
> Many thanks for your patch,
>
> Tested successfully on stm32mp157-dk2 (weston & drm).
>
> Acked-by: Philippe Cornu <philippe.cornu@st.com>
> Tested-by: Philippe Cornu <philippe.cornu@st.com>

Applied on drm-misc-next.
Thanks,
Benjamin

>
> Philippe :-)
>
> On 7/12/19 10:42 AM, Lucas Stach wrote:
> > From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> >
> > To properly synchronize with other devices the fence from the GEM
> > object backing the framebuffer needs to be attached to the atomic
> > state, so the commit work can wait on fence signaling.
> >
> > Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > ---
> >   drivers/gpu/drm/stm/ltdc.c | 2 ++
> >   1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> > index 2fe6c4a8d915..3ab4fbf8eb0d 100644
> > --- a/drivers/gpu/drm/stm/ltdc.c
> > +++ b/drivers/gpu/drm/stm/ltdc.c
> > @@ -26,6 +26,7 @@
> >   #include <drm/drm_fb_cma_helper.h>
> >   #include <drm/drm_fourcc.h>
> >   #include <drm/drm_gem_cma_helper.h>
> > +#include <drm/drm_gem_framebuffer_helper.h>
> >   #include <drm/drm_of.h>
> >   #include <drm/drm_plane_helper.h>
> >   #include <drm/drm_probe_helper.h>
> > @@ -922,6 +923,7 @@ static const struct drm_plane_funcs ltdc_plane_funcs = {
> >   };
> >
> >   static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = {
> > +     .prepare_fb = drm_gem_fb_prepare_fb,
> >       .atomic_check = ltdc_plane_atomic_check,
> >       .atomic_update = ltdc_plane_atomic_update,
> >       .atomic_disable = ltdc_plane_atomic_disable,
> >