[PATCH] drm: Check actual format for legacy pageflip.

Christian König ckoenig.leichtzumerken at gmail.com
Mon Jan 4 10:30:02 UTC 2021


Am 02.01.21 um 15:02 schrieb Bas Nieuwenhuizen:
> With modifiers one can actually have different format_info structs
> for the same format, which now matters for AMDGPU since we convert
> implicit modifiers to explicit modifiers with multiple planes.
>
> I checked other drivers and it doesn't look like they end up triggering
> this case so I think this is safe to relax.
>
> Signed-off-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
> Fixes: 816853f9dc40 ("drm/amd/display: Set new format info for converted metadata.")

I don't know the details of the code at all, but from a high level point 
of view that makes much more sense than the original patch.

Acked-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/drm_plane.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index e6231947f987..f5085990cfac 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -1163,7 +1163,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
>   	if (ret)
>   		goto out;
>   
> -	if (old_fb->format != fb->format) {
> +	if (old_fb->format->format != fb->format->format) {
>   		DRM_DEBUG_KMS("Page flip is not allowed to change frame buffer format.\n");
>   		ret = -EINVAL;
>   		goto out;



More information about the amd-gfx mailing list