diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-28 08:44:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-28 08:44:22 +0100 |
| commit | dbbe23c31922ff773a0847a5c1d3c41050fe1c67 (patch) | |
| tree | 27890c30edd249f21bf614f44430575afa3aa6dd /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
| parent | 83ba9a33b56673263981d5633fd6a96d83dabc21 (diff) | |
| parent | 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 (diff) | |
| download | linux-dbbe23c31922ff773a0847a5c1d3c41050fe1c67.tar.gz linux-dbbe23c31922ff773a0847a5c1d3c41050fe1c67.tar.bz2 linux-dbbe23c31922ff773a0847a5c1d3c41050fe1c67.zip | |
Merge 5.17-rc6 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 82011e75ed85..c4387b38229c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -1141,7 +1141,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, if (ret) return ret; - if (!dev->mode_config.allow_fb_modifiers) { + if (!dev->mode_config.allow_fb_modifiers && !adev->enable_virtual_display) { drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI, "GFX9+ requires FB check based on format modifier\n"); ret = check_tiling_flags_gfx6(rfb); |