Re: [PATCH v2] drm/vc4: Advertise supported modifiers for planes

[Eric Anholt]

Daniel Stone  writes:

> The IN_FORMATS blob allows the kernel to advertise to userspace which
> format/modifier combinations are supported, per plane. Use this to
> advertise that we support both T_TILED and linear.
>
> v2:
>   - Only advertise T_TILED for RGB (Eric)
>   - Actually turn on allow_fb_modifiers (Eric)
>
> Signed-off-by: Daniel Stone 

Reviewed and pushed to drm-misc-next. Thanks!


signature.asc
Description: PGP signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2] drm/vc4: Advertise supported modifiers for planes

[Daniel Stone]

On 8 August 2017 at 21:36, Eric Anholt  wrote:
> Daniel Stone  writes:
>> + case DRM_FORMAT_YUV422:
>> + case DRM_FORMAT_YVU422:
>> + case DRM_FORMAT_YUV420:
>> + case DRM_FORMAT_YVU420:
>> + case DRM_FORMAT_NV12:
>> + case DRM_FORMAT_NV16:
>> + return (modifier == DRM_FORMAT_MOD_LINEAR);
>> + }
>> +}
>
> drivers/gpu/drm/vc4/vc4_plane.c: In function ‘vc4_format_mod_supported’:
> drivers/gpu/drm/vc4/vc4_plane.c:889:1: warning: control reaches end of 
> non-void function [-Wreturn-type]
>  }
>
> Can we just replace the ARGB cases with a default case?  Or maybe just
> drm_format_info(format)->num_planes > 1?

I'd sent the wrong version whilst juggling trees; see the follow-up
sent very shortly after. Really don't mind which; was trying to search
for something which seemed most foolproof. num_planes > 1 is probably
the best proxy, so I'll do that. The patch to check modifier
correctness also needs a rebase after the bo-unref changes, so I'll
resend bothj.

Cheers,
Daniel
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2] drm/vc4: Advertise supported modifiers for planes

[Eric Anholt]

Daniel Stone  writes:

> The IN_FORMATS blob allows the kernel to advertise to userspace which
> format/modifier combinations are supported, per plane. Use this to
> advertise that we support both T_TILED and linear.
>
> v2:
>   - Only advertise T_TILED for RGB (Eric)
>   - Actually turn on allow_fb_modifiers (Eric)
>
> Signed-off-by: Daniel Stone 
> ---
>  drivers/gpu/drm/vc4/vc4_kms.c   |  1 +
>  drivers/gpu/drm/vc4/vc4_plane.c | 33 -
>  2 files changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
> index 893312e4e2d7..ef82b5de71fd 100644
> --- a/drivers/gpu/drm/vc4/vc4_kms.c
> +++ b/drivers/gpu/drm/vc4/vc4_kms.c
> @@ -224,6 +224,7 @@ int vc4_kms_load(struct drm_device *dev)
>   dev->mode_config.funcs = &vc4_mode_funcs;
>   dev->mode_config.preferred_depth = 24;
>   dev->mode_config.async_page_flip = true;
> + dev->mode_config.allow_fb_modifiers = true;
>  
>   drm_mode_config_reset(dev);
>  
> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
> index 2968b3ebb895..a21590991490 100644
> --- a/drivers/gpu/drm/vc4/vc4_plane.c
> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
> @@ -863,6 +863,31 @@ vc4_update_plane(struct drm_plane *plane,
> ctx);
>  }
>  
> +static bool vc4_format_mod_supported(struct drm_plane *plane,
> +  uint32_t format,
> +  uint64_t modifier)
> +{
> + /* Support T_TILING for RGB formats only. */
> + switch (format) {
> + case DRM_FORMAT_XRGB:
> + case DRM_FORMAT_ARGB:
> + case DRM_FORMAT_ABGR:
> + case DRM_FORMAT_XBGR:
> + case DRM_FORMAT_RGB565:
> + case DRM_FORMAT_BGR565:
> + case DRM_FORMAT_ARGB1555:
> + case DRM_FORMAT_XRGB1555:
> + return true;
> + case DRM_FORMAT_YUV422:
> + case DRM_FORMAT_YVU422:
> + case DRM_FORMAT_YUV420:
> + case DRM_FORMAT_YVU420:
> + case DRM_FORMAT_NV12:
> + case DRM_FORMAT_NV16:
> + return (modifier == DRM_FORMAT_MOD_LINEAR);
> + }
> +}

drivers/gpu/drm/vc4/vc4_plane.c: In function ‘vc4_format_mod_supported’:
drivers/gpu/drm/vc4/vc4_plane.c:889:1: warning: control reaches end of non-void 
function [-Wreturn-type]
 }

Can we just replace the ARGB cases with a default case?  Or maybe just
drm_format_info(format)->num_planes > 1?


signature.asc
Description: PGP signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel