From: Dave Airlie <airlied@redhat.com>
Date: Thu, 30 Apr 2020 01:08:54 +0000 (+1000)
Subject: Merge tag 'amd-drm-next-5.8-2020-04-24' of git://people.freedesktop.org/~agd5f/linux... 
X-Git-Tag: Ubuntu-5.13.0-19.19~5927^2~15
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=937eea297e26effac6809a0bf8c20e6ca9d90b9a;p=mirror_ubuntu-jammy-kernel.git

Merge tag 'amd-drm-next-5.8-2020-04-24' of git://people.freedesktop.org/~agd5f/linux into drm-next

amd-drm-next-5.8-2020-04-24:

amdgpu:
- Documentation improvements
- Enable FRU chip access on boards that support it
- RAS updates
- SR-IOV updates
- Powerplay locking fixes for older SMU versions
- VCN DPG (dynamic powergating) cleanup
- VCN 2.5 DPG enablement
- Rework GPU scheduler handling
- Improve scheduler priority handling
- Add SPM (streaming performance monitor) golden settings for navi
- GFX10 clockgating fixes
- DC ABM (automatic backlight modulation) fixes
- DC cursor and plane fixes
- DC watermark fixes
- DC clock handling fixes
- DC color management fixes
- GPU reset fixes
- Clean up MMIO access macros
- EEPROM access fixes
- Misc code cleanups

amdkfd:
- Misc code cleanups

radeon:
- Clean up safe reg list generation
- Misc code cleanups

From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200424190827.4542-1-alexander.deucher@amd.com
---

937eea297e26effac6809a0bf8c20e6ca9d90b9a
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f7c5cdc10a70,6cd661545f35..4c8b1bc98913
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -4723,10 -4736,19 +4736,19 @@@ amdgpu_dm_connector_atomic_duplicate_st
  static int
  amdgpu_dm_connector_late_register(struct drm_connector *connector)
  {
 +#if defined(CONFIG_DEBUG_FS)
  	struct amdgpu_dm_connector *amdgpu_dm_connector =
  		to_amdgpu_dm_connector(connector);
+ 	int r;
+ 
+ 	if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
+ 	    (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
+ 		amdgpu_dm_connector->dm_dp_aux.aux.dev = connector->kdev;
+ 		r = drm_dp_aux_register(&amdgpu_dm_connector->dm_dp_aux.aux);
+ 		if (r)
+ 			return r;
+ 	}
  
 -#if defined(CONFIG_DEBUG_FS)
  	connector_debugfs_init(amdgpu_dm_connector);
  #endif