[2/2] drm/fourcc: Fill out all block sizes for P210
diff mbox series

Message ID 20191126091414.226070-2-daniel.vetter@ffwll.ch
State New
Headers show
Series
  • [1/2] drm/fourcc: Fill out all block sizes for P10/12/16
Related show

Commit Message

Daniel Vetter Nov. 26, 2019, 9:14 a.m. UTC
0 means 1 as the default, but it's mighty confusing if the block size
for the first plane is spelled out explicitly, but not for the 2nd
plane.

No cc: stable because this is just confusion, but 0 functional issue.

Fixes: 7ba0fee247ee ("drm/fourcc: Add AFBC yuv fourccs for Mali")
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Ayan Kumar Halder <ayan.halder@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/drm_fourcc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Liviu Dudau Nov. 26, 2019, 11:46 a.m. UTC | #1
On Tue, Nov 26, 2019 at 10:14:14AM +0100, Daniel Vetter wrote:
> 0 means 1 as the default, but it's mighty confusing if the block size
> for the first plane is spelled out explicitly, but not for the 2nd
> plane.
> 
> No cc: stable because this is just confusion, but 0 functional issue.

Agree!

> 
> Fixes: 7ba0fee247ee ("drm/fourcc: Add AFBC yuv fourccs for Mali")
> Cc: Brian Starkey <brian.starkey@arm.com>
> Cc: Ayan Kumar Halder <ayan.halder@arm.com>
> Cc: Liviu Dudau <liviu.dudau@arm.com>

Acked-by: Liviu Dudau <liviu.dudau@arm.com>

Best regards,

> Cc: Alyssa Rosenzweig <alyssa@rosenzweig.io>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  drivers/gpu/drm/drm_fourcc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> index fe79ce857c8a..b234bfaeda06 100644
> --- a/drivers/gpu/drm/drm_fourcc.c
> +++ b/drivers/gpu/drm/drm_fourcc.c
> @@ -263,7 +263,7 @@ const struct drm_format_info *__drm_format_info(u32 format)
>  		  .hsub = 2, .vsub = 2, .is_yuv = true},
>  		{ .format = DRM_FORMAT_P210,		.depth = 0,
>  		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
> -		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
> +		  .block_w = { 1, 1, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2,
>  		  .vsub = 1, .is_yuv = true },
>  		{ .format = DRM_FORMAT_VUY101010,	.depth = 0,
>  		  .num_planes = 1, .cpp = { 0, 0, 0 }, .hsub = 1, .vsub = 1,
> -- 
> 2.24.0
>
Daniel Vetter Nov. 28, 2019, 10:19 a.m. UTC | #2
On Tue, Nov 26, 2019 at 11:46:54AM +0000, Liviu Dudau wrote:
> On Tue, Nov 26, 2019 at 10:14:14AM +0100, Daniel Vetter wrote:
> > 0 means 1 as the default, but it's mighty confusing if the block size
> > for the first plane is spelled out explicitly, but not for the 2nd
> > plane.
> > 
> > No cc: stable because this is just confusion, but 0 functional issue.
> 
> Agree!
> 
> > 
> > Fixes: 7ba0fee247ee ("drm/fourcc: Add AFBC yuv fourccs for Mali")
> > Cc: Brian Starkey <brian.starkey@arm.com>
> > Cc: Ayan Kumar Halder <ayan.halder@arm.com>
> > Cc: Liviu Dudau <liviu.dudau@arm.com>
> 
> Acked-by: Liviu Dudau <liviu.dudau@arm.com>

Both patches applied, thanks for taking a look.
-Daniel

> 
> Best regards,
> 
> > Cc: Alyssa Rosenzweig <alyssa@rosenzweig.io>
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Cc: Maxime Ripard <mripard@kernel.org>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> >  drivers/gpu/drm/drm_fourcc.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
> > index fe79ce857c8a..b234bfaeda06 100644
> > --- a/drivers/gpu/drm/drm_fourcc.c
> > +++ b/drivers/gpu/drm/drm_fourcc.c
> > @@ -263,7 +263,7 @@ const struct drm_format_info *__drm_format_info(u32 format)
> >  		  .hsub = 2, .vsub = 2, .is_yuv = true},
> >  		{ .format = DRM_FORMAT_P210,		.depth = 0,
> >  		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
> > -		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
> > +		  .block_w = { 1, 1, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2,
> >  		  .vsub = 1, .is_yuv = true },
> >  		{ .format = DRM_FORMAT_VUY101010,	.depth = 0,
> >  		  .num_planes = 1, .cpp = { 0, 0, 0 }, .hsub = 1, .vsub = 1,
> > -- 
> > 2.24.0
> > 
> 
> -- 
> ====================
> | I would like to |
> | fix the world,  |
> | but they're not |
> | giving me the   |
>  \ source code!  /
>   ---------------
>     ¯\_(ツ)_/¯

Patch
diff mbox series

diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
index fe79ce857c8a..b234bfaeda06 100644
--- a/drivers/gpu/drm/drm_fourcc.c
+++ b/drivers/gpu/drm/drm_fourcc.c
@@ -263,7 +263,7 @@  const struct drm_format_info *__drm_format_info(u32 format)
 		  .hsub = 2, .vsub = 2, .is_yuv = true},
 		{ .format = DRM_FORMAT_P210,		.depth = 0,
 		  .num_planes = 2, .char_per_block = { 2, 4, 0 },
-		  .block_w = { 1, 0, 0 }, .block_h = { 1, 0, 0 }, .hsub = 2,
+		  .block_w = { 1, 1, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2,
 		  .vsub = 1, .is_yuv = true },
 		{ .format = DRM_FORMAT_VUY101010,	.depth = 0,
 		  .num_planes = 1, .cpp = { 0, 0, 0 }, .hsub = 1, .vsub = 1,