Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next 



New stuff for 5.1.
amdgpu:
- DC bandwidth formula updates
- Support for DCC on scanout surfaces
- Support for multiple IH rings on soc15 asics
- Fix xgmi locking
- Add sysfs interface to get pcie usage stats
- Simplify DC i2c/aux code
- Initial support for BACO on vega10/20
- New runtime SMU feature debug interface
- Expand existing sysfs power interfaces to new clock domains
- Handle kexec properly
- Simplify IH programming
- Rework doorbell handling across asics
- Drop old CI DPM implementation
- DC page flipping fixes
- Misc SR-IOV fixes

amdkfd:
- Simplify the interfaces between amdkfd and amdgpu

ttm:
- Add a callback to notify the driver when the lru changes

sched:
- Refactor mirror list handling
- Rework hw fence processing

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

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 


# add asic specific block

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

	ci_smc.o ci_dpm.o dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o

	dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o



amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o si_dpm.o si_smc.o

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

+8 −1
Original line number Diff line number Diff line
@@ -542,6 +542,11 @@ struct amdgpu_asic_funcs { 
	bool (*need_full_reset)(struct amdgpu_device *adev);

	/* initialize doorbell layout for specific asic*/

	void (*init_doorbell_index)(struct amdgpu_device *adev);

	/* PCIe bandwidth usage */

	void (*get_pcie_usage)(struct amdgpu_device *adev, uint64_t *count0,

			       uint64_t *count1);

	/* do we need to reset the asic at init time (e.g., kexec) */

	bool (*need_reset_on_init)(struct amdgpu_device *adev);

};



/*
@@ -634,7 +639,7 @@ struct amdgpu_nbio_funcs { 
	void (*hdp_flush)(struct amdgpu_device *adev, struct amdgpu_ring *ring);

	u32 (*get_memsize)(struct amdgpu_device *adev);

	void (*sdma_doorbell_range)(struct amdgpu_device *adev, int instance,

				    bool use_doorbell, int doorbell_index);

			bool use_doorbell, int doorbell_index, int doorbell_size);

	void (*enable_doorbell_aperture)(struct amdgpu_device *adev,

					 bool enable);

	void (*enable_doorbell_selfring_aperture)(struct amdgpu_device *adev,
@@ -1042,6 +1047,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 
#define amdgpu_asic_invalidate_hdp(adev, r) (adev)->asic_funcs->invalidate_hdp((adev), (r))

#define amdgpu_asic_need_full_reset(adev) (adev)->asic_funcs->need_full_reset((adev))

#define amdgpu_asic_init_doorbell_index(adev) (adev)->asic_funcs->init_doorbell_index((adev))

#define amdgpu_asic_get_pcie_usage(adev, cnt0, cnt1) ((adev)->asic_funcs->get_pcie_usage((adev), (cnt0), (cnt1)))

#define amdgpu_asic_need_reset_on_init(adev) (adev)->asic_funcs->need_reset_on_init((adev))



/* Common functions */

bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev);

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

+59 −25
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include <linux/module.h>

#include <linux/dma-buf.h>



const struct kgd2kfd_calls *kgd2kfd;



static const unsigned int compute_vmid_bitmap = 0xFF00;



/* Total memory size in system memory and all GPU VRAM. Used to
@@ -47,12 +45,9 @@ int amdgpu_amdkfd_init(void) 
	amdgpu_amdkfd_total_mem_size *= si.mem_unit;



#ifdef CONFIG_HSA_AMD

	ret = kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd);

	if (ret)

		kgd2kfd = NULL;

	ret = kgd2kfd_init();

	amdgpu_amdkfd_gpuvm_init_mem_limits();

#else

	kgd2kfd = NULL;

	ret = -ENOENT;

#endif
@@ -61,17 +56,13 @@ int amdgpu_amdkfd_init(void) 


void amdgpu_amdkfd_fini(void)

{

	if (kgd2kfd)

		kgd2kfd->exit();

	kgd2kfd_exit();

}



void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)

{

	const struct kfd2kgd_calls *kfd2kgd;



	if (!kgd2kfd)

		return;



	switch (adev->asic_type) {

#ifdef CONFIG_DRM_AMDGPU_CIK

	case CHIP_KAVERI:
@@ -98,7 +89,7 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev) 
		return;

	}



	adev->kfd.dev = kgd2kfd->probe((struct kgd_dev *)adev,

	adev->kfd.dev = kgd2kfd_probe((struct kgd_dev *)adev,

				      adev->pdev, kfd2kgd);



	if (adev->kfd.dev)
@@ -182,7 +173,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
				&gpu_resources.doorbell_start_offset);



		if (adev->asic_type < CHIP_VEGA10) {

			kgd2kfd->device_init(adev->kfd.dev, &gpu_resources);

			kgd2kfd_device_init(adev->kfd.dev, &gpu_resources);

			return;

		}
@@ -197,13 +188,13 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
			 * can use each doorbell assignment twice.

			 */

			gpu_resources.sdma_doorbell[0][i] =

				adev->doorbell_index.sdma_engine0 + (i >> 1);

				adev->doorbell_index.sdma_engine[0] + (i >> 1);

			gpu_resources.sdma_doorbell[0][i+1] =

				adev->doorbell_index.sdma_engine0 + 0x200 + (i >> 1);

				adev->doorbell_index.sdma_engine[0] + 0x200 + (i >> 1);

			gpu_resources.sdma_doorbell[1][i] =

				adev->doorbell_index.sdma_engine1 + (i >> 1);

				adev->doorbell_index.sdma_engine[1] + (i >> 1);

			gpu_resources.sdma_doorbell[1][i+1] =

				adev->doorbell_index.sdma_engine1 + 0x200 + (i >> 1);

				adev->doorbell_index.sdma_engine[1] + 0x200 + (i >> 1);

		}

		/* Doorbells 0x0e0-0ff and 0x2e0-2ff are reserved for

		 * SDMA, IH and VCN. So don't use them for the CP.
@@ -211,14 +202,14 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
		gpu_resources.reserved_doorbell_mask = 0x1e0;

		gpu_resources.reserved_doorbell_val  = 0x0e0;



		kgd2kfd->device_init(adev->kfd.dev, &gpu_resources);

		kgd2kfd_device_init(adev->kfd.dev, &gpu_resources);

	}

}



void amdgpu_amdkfd_device_fini(struct amdgpu_device *adev)

{

	if (adev->kfd.dev) {

		kgd2kfd->device_exit(adev->kfd.dev);

		kgd2kfd_device_exit(adev->kfd.dev);

		adev->kfd.dev = NULL;

	}

}
@@ -227,13 +218,13 @@ void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev, 
		const void *ih_ring_entry)

{

	if (adev->kfd.dev)

		kgd2kfd->interrupt(adev->kfd.dev, ih_ring_entry);

		kgd2kfd_interrupt(adev->kfd.dev, ih_ring_entry);

}



void amdgpu_amdkfd_suspend(struct amdgpu_device *adev)

{

	if (adev->kfd.dev)

		kgd2kfd->suspend(adev->kfd.dev);

		kgd2kfd_suspend(adev->kfd.dev);

}



int amdgpu_amdkfd_resume(struct amdgpu_device *adev)
@@ -241,7 +232,7 @@ int amdgpu_amdkfd_resume(struct amdgpu_device *adev) 
	int r = 0;



	if (adev->kfd.dev)

		r = kgd2kfd->resume(adev->kfd.dev);

		r = kgd2kfd_resume(adev->kfd.dev);



	return r;

}
@@ -251,7 +242,7 @@ int amdgpu_amdkfd_pre_reset(struct amdgpu_device *adev) 
	int r = 0;



	if (adev->kfd.dev)

		r = kgd2kfd->pre_reset(adev->kfd.dev);

		r = kgd2kfd_pre_reset(adev->kfd.dev);



	return r;

}
@@ -261,7 +252,7 @@ int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev) 
	int r = 0;



	if (adev->kfd.dev)

		r = kgd2kfd->post_reset(adev->kfd.dev);

		r = kgd2kfd_post_reset(adev->kfd.dev);



	return r;

}
@@ -619,4 +610,47 @@ struct kfd2kgd_calls *amdgpu_amdkfd_gfx_9_0_get_functions(void) 
{

	return NULL;

}



struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct pci_dev *pdev,

			      const struct kfd2kgd_calls *f2g)

{

	return NULL;

}



bool kgd2kfd_device_init(struct kfd_dev *kfd,

			 const struct kgd2kfd_shared_resources *gpu_resources)

{

	return false;

}



void kgd2kfd_device_exit(struct kfd_dev *kfd)

{

}



void kgd2kfd_exit(void)

{

}



void kgd2kfd_suspend(struct kfd_dev *kfd)

{

}



int kgd2kfd_resume(struct kfd_dev *kfd)

{

	return 0;

}



int kgd2kfd_pre_reset(struct kfd_dev *kfd)

{

	return 0;

}



int kgd2kfd_post_reset(struct kfd_dev *kfd)

{

	return 0;

}



void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry)

{

}

#endif

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

+18 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "amdgpu_sync.h"

#include "amdgpu_vm.h"



extern const struct kgd2kfd_calls *kgd2kfd;

extern uint64_t amdgpu_amdkfd_total_mem_size;



struct amdgpu_device;
@@ -214,4 +213,22 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd, 
void amdgpu_amdkfd_gpuvm_init_mem_limits(void);

void amdgpu_amdkfd_unreserve_memory_limit(struct amdgpu_bo *bo);



/* KGD2KFD callbacks */

int kgd2kfd_init(void);

void kgd2kfd_exit(void);

struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct pci_dev *pdev,

			      const struct kfd2kgd_calls *f2g);

bool kgd2kfd_device_init(struct kfd_dev *kfd,

			 const struct kgd2kfd_shared_resources *gpu_resources);

void kgd2kfd_device_exit(struct kfd_dev *kfd);

void kgd2kfd_suspend(struct kfd_dev *kfd);

int kgd2kfd_resume(struct kfd_dev *kfd);

int kgd2kfd_pre_reset(struct kfd_dev *kfd);

int kgd2kfd_post_reset(struct kfd_dev *kfd);

void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry);

int kgd2kfd_quiesce_mm(struct mm_struct *mm);

int kgd2kfd_resume_mm(struct mm_struct *mm);

int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,

					       struct dma_fence *fence);



#endif /* AMDGPU_AMDKFD_H_INCLUDED */

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static bool amdkfd_fence_enable_signaling(struct dma_fence *f) 
	if (dma_fence_is_signaled(f))

		return true;



	if (!kgd2kfd->schedule_evict_and_restore_process(fence->mm, f))

	if (!kgd2kfd_schedule_evict_and_restore_process(fence->mm, f))

		return true;



	return false;