From: Dave Airlie <airlied@redhat.com>
Date: Thu, 20 Sep 2018 23:52:34 +0000 (+1000)
Subject: Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=36c9c3c91128e2b892c9be0dd9ee9bd82cbe82ad;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next

This is a new pull for drm-next on top of last weeks with the following
changes:
- Fixed 64 bit divide
- Fixed vram type on vega20
- Misc vega20 fixes
- Misc DC fixes
- Fix GDS/GWS/OA domain handling

Previous changes from last week:
amdgpu/kfd:
- Picasso (new APU) support
- Raven2 (new APU) support
- Vega20 enablement
- ACP powergating improvements
- Add ABGR/XBGR display support
- VCN JPEG engine support
- Initial xGMI support
- Use load balancing for engine scheduling
- Lots of new documentation
- Rework and clean up i2c and aux handling in DC
- Add DP YCbCr 4:2:0 support in DC
- Add DMCU firmware loading for Raven (used for ABM and PSR)
- New debugfs features in DC
- LVDS support in DC
- Implement wave kill for gfx/compute (light weight reset for shaders)
- Use AGP aperture to avoid gart mappings when possible
- GPUVM performance improvements
- Bulk moves for more efficient GPUVM LRU handling
- Merge amdgpu and amdkfd into one module
- Enable gfxoff and stutter mode on Raven
- Misc cleanups

Scheduler:
- Load balancing support
- Bug fixes

ttm:
- Bulk move functionality
- Bug fixes

radeon:
- Misc cleanups

Signed-off-by: Dave Airlie <airlied@redhat.com>

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

36c9c3c91128e2b892c9be0dd9ee9bd82cbe82ad
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 8c1db96be070,ff10df4f50d3..53e038963936
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@@ -803,16 -923,8 +901,8 @@@ static int amdgpu_pci_probe(struct pci_
  		return -ENODEV;
  	}
  
- 	/*
- 	 * Initialize amdkfd before starting radeon. If it was not loaded yet,
- 	 * defer radeon probing
- 	 */
- 	ret = amdgpu_amdkfd_init();
- 	if (ret == -EPROBE_DEFER)
- 		return ret;
- 
  	/* Get rid of things like offb */
 -	ret = amdgpu_kick_out_firmware_fb(pdev);
 +	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "amdgpudrmfb");
  	if (ret)
  		return ret;
  
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index af6adffba788,8acf8acb588d..6c849e055038
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -904,14 -997,11 +998,14 @@@ amdgpu_dm_update_connector_after_detect
  
  			drm_connector_update_edid_property(connector,
  					aconnector->edid);
 +			drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux,
 +					    aconnector->edid);
  		}
- 		amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid);
+ 		amdgpu_dm_update_freesync_caps(connector, aconnector->edid);
  
  	} else {
 +		drm_dp_cec_unset_edid(&aconnector->dm_dp_aux.aux);
- 		amdgpu_dm_remove_sink_from_freesync_module(connector);
+ 		amdgpu_dm_update_freesync_caps(connector, NULL);
  		drm_connector_update_edid_property(connector, NULL);
  		aconnector->num_modes = 0;
  		aconnector->dc_sink = NULL;