Commit e639fb04 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.13-2024-12-18' of... 

Merge tag 'amd-drm-fixes-6.13-2024-12-18' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.13-2024-12-18:

amdgpu:
- Disable BOCO when CONFIG_HOTPLUG_PCI_PCIE is not enabled
- scheduler job fixes
- IP version check fixes
- devcoredump fix
- GPUVM update fix
- NBIO 2.5 fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241218204637.2966198-1-alexander.deucher@amd.com
parents 87fd8833 3abb660f

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

+2 −3
Original line number Diff line number Diff line
@@ -343,11 +343,10 @@ void amdgpu_coredump(struct amdgpu_device *adev, bool skip_vram_check, 
	coredump->skip_vram_check = skip_vram_check;

	coredump->reset_vram_lost = vram_lost;



	if (job && job->vm) {

		struct amdgpu_vm *vm = job->vm;

	if (job && job->pasid) {

		struct amdgpu_task_info *ti;



		ti = amdgpu_vm_get_task_info_vm(vm);

		ti = amdgpu_vm_get_task_info_pasid(adev, job->pasid);

		if (ti) {

			coredump->reset_task_info = *ti;

			amdgpu_vm_put_task_info(ti);

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

+3 −0
Original line number Diff line number Diff line
@@ -417,6 +417,9 @@ bool amdgpu_device_supports_boco(struct drm_device *dev) 
{

	struct amdgpu_device *adev = drm_to_adev(dev);



	if (!IS_ENABLED(CONFIG_HOTPLUG_PCI_PCIE))

		return false;



	if (adev->has_pr3 ||

	    ((adev->flags & AMD_IS_PX) && amdgpu_is_atpx_hybrid()))

		return true;

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

+1 −2
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ void amdgpu_job_set_resources(struct amdgpu_job *job, struct amdgpu_bo *gds, 


void amdgpu_job_free_resources(struct amdgpu_job *job)

{

	struct amdgpu_ring *ring = to_amdgpu_ring(job->base.sched);

	struct dma_fence *f;

	unsigned i;
@@ -268,7 +267,7 @@ void amdgpu_job_free_resources(struct amdgpu_job *job) 
		f = NULL;



	for (i = 0; i < job->num_ibs; ++i)

		amdgpu_ib_free(ring->adev, &job->ibs[i], f);

		amdgpu_ib_free(NULL, &job->ibs[i], f);

}



static void amdgpu_job_free_cb(struct drm_sched_job *s_job)

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

+3 −4
Original line number Diff line number Diff line
@@ -1266,10 +1266,9 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, 
	 * next command submission.

	 */

	if (amdgpu_vm_is_bo_always_valid(vm, bo)) {

		uint32_t mem_type = bo->tbo.resource->mem_type;



		if (!(bo->preferred_domains &

		      amdgpu_mem_type_to_domain(mem_type)))

		if (bo->tbo.resource &&

		    !(bo->preferred_domains &

		      amdgpu_mem_type_to_domain(bo->tbo.resource->mem_type)))

			amdgpu_vm_bo_evicted(&bo_va->base);

		else

			amdgpu_vm_bo_idle(&bo_va->base);

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

+1 −1
Original line number Diff line number Diff line
@@ -4123,7 +4123,7 @@ static int gfx_v12_0_set_clockgating_state(void *handle, 
	if (amdgpu_sriov_vf(adev))

		return 0;



	switch (adev->ip_versions[GC_HWIP][0]) {

	switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {

	case IP_VERSION(12, 0, 0):

	case IP_VERSION(12, 0, 1):

		gfx_v12_0_update_gfx_clock_gating(adev,