Commit 344feb7c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.20-2022-07-05' of... 

Merge tag 'amd-drm-next-5.20-2022-07-05' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-5.20-2022-07-05:

amdgpu:
- Various spelling and grammer fixes
- Various eDP fixes
- Various DMCUB fixes
- VCN fixes
- GMC 11 fixes
- RAS fixes
- TMZ support for GC 10.3.7
- GPUVM TLB flush fixes
- SMU 13.0.x updates
- DCN 3.2 Support
- DCN 3.2.1 Support
- MES updates
- GFX11 modifiers support
- USB-C fixes
- MMHUB 3.0.1 support
- SDMA 6.0 doorbell fixes
- Initial devcoredump support
- Enable high priority gfx queue on asics which support it
- Enable GPU reset for SMU 13.0.4
- OLED display fixes
- MPO fixes
- DC frame size fixes
- ASPM support for PCIE 7.4/7.6
- GPU reset support for SMU 13.0.0
- GFX11 updates
- VCN JPEG fix
- BACO support for SMU 13.0.7
- VCN instance handling fix
- GFX8 GPUVM TLB flush fix
- GPU reset rework
- VCN 4.0.2 support
- GTT size fixes
- DP link training fixes
- LSDMA 6.0.1 support
- Various backlight fixes
- Color encoding fixes
- Backlight config cleanup
- VCN 4.x unified queue cleanup

amdkfd:
- MMU notifier fixes
- Updates for GC 10.3.6 and 10.3.7
- P2P DMA support using dma-buf
- Add available memory IOCTL
- SDMA 6.0.1 fix
- MES fixes
- HMM profiler support

radeon:
- License fix
- Backlight config cleanup

UAPI:
- Add available memory IOCTL to amdkfd
  Proposed userspace: https://www.mail-archive.com/amd-gfx@lists.freedesktop.org/msg75743.html
- HMM profiler support for amdkfd
  Proposed userspace: https://lists.freedesktop.org/archives/amd-gfx/2022-June/080805.html



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

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ amdgpu-y += \ 
	gmc_v8_0.o \

	gfxhub_v1_0.o mmhub_v1_0.o gmc_v9_0.o gfxhub_v1_1.o mmhub_v9_4.o \

	gfxhub_v2_0.o mmhub_v2_0.o gmc_v10_0.o gfxhub_v2_1.o mmhub_v2_3.o \

	mmhub_v1_7.o gfxhub_v3_0.o mmhub_v3_0.o mmhub_v3_0_2.o gmc_v11_0.o

	mmhub_v1_7.o gfxhub_v3_0.o mmhub_v3_0.o mmhub_v3_0_2.o gmc_v11_0.o \

	mmhub_v3_0_1.o



# add UMC block

amdgpu-y += \

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

+14 −2
Original line number Diff line number Diff line
@@ -223,6 +223,9 @@ static const int __maybe_unused sched_policy = KFD_SCHED_POLICY_HWS; 
static const bool __maybe_unused debug_evictions; /* = false */

static const bool __maybe_unused no_system_mem_limit;

#endif

#ifdef CONFIG_HSA_AMD_P2P

extern bool pcie_p2p;

#endif



extern int amdgpu_tmz;

extern int amdgpu_reset_method;
@@ -274,7 +277,7 @@ extern int amdgpu_vcnfw_log; 
#define CIK_CURSOR_WIDTH 128

#define CIK_CURSOR_HEIGHT 128



/* smasrt shift bias level limits */

/* smart shift bias level limits */

#define AMDGPU_SMARTSHIFT_MAX_BIAS (100)

#define AMDGPU_SMARTSHIFT_MIN_BIAS (-100)
@@ -667,6 +670,7 @@ enum amd_hw_ip_block_type { 
	RSMU_HWIP,

	XGMI_HWIP,

	DCI_HWIP,

	PCIE_HWIP,

	MAX_HWIP

};
@@ -1044,10 +1048,18 @@ struct amdgpu_device { 


	/* reset dump register */

	uint32_t                        *reset_dump_reg_list;

	uint32_t			*reset_dump_reg_value;

	int                             num_regs;

#ifdef CONFIG_DEV_COREDUMP

	struct amdgpu_task_info         reset_task_info;

	bool                            reset_vram_lost;

	struct timespec64               reset_time;

#endif



	bool                            scpm_enabled;

	uint32_t                        scpm_status;



	struct work_struct		reset_work;

};



static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)
@@ -1242,7 +1254,7 @@ bool amdgpu_device_has_job_running(struct amdgpu_device *adev); 
bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev);

int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

			      struct amdgpu_job* job);

int amdgpu_device_gpu_recover_imp(struct amdgpu_device *adev,

int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

			      struct amdgpu_job *job);

void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);

int amdgpu_device_pci_reset(struct amdgpu_device *adev);

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

+0 −6
Original line number Diff line number Diff line
@@ -66,9 +66,7 @@ struct amdgpu_atif { 
	struct amdgpu_atif_notifications notifications;

	struct amdgpu_atif_functions functions;

	struct amdgpu_atif_notification_cfg notification_cfg;

#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

	struct backlight_device *bd;

#endif

	struct amdgpu_dm_backlight_caps backlight_caps;

};
@@ -436,7 +434,6 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
		DRM_DEBUG_DRIVER("ATIF: %d pending SBIOS requests\n", count);



		if (req.pending & ATIF_PANEL_BRIGHTNESS_CHANGE_REQUEST) {

#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

			if (atif->bd) {

				DRM_DEBUG_DRIVER("Changing brightness to %d\n",

						 req.backlight_level);
@@ -447,7 +444,6 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
				 */

				backlight_device_set_brightness(atif->bd, req.backlight_level);

			}

#endif

		}



		if (req.pending & ATIF_DGPU_DISPLAY_EVENT) {
@@ -849,7 +845,6 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
{

	struct amdgpu_atif *atif = &amdgpu_acpi_priv.atif;



#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

	if (atif->notifications.brightness_change) {

		if (amdgpu_device_has_dc_support(adev)) {

#if defined(CONFIG_DRM_AMD_DC)
@@ -876,7 +871,6 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
			}

		}

	}

#endif

	adev->acpi_nb.notifier_call = amdgpu_acpi_event;

	register_acpi_notifier(&adev->acpi_nb);

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

+18 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <uapi/linux/kfd_ioctl.h>

#include "amdgpu_ras.h"

#include "amdgpu_umc.h"

#include "amdgpu_reset.h"



/* Total memory size in system memory and all GPU VRAM. Used to

 * estimate worst case amount of memory to reserve for page tables
@@ -122,6 +123,15 @@ static void amdgpu_doorbell_get_kfd_info(struct amdgpu_device *adev, 
	}

}





static void amdgpu_amdkfd_reset_work(struct work_struct *work)

{

	struct amdgpu_device *adev = container_of(work, struct amdgpu_device,

						  kfd.reset_work);



	amdgpu_device_gpu_recover(adev, NULL);

}



void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)

{

	int i;
@@ -180,6 +190,8 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 


		adev->kfd.init_complete = kgd2kfd_device_init(adev->kfd.dev,

						adev_to_drm(adev), &gpu_resources);



		INIT_WORK(&adev->kfd.reset_work, amdgpu_amdkfd_reset_work);

	}

}
@@ -247,7 +259,8 @@ int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev) 
void amdgpu_amdkfd_gpu_reset(struct amdgpu_device *adev)

{

	if (amdgpu_device_should_recover_gpu(adev))

		amdgpu_device_gpu_recover(adev, NULL);

		amdgpu_reset_domain_schedule(adev->reset_domain,

					     &adev->kfd.reset_work);

}



int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,
@@ -671,6 +684,8 @@ int amdgpu_amdkfd_submit_ib(struct amdgpu_device *adev, 
		goto err_ib_sched;

	}



	/* Drop the initial kref_init count (see drm_sched_main as example) */

	dma_fence_put(f);

	ret = dma_fence_wait(f, false);



err_ib_sched:
@@ -714,7 +729,8 @@ int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct amdgpu_device *adev, 
{

	bool all_hub = false;



	if (adev->family == AMDGPU_FAMILY_AI)

	if (adev->family == AMDGPU_FAMILY_AI ||

	    adev->family == AMDGPU_FAMILY_RV)

		all_hub = true;



	return amdgpu_gmc_flush_gpu_tlb_pasid(adev, pasid, flush_type, all_hub);

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

+9 −5
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ enum kfd_mem_attachment_type { 
	KFD_MEM_ATT_SHARED,	/* Share kgd_mem->bo or another attachment's */

	KFD_MEM_ATT_USERPTR,	/* SG bo to DMA map pages from a userptr bo */

	KFD_MEM_ATT_DMABUF,	/* DMAbuf to DMA map TTM BOs */

	KFD_MEM_ATT_SG		/* Tag to DMA map SG BOs */

};



struct kfd_mem_attachment {
@@ -96,6 +97,7 @@ struct amdgpu_kfd_dev { 
	struct kfd_dev *dev;

	uint64_t vram_used;

	bool init_complete;

	struct work_struct reset_work;

};



enum kgd_engine_type {
@@ -266,6 +268,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct amdgpu_device *adev, 
void amdgpu_amdkfd_gpuvm_release_process_vm(struct amdgpu_device *adev,

					void *drm_priv);

uint64_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *drm_priv);

size_t amdgpu_amdkfd_get_available_memory(struct amdgpu_device *adev);

int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(

		struct amdgpu_device *adev, uint64_t va, uint64_t size,

		void *drm_priv, struct kgd_mem **mem,
@@ -279,10 +282,11 @@ int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu( 
		struct amdgpu_device *adev, struct kgd_mem *mem, void *drm_priv);

int amdgpu_amdkfd_gpuvm_sync_memory(

		struct amdgpu_device *adev, struct kgd_mem *mem, bool intr);

int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct amdgpu_device *adev,

		struct kgd_mem *mem, void **kptr, uint64_t *size);

void amdgpu_amdkfd_gpuvm_unmap_gtt_bo_from_kernel(struct amdgpu_device *adev,

		struct kgd_mem *mem);

int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct kgd_mem *mem,

					     void **kptr, uint64_t *size);

void amdgpu_amdkfd_gpuvm_unmap_gtt_bo_from_kernel(struct kgd_mem *mem);



int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct amdgpu_bo *bo);



int amdgpu_amdkfd_gpuvm_restore_process_bos(void *process_info,

					    struct dma_fence **ef);
@@ -332,7 +336,7 @@ void amdgpu_amdkfd_release_notify(struct amdgpu_bo *bo) 
}

#endif

/* KGD2KFD callbacks */

int kgd2kfd_quiesce_mm(struct mm_struct *mm);

int kgd2kfd_quiesce_mm(struct mm_struct *mm, uint32_t trigger);

int kgd2kfd_resume_mm(struct mm_struct *mm);

int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,

						struct dma_fence *fence);