Merge tag 'amd-drm-fixes-5.12-2021-03-10' of https://gitlab.freedesktop.org/agd5f...

amd-drm-fixes-5.12-2021-03-10:

amdgpu:
- Fix aux backlight control
- Add a backlight override parameter
- Various display fixes
- PCIe DPM fix for vega
- Polaris watermark fixes
- Additional S0ix fix

radeon:
- Fix GEM regression
- Fix AGP dependency handling

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

diff --combined drivers/gpu/drm/Kconfig
index e392a90,19fc4ce..85b79a7
--- 1/drivers/gpu/drm/Kconfig
--- 2/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -15,9 -15,6 +15,9 @@@ menuconfig DR
        select I2C_ALGOBIT
        select DMA_SHARED_BUFFER
        select SYNC_FILE
 +# gallium uses SYS_kcmp for os_same_file_description() to de-duplicate
 +# device and dmabuf fd. Let's make sure that is available for our userspace.
 +      select KCMP
        help
          Kernel-level support for the Direct Rendering Infrastructure (DRI)
          introduced in XFree86 4.0. If you say Y here, you need to select
@@@ -228,6 -225,7 +228,7 @@@ source "drivers/gpu/drm/arm/Kconfig
  config DRM_RADEON
        tristate "ATI Radeon"
        depends on DRM && PCI && MMU
+       depends on AGP || !AGP
        select FW_LOADER
          select DRM_KMS_HELPER
          select DRM_TTM