From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 23 Oct 2019 10:02:47 +0000 (+0200)
Subject: Merge v5.4-rc4 into drm-next
X-Git-Tag: v5.10.7~3692^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e79e22e092acd55da0b2db066e4826d7d152c41;p=platform%2Fkernel%2Flinux-rpi.git

Merge v5.4-rc4 into drm-next

Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.

Some adjacent changes conflicts, plus some clashes in i915 due to
cherry-picking and git trying to be helpful and leaving both versions
in.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

2e79e22e092acd55da0b2db066e4826d7d152c41
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index baf3248,2a00a36..4da1d7f
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@@ -1048,8 -1048,43 +1048,43 @@@ static int amdgpu_pci_probe(struct pci_
  		return -ENODEV;
  	}
  
+ #ifdef CONFIG_DRM_AMDGPU_SI
+ 	if (!amdgpu_si_support) {
+ 		switch (flags & AMD_ASIC_MASK) {
+ 		case CHIP_TAHITI:
+ 		case CHIP_PITCAIRN:
+ 		case CHIP_VERDE:
+ 		case CHIP_OLAND:
+ 		case CHIP_HAINAN:
+ 			dev_info(&pdev->dev,
+ 				 "SI support provided by radeon.\n");
+ 			dev_info(&pdev->dev,
+ 				 "Use radeon.si_support=0 amdgpu.si_support=1 to override.\n"
+ 				);
+ 			return -ENODEV;
+ 		}
+ 	}
+ #endif
+ #ifdef CONFIG_DRM_AMDGPU_CIK
+ 	if (!amdgpu_cik_support) {
+ 		switch (flags & AMD_ASIC_MASK) {
+ 		case CHIP_KAVERI:
+ 		case CHIP_BONAIRE:
+ 		case CHIP_HAWAII:
+ 		case CHIP_KABINI:
+ 		case CHIP_MULLINS:
+ 			dev_info(&pdev->dev,
+ 				 "CIK support provided by radeon.\n");
+ 			dev_info(&pdev->dev,
+ 				 "Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n"
+ 				);
+ 			return -ENODEV;
+ 		}
+ 	}
+ #endif
+ 
  	/* Get rid of things like offb */
 -	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "amdgpudrmfb");
 +	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "amdgpudrmfb");
  	if (ret)
  		return ret;