Commit 1923bc5a authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Delay removal of the firmware framebuffer 



Removing the firmware framebuffer from the driver means that even
if the driver doesn't support the IP blocks in a GPU it will no
longer be functional after the driver fails to initialize.

This change will ensure that unsupported IP blocks at least cause
the driver to work with the EFI framebuffer.

Cc: stable@vger.kernel.org
Suggested-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0be7ed8e

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

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <generated/utsrelease.h>

#include <linux/pci-p2pdma.h>



#include <drm/drm_aperture.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_probe_helper.h>
@@ -90,6 +91,8 @@ MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin"); 
#define AMDGPU_MAX_RETRY_LIMIT		2

#define AMDGPU_RETRY_SRIOV_RESET(r) ((r) == -EBUSY || (r) == -ETIMEDOUT || (r) == -EINVAL)



static const struct drm_driver amdgpu_kms_driver;



const char *amdgpu_asic_name[] = {

	"TAHITI",

	"PITCAIRN",
@@ -3687,6 +3690,11 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (r)

		return r;



	/* Get rid of things like offb */

	r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);

	if (r)

		return r;



	/* Enable TMZ based on IP_VERSION */

	amdgpu_gmc_tmz_set(adev);

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

+0 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
 */



#include <drm/amdgpu_drm.h>

#include <drm/drm_aperture.h>

#include <drm/drm_drv.h>

#include <drm/drm_fbdev_generic.h>

#include <drm/drm_gem.h>
@@ -2122,11 +2121,6 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
	}

#endif



	/* Get rid of things like offb */

	ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &amdgpu_kms_driver);

	if (ret)

		return ret;



	adev = devm_drm_dev_alloc(&pdev->dev, &amdgpu_kms_driver, typeof(*adev), ddev);

	if (IS_ERR(adev))

		return PTR_ERR(adev);