Commit 9deacd6c authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: don't free conflicting apertures for non-display devices 



PCI_CLASS_ACCELERATOR_PROCESSING devices won't ever be
the sysfb, so there is no need to free conflicting
apertures.

Reviewed-by: default avatarKent Russell <kent.russell@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e00e5c22

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+11 −4
Original line number Diff line number Diff line
@@ -4399,10 +4399,17 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (r)

		return r;



	/*

	 * No need to remove conflicting FBs for non-display class devices.

	 * This prevents the sysfb from being freed accidently.

	 */

	if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA ||

	    (pdev->class >> 8) == PCI_CLASS_DISPLAY_OTHER) {

		/* Get rid of things like offb */

		r = aperture_remove_conflicting_pci_devices(adev->pdev, amdgpu_kms_driver.name);

		if (r)

			return r;

	}



	/* Enable TMZ based on IP_VERSION */

	amdgpu_gmc_tmz_set(adev);