From: Dave Airlie <airlied@redhat.com>
Date: Fri, 7 May 2021 02:44:50 +0000 (+1000)
Subject: Merge tag 'amd-drm-fixes-5.13-2021-05-05' of https://gitlab.freedesktop.org/agd5f... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0844708ac3d2dbdace70f4a6020669d56958697f;p=linux.git

Merge tag 'amd-drm-fixes-5.13-2021-05-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-fixes-5.13-2021-05-05:

amdgpu:
- MPO hang workaround
- Fix for concurrent VM flushes on vega/navi
- dcefclk is not adjustable on navi1x and newer
- MST HPD debugfs fix
- Suspend/resumes fixes
- Register VGA clients late in case driver fails to load
- Fix GEM leak in user framebuffer create
- Add support for polaris12 with 32 bit memory interface
- Fix duplicate cursor issue when using overlay
- Fix corruption with tiled surfaces on VCN3
- Add BO size and stride check to fix BO size verification

radeon:
- Fix off-by-one in power state parsing
- Fix possible memory leak in power state parsing

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210506033929.3875-1-alexander.deucher@amd.com
---

0844708ac3d2dbdace70f4a6020669d56958697f
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 2e622c1675d7a,dab98a1fdcaa8..8a1fb8b6606e5
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@@ -902,25 -1070,10 +1070,23 @@@ int amdgpu_display_gem_fb_verify_and_in
  	int ret;
  
  	rfb->base.obj[0] = obj;
- 
- 	/* Verify that bo size can fit the fb size. */
- 	ret = drm_gem_fb_init_with_funcs(dev, &rfb->base, file_priv, mode_cmd,
- 					 &amdgpu_fb_funcs);
+ 	drm_helper_mode_fill_fb_struct(dev, &rfb->base, mode_cmd);
+ 	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);
  	if (ret)
  		goto err;
 +	/* Verify that the modifier is supported. */
 +	if (!drm_any_plane_has_format(dev, mode_cmd->pixel_format,
 +				      mode_cmd->modifier[0])) {
 +		struct drm_format_name_buf format_name;
 +		drm_dbg_kms(dev,
 +			    "unsupported pixel format %s / modifier 0x%llx\n",
 +			    drm_get_format_name(mode_cmd->pixel_format,
 +						&format_name),
 +			    mode_cmd->modifier[0]);
 +
 +		ret = -EINVAL;
 +		goto err;
 +	}
  
  	ret = amdgpu_display_framebuffer_init(dev, rfb, mode_cmd, obj);
  	if (ret)