[PATCHv5,29/34] drm/arm/malidp: Make verify funcitons invocations independent
diff mbox series

Message ID 20191217145020.14645-30-andrzej.p@collabora.com
State New
Headers show
Series
  • Add AFBC support for Rockchip
Related show

Commit Message

Andrzej Pietrasiewicz Dec. 17, 2019, 2:50 p.m. UTC
This will make it easier to transition to generic afbc-aware helpers.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
---
 drivers/gpu/drm/arm/malidp_drv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Boris Brezillon Feb. 20, 2020, 11:26 a.m. UTC | #1
In the subject: s/funcitons/functions/

On Tue, 17 Dec 2019 15:50:15 +0100
Andrzej Pietrasiewicz <andrzej.p@collabora.com> wrote:

> This will make it easier to transition to generic afbc-aware helpers.
> 
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>

> ---
>  drivers/gpu/drm/arm/malidp_drv.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
> index 37d92a06318e..961e5a3f5b08 100644
> --- a/drivers/gpu/drm/arm/malidp_drv.c
> +++ b/drivers/gpu/drm/arm/malidp_drv.c
> @@ -362,10 +362,10 @@ static bool
>  malidp_verify_afbc_framebuffer(struct drm_device *dev, struct drm_file *file,
>  			       const struct drm_mode_fb_cmd2 *mode_cmd)
>  {
> -	if (malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
> -		return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
> +	if (!malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
> +		return false;
>  
> -	return false;
> +	return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
>  }
>  
>  static struct drm_framebuffer *
Boris Brezillon Feb. 20, 2020, 11:29 a.m. UTC | #2
On Thu, 20 Feb 2020 12:26:01 +0100
Boris Brezillon <boris.brezillon@collabora.com> wrote:

> In the subject: s/funcitons/functions/
> 
> On Tue, 17 Dec 2019 15:50:15 +0100
> Andrzej Pietrasiewicz <andrzej.p@collabora.com> wrote:
> 
> > This will make it easier to transition to generic afbc-aware helpers.
> > 
> > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>  
> 
> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>

Wait, patch 30 is this patch completely irrelevant, so I take R-b back
:-). You can just squash that one in patch 30.

> 
> > ---
> >  drivers/gpu/drm/arm/malidp_drv.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
> > index 37d92a06318e..961e5a3f5b08 100644
> > --- a/drivers/gpu/drm/arm/malidp_drv.c
> > +++ b/drivers/gpu/drm/arm/malidp_drv.c
> > @@ -362,10 +362,10 @@ static bool
> >  malidp_verify_afbc_framebuffer(struct drm_device *dev, struct drm_file *file,
> >  			       const struct drm_mode_fb_cmd2 *mode_cmd)
> >  {
> > -	if (malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
> > -		return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
> > +	if (!malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
> > +		return false;
> >  
> > -	return false;
> > +	return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
> >  }
> >  
> >  static struct drm_framebuffer *  
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Boris Brezillon Feb. 20, 2020, 11:35 a.m. UTC | #3
On Thu, 20 Feb 2020 12:29:13 +0100
Boris Brezillon <boris.brezillon@collabora.com> wrote:

> On Thu, 20 Feb 2020 12:26:01 +0100
> Boris Brezillon <boris.brezillon@collabora.com> wrote:
> 
> > In the subject: s/funcitons/functions/
> > 
> > On Tue, 17 Dec 2019 15:50:15 +0100
> > Andrzej Pietrasiewicz <andrzej.p@collabora.com> wrote:
> >   
> > > This will make it easier to transition to generic afbc-aware helpers.
> > > 
> > > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>    
> > 
> > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>  
> 
> Wait, patch 30 is this patch completely irrelevant, so I take R-b back

s/patch 30 is this patch completely irrelevant/this patch is completely
irrelevant if patch 30 is applied/

> :-). You can just squash that one in patch 30.
> 
> >   
> > > ---
> > >  drivers/gpu/drm/arm/malidp_drv.c | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
> > > index 37d92a06318e..961e5a3f5b08 100644
> > > --- a/drivers/gpu/drm/arm/malidp_drv.c
> > > +++ b/drivers/gpu/drm/arm/malidp_drv.c
> > > @@ -362,10 +362,10 @@ static bool
> > >  malidp_verify_afbc_framebuffer(struct drm_device *dev, struct drm_file *file,
> > >  			       const struct drm_mode_fb_cmd2 *mode_cmd)
> > >  {
> > > -	if (malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
> > > -		return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
> > > +	if (!malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
> > > +		return false;
> > >  
> > > -	return false;
> > > +	return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
> > >  }
> > >  
> > >  static struct drm_framebuffer *    
> > 
> > _______________________________________________
> > 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

Patch
diff mbox series

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index 37d92a06318e..961e5a3f5b08 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -362,10 +362,10 @@  static bool
 malidp_verify_afbc_framebuffer(struct drm_device *dev, struct drm_file *file,
 			       const struct drm_mode_fb_cmd2 *mode_cmd)
 {
-	if (malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
-		return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
+	if (!malidp_verify_afbc_framebuffer_caps(dev, mode_cmd))
+		return false;
 
-	return false;
+	return malidp_verify_afbc_framebuffer_size(dev, file, mode_cmd);
 }
 
 static struct drm_framebuffer *