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

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



- SR-IOV fixes
- Raven flickering fix
- Misc spelling fixes
- Vega20 power fixes
- Freesync improvements
- DC fixes

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

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

+37 −0
Original line number Diff line number Diff line
@@ -335,6 +335,43 @@ void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void *mem_obj) 
	amdgpu_bo_unref(&(bo));

}



uint32_t amdgpu_amdkfd_get_fw_version(struct kgd_dev *kgd,

				      enum kgd_engine_type type)

{

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



	switch (type) {

	case KGD_ENGINE_PFP:

		return adev->gfx.pfp_fw_version;



	case KGD_ENGINE_ME:

		return adev->gfx.me_fw_version;



	case KGD_ENGINE_CE:

		return adev->gfx.ce_fw_version;



	case KGD_ENGINE_MEC1:

		return adev->gfx.mec_fw_version;



	case KGD_ENGINE_MEC2:

		return adev->gfx.mec2_fw_version;



	case KGD_ENGINE_RLC:

		return adev->gfx.rlc_fw_version;



	case KGD_ENGINE_SDMA1:

		return adev->sdma.instance[0].fw_version;



	case KGD_ENGINE_SDMA2:

		return adev->sdma.instance[1].fw_version;



	default:

		return 0;

	}



	return 0;

}



void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd,

				      struct kfd_local_mem_info *mem_info)

{

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

+14 −0
Original line number Diff line number Diff line
@@ -81,6 +81,18 @@ struct amdgpu_kfd_dev { 
	uint64_t vram_used;

};



enum kgd_engine_type {

	KGD_ENGINE_PFP = 1,

	KGD_ENGINE_ME,

	KGD_ENGINE_CE,

	KGD_ENGINE_MEC1,

	KGD_ENGINE_MEC2,

	KGD_ENGINE_RLC,

	KGD_ENGINE_SDMA1,

	KGD_ENGINE_SDMA2,

	KGD_ENGINE_MAX

};



struct amdgpu_amdkfd_fence *amdgpu_amdkfd_fence_create(u64 context,

						       struct mm_struct *mm);

bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm);
@@ -142,6 +154,8 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
				void **mem_obj, uint64_t *gpu_addr,

				void **cpu_ptr, bool mqd_gfx9);

void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void *mem_obj);

uint32_t amdgpu_amdkfd_get_fw_version(struct kgd_dev *kgd,

				      enum kgd_engine_type type);

void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd,

				      struct kfd_local_mem_info *mem_info);

uint64_t amdgpu_amdkfd_get_gpu_clock_counter(struct kgd_dev *kgd);

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

+0 −61
Original line number Diff line number Diff line
@@ -22,14 +22,12 @@ 


#include <linux/fdtable.h>

#include <linux/uaccess.h>

#include <linux/firmware.h>

#include <linux/mmu_context.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

#include "cikd.h"

#include "cik_sdma.h"

#include "amdgpu_ucode.h"

#include "gfx_v7_0.h"

#include "gca/gfx_7_2_d.h"

#include "gca/gfx_7_2_enum.h"
@@ -139,7 +137,6 @@ static bool get_atc_vmid_pasid_mapping_valid(struct kgd_dev *kgd, uint8_t vmid); 
static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,

							uint8_t vmid);



static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type);

static void set_scratch_backing_va(struct kgd_dev *kgd,

					uint64_t va, uint32_t vmid);

static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,
@@ -191,7 +188,6 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.address_watch_get_offset = kgd_address_watch_get_offset,

	.get_atc_vmid_pasid_mapping_pasid = get_atc_vmid_pasid_mapping_pasid,

	.get_atc_vmid_pasid_mapping_valid = get_atc_vmid_pasid_mapping_valid,

	.get_fw_version = get_fw_version,

	.set_scratch_backing_va = set_scratch_backing_va,

	.get_tile_config = get_tile_config,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,
@@ -792,63 +788,6 @@ static void set_scratch_backing_va(struct kgd_dev *kgd, 
	unlock_srbm(kgd);

}



static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type)

{

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

	const union amdgpu_firmware_header *hdr;



	switch (type) {

	case KGD_ENGINE_PFP:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.pfp_fw->data;

		break;



	case KGD_ENGINE_ME:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.me_fw->data;

		break;



	case KGD_ENGINE_CE:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.ce_fw->data;

		break;



	case KGD_ENGINE_MEC1:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.mec_fw->data;

		break;



	case KGD_ENGINE_MEC2:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.mec2_fw->data;

		break;



	case KGD_ENGINE_RLC:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.rlc_fw->data;

		break;



	case KGD_ENGINE_SDMA1:

		hdr = (const union amdgpu_firmware_header *)

						adev->sdma.instance[0].fw->data;

		break;



	case KGD_ENGINE_SDMA2:

		hdr = (const union amdgpu_firmware_header *)

						adev->sdma.instance[1].fw->data;

		break;



	default:

		return 0;

	}



	if (hdr == NULL)

		return 0;



	/* Only 12 bit in use*/

	return hdr->common.ucode_version;

}



static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

			uint64_t page_table_base)

{

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

+0 −61
Original line number Diff line number Diff line
@@ -23,12 +23,10 @@ 
#include <linux/module.h>

#include <linux/fdtable.h>

#include <linux/uaccess.h>

#include <linux/firmware.h>

#include <linux/mmu_context.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_ucode.h"

#include "gfx_v8_0.h"

#include "gca/gfx_8_0_sh_mask.h"

#include "gca/gfx_8_0_d.h"
@@ -95,7 +93,6 @@ static bool get_atc_vmid_pasid_mapping_valid(struct kgd_dev *kgd, 
		uint8_t vmid);

static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,

		uint8_t vmid);

static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type);

static void set_scratch_backing_va(struct kgd_dev *kgd,

					uint64_t va, uint32_t vmid);

static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,
@@ -148,7 +145,6 @@ static const struct kfd2kgd_calls kfd2kgd = { 
			get_atc_vmid_pasid_mapping_pasid,

	.get_atc_vmid_pasid_mapping_valid =

			get_atc_vmid_pasid_mapping_valid,

	.get_fw_version = get_fw_version,

	.set_scratch_backing_va = set_scratch_backing_va,

	.get_tile_config = get_tile_config,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,
@@ -751,63 +747,6 @@ static void set_scratch_backing_va(struct kgd_dev *kgd, 
	unlock_srbm(kgd);

}



static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type)

{

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

	const union amdgpu_firmware_header *hdr;



	switch (type) {

	case KGD_ENGINE_PFP:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.pfp_fw->data;

		break;



	case KGD_ENGINE_ME:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.me_fw->data;

		break;



	case KGD_ENGINE_CE:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.ce_fw->data;

		break;



	case KGD_ENGINE_MEC1:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.mec_fw->data;

		break;



	case KGD_ENGINE_MEC2:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.mec2_fw->data;

		break;



	case KGD_ENGINE_RLC:

		hdr = (const union amdgpu_firmware_header *)

						adev->gfx.rlc_fw->data;

		break;



	case KGD_ENGINE_SDMA1:

		hdr = (const union amdgpu_firmware_header *)

						adev->sdma.instance[0].fw->data;

		break;



	case KGD_ENGINE_SDMA2:

		hdr = (const union amdgpu_firmware_header *)

						adev->sdma.instance[1].fw->data;

		break;



	default:

		return 0;

	}



	if (hdr == NULL)

		return 0;



	/* Only 12 bit in use*/

	return hdr->common.ucode_version;

}



static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint64_t page_table_base)

{

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

+0 −54
Original line number Diff line number Diff line
@@ -25,12 +25,10 @@ 
#include <linux/module.h>

#include <linux/fdtable.h>

#include <linux/uaccess.h>

#include <linux/firmware.h>

#include <linux/mmu_context.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_ucode.h"

#include "soc15_hw_ip.h"

#include "gc/gc_9_0_offset.h"

#include "gc/gc_9_0_sh_mask.h"
@@ -111,7 +109,6 @@ static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd, 
		uint8_t vmid);

static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint64_t page_table_base);

static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type);

static void set_scratch_backing_va(struct kgd_dev *kgd,

					uint64_t va, uint32_t vmid);

static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid);
@@ -158,7 +155,6 @@ static const struct kfd2kgd_calls kfd2kgd = { 
			get_atc_vmid_pasid_mapping_pasid,

	.get_atc_vmid_pasid_mapping_valid =

			get_atc_vmid_pasid_mapping_valid,

	.get_fw_version = get_fw_version,

	.set_scratch_backing_va = set_scratch_backing_va,

	.get_tile_config = amdgpu_amdkfd_get_tile_config,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,
@@ -874,56 +870,6 @@ static void set_scratch_backing_va(struct kgd_dev *kgd, 
	 */

}



/* FIXME: Does this need to be ASIC-specific code? */

static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type)

{

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

	const union amdgpu_firmware_header *hdr;



	switch (type) {

	case KGD_ENGINE_PFP:

		hdr = (const union amdgpu_firmware_header *)adev->gfx.pfp_fw->data;

		break;



	case KGD_ENGINE_ME:

		hdr = (const union amdgpu_firmware_header *)adev->gfx.me_fw->data;

		break;



	case KGD_ENGINE_CE:

		hdr = (const union amdgpu_firmware_header *)adev->gfx.ce_fw->data;

		break;



	case KGD_ENGINE_MEC1:

		hdr = (const union amdgpu_firmware_header *)adev->gfx.mec_fw->data;

		break;



	case KGD_ENGINE_MEC2:

		hdr = (const union amdgpu_firmware_header *)adev->gfx.mec2_fw->data;

		break;



	case KGD_ENGINE_RLC:

		hdr = (const union amdgpu_firmware_header *)adev->gfx.rlc_fw->data;

		break;



	case KGD_ENGINE_SDMA1:

		hdr = (const union amdgpu_firmware_header *)adev->sdma.instance[0].fw->data;

		break;



	case KGD_ENGINE_SDMA2:

		hdr = (const union amdgpu_firmware_header *)adev->sdma.instance[1].fw->data;

		break;



	default:

		return 0;

	}



	if (hdr == NULL)

		return 0;



	/* Only 12 bit in use*/

	return hdr->common.ucode_version;

}



static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint64_t page_table_base)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE