Commit 28d31e1a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.2-2023-01-11' of... 

Merge tag 'amd-drm-fixes-6.2-2023-01-11' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.2-2023-01-11:

amdgpu:
- SMU13 fan speed fix
- SMU13 fix power cap handling
- SMU13 BACO fix
- Fix a possible segfault in bo validation error case
- Delay removal of firmware framebuffer
- Fix error when unloading

amdkfd:
- SVM fix when clearing vram
- GC11 fix for multi-GPU

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230112033004.8184-1-alexander.deucher@amd.com
parents a2837733 a6941f89

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

+1 −1
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct amdgpu_b 
	}



	amdgpu_amdkfd_remove_eviction_fence(

		bo, bo->kfd_bo->process_info->eviction_fence);

		bo, bo->vm_bo->vm->process_info->eviction_fence);



	amdgpu_bo_unreserve(bo);

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);

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

+3 −2
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev, 
	return true;



fail:

	if (man)

		DRM_DEBUG("BO size %lu > total memory in domain: %llu\n", size,

			  man->size);

	return false;

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

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev) 
		kfree(rsv);



	list_for_each_entry_safe(rsv, temp, &mgr->reserved_pages, blocks) {

		drm_buddy_free_list(&mgr->mm, &rsv->blocks);

		drm_buddy_free_list(&mgr->mm, &rsv->allocated);

		kfree(rsv);

	}

	drm_buddy_fini(&mgr->mm);