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

Merge tag 'drm-next-5.3-2019-07-09' of git://people.freedesktop.org/~agd5f/linux into drm-next 



drm-next-5.3-2019-07-09:

amdgpu:
- GPU reset for navi10
- Powerplay fixes for navi10
- GFX fixes for navi10
- Prepare for hmm_range_register API change
- XGMI fixes
- clang warning fixes
- Fixes for various kconfig scenarios
- Misc fixes and cleanups

amdkfd:
- Add workaround for soft hangs with oversubscribed runlists
- Remove duplicated pcie atomics request

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190710035017.3407-1-alexander.deucher@amd.com
parents 4cf643a3 7f963d9f

drivers/gpu/drm/amd/amdgpu/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \

	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \

	amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \

	amdgpu_vm_sdma.o amdgpu_pmu.o amdgpu_discovery.o

	amdgpu_vm_sdma.o amdgpu_discovery.o



amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+5 −0
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ struct amdgpu_device { 
	struct mutex                    grbm_idx_mutex;

	struct dev_pm_domain		vga_pm_domain;

	bool				have_disp_power_ref;

	bool                            have_atomics_support;



	/* BIOS */

	bool				is_atom_fw;
@@ -1216,6 +1217,10 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev ); 
static inline int amdgpu_dm_display_resume(struct amdgpu_device *adev) { return 0; }

#endif





void amdgpu_register_gpu_instance(struct amdgpu_device *adev);

void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev);



#include "amdgpu_object.h"



/* used by df_v3_6.c and amdgpu_pmu.c */

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

+7 −0
Original line number Diff line number Diff line
@@ -668,6 +668,13 @@ bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid) 
	return false;

}



bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;



	return adev->have_atomics_support;

}



#ifndef CONFIG_HSA_AMD

bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm)

{

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine, 
				uint32_t vmid, uint64_t gpu_addr,

				uint32_t *ib_cmd, uint32_t ib_len);

void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);

bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void);

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

+9 −4
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static int init_user_pages(struct kgd_mem *mem, struct mm_struct *mm, 
		goto out;

	}



	ret = amdgpu_ttm_tt_get_user_pages(bo->tbo.ttm, bo->tbo.ttm->pages);

	ret = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);

	if (ret) {

		pr_err("%s: Failed to get user pages: %d\n", __func__, ret);

		goto unregister_out;
@@ -813,7 +813,7 @@ static int process_sync_pds_resv(struct amdkfd_process_info *process_info, 


		ret = amdgpu_sync_resv(NULL,

					sync, pd->tbo.resv,

					AMDGPU_FENCE_OWNER_UNDEFINED, false);

					AMDGPU_FENCE_OWNER_KFD, false);

		if (ret)

			return ret;

	}
@@ -1729,8 +1729,7 @@ static int update_invalid_user_pages(struct amdkfd_process_info *process_info, 
		bo = mem->bo;



		/* Get updated user pages */

		ret = amdgpu_ttm_tt_get_user_pages(bo->tbo.ttm,

						   bo->tbo.ttm->pages);

		ret = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);

		if (ret) {

			pr_debug("%s: Failed to get user pages: %d\n",

				__func__, ret);
@@ -1740,6 +1739,12 @@ static int update_invalid_user_pages(struct amdkfd_process_info *process_info, 
		}



		amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);



		/* Mark the BO as valid unless it was invalidated

		 * again concurrently.

		 */

		if (atomic_cmpxchg(&mem->invalid, invalid, 0) != invalid)

			return -EAGAIN;

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE