2020-05-23 04:23:40

by XueBing Chen

[permalink] [raw]
Subject: [PATCH] drm: fix setting of plane_mask in pan_display_atomic() function for linux-4.4

From: Xuebing Chen <[email protected]>

The <include/drm/drm_crtc.h> provides drm_for_each_plane_mask macro and
plane_mask is defined as bitmask of plane indices, such as
1<<drm_plane_index(plane). This patch fixes error setting of plane_mask
in pan_display_atomic() function.

Signed-off-by: Xuebing Chen <[email protected]>
---
drivers/gpu/drm/drm_fb_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index e449f22..6a9f7ee 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1256,7 +1256,7 @@ retry:
goto fail;

plane = mode_set->crtc->primary;
- plane_mask |= drm_plane_index(plane);
+ plane_mask |= 1 << drm_plane_index(plane);
plane->old_fb = plane->fb;
}

--
2.7.4


2020-05-25 14:36:35

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PATCH] drm: fix setting of plane_mask in pan_display_atomic() function for linux-4.4

On Sat, May 23, 2020 at 11:49:07AM +0800, [email protected] wrote:
> From: Xuebing Chen <[email protected]>
>
> The <include/drm/drm_crtc.h> provides drm_for_each_plane_mask macro and
> plane_mask is defined as bitmask of plane indices, such as
> 1<<drm_plane_index(plane). This patch fixes error setting of plane_mask
> in pan_display_atomic() function.
>
> Signed-off-by: Xuebing Chen <[email protected]>

What kernel is this patch against? Latest upstream doesn't have any such
code anymore ... I'm assuming that Ville fixed this in one of his patches,
but I can't find the right one just now.
-Daniel

> ---
> drivers/gpu/drm/drm_fb_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index e449f22..6a9f7ee 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -1256,7 +1256,7 @@ retry:
> goto fail;
>
> plane = mode_set->crtc->primary;
> - plane_mask |= drm_plane_index(plane);
> + plane_mask |= 1 << drm_plane_index(plane);
> plane->old_fb = plane->fb;
> }
>
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

2020-05-25 14:58:42

by Ville Syrjälä

[permalink] [raw]
Subject: Re: [PATCH] drm: fix setting of plane_mask in pan_display_atomic() function for linux-4.4

On Mon, May 25, 2020 at 04:34:28PM +0200, Daniel Vetter wrote:
> On Sat, May 23, 2020 at 11:49:07AM +0800, [email protected] wrote:
> > From: Xuebing Chen <[email protected]>
> >
> > The <include/drm/drm_crtc.h> provides drm_for_each_plane_mask macro and
> > plane_mask is defined as bitmask of plane indices, such as
> > 1<<drm_plane_index(plane). This patch fixes error setting of plane_mask
> > in pan_display_atomic() function.
> >
> > Signed-off-by: Xuebing Chen <[email protected]>
>
> What kernel is this patch against? Latest upstream doesn't have any such
> code anymore ... I'm assuming that Ville fixed this in one of his patches,
> but I can't find the right one just now.

Looks to be gone in
commit e00fb8564ee9 ("drm: Stop updating plane->crtc/fb/old_fb on
atomic drivers"), in 2018.

Also seems this 1<< bug was already fixed in
commit 7118fd9bd975 ("drm/fb-helper: Use proper plane mask for fb
cleanup") ... in 2015!

Might be a good idea to invest in an upgrade if you're still using
such old kernel releases.

> -Daniel
>
> > ---
> > drivers/gpu/drm/drm_fb_helper.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> > index e449f22..6a9f7ee 100644
> > --- a/drivers/gpu/drm/drm_fb_helper.c
> > +++ b/drivers/gpu/drm/drm_fb_helper.c
> > @@ -1256,7 +1256,7 @@ retry:
> > goto fail;
> >
> > plane = mode_set->crtc->primary;
> > - plane_mask |= drm_plane_index(plane);
> > + plane_mask |= 1 << drm_plane_index(plane);
> > plane->old_fb = plane->fb;
> > }
> >
> > --
> > 2.7.4
> >
> > _______________________________________________
> > dri-devel mailing list
> > [email protected]
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Ville Syrj?l?
Intel