Commit 14808a12 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-next-5.3-2019-06-25:

Merge drm-next

amdgpu:
- SR-IOV L1 policy fixes
- Removed no longer needed vram_page_split module parameter
- Add module parameter to override default ABM level
- Gamma fixes
- No need to check return values for debugfs
- Improve HMM error handling
- Avoid possible OOM situations when lots of thread are submitting with
  memory contention
- Improve hw i2c access abritration
- DSC (Display Stream Compression) support in DC
- Initial navi10 support
  * DC support
  * GFX/Compute support
  * SDMA support
  * Power Management support
  * VCN support
- Static checker fixes
- Misc cleanups
- fix long udelay on arm

amdkfd:
- Implement priority controls for gfx9
- Enable VEGAM
- Rework mqd allocation and init
- Circular locking fix
- Fix SDMA queue allocation race condition
- No need to check return values for debugfs
- Add proc style process information
- Initial navi10 support

radeon:
- No need to check return values for debugfs

UAPI changes:
- GDDR6 added to vram type query
- New Navi10 details added gpu info query
- Navi family added to asic family query

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

drivers/gpu/drm/amd/amdgpu/Makefile

+22 −8
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 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_vm_sdma.o amdgpu_pmu.o amdgpu_discovery.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \
@@ -64,7 +64,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce 


amdgpu-y += \

	vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

	vega20_reg_init.o nbio_v7_4.o

	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o



# add DF block

amdgpu-y += \
@@ -75,7 +75,8 @@ amdgpu-y += \ 
amdgpu-y += \

	gmc_v7_0.o \

	gmc_v8_0.o \

	gfxhub_v1_0.o mmhub_v1_0.o gmc_v9_0.o gfxhub_v1_1.o

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

	gfxhub_v2_0.o mmhub_v2_0.o gmc_v10_0.o



# add IH block

amdgpu-y += \
@@ -84,7 +85,8 @@ amdgpu-y += \ 
	iceland_ih.o \

	tonga_ih.o \

	cz_ih.o \

	vega10_ih.o

	vega10_ih.o \

	navi10_ih.o



# add PSP block

amdgpu-y += \
@@ -108,14 +110,20 @@ amdgpu-y += \ 
	amdgpu_gfx.o \

	amdgpu_rlc.o \

	gfx_v8_0.o \

	gfx_v9_0.o

	gfx_v9_0.o \

	gfx_v10_0.o



# add async DMA block

amdgpu-y += \

	amdgpu_sdma.o \

	sdma_v2_4.o \

	sdma_v3_0.o \

	sdma_v4_0.o

	sdma_v4_0.o \

	sdma_v5_0.o



# add MES block

amdgpu-y += \

	mes_v10_1.o



# add UVD block

amdgpu-y += \
@@ -133,7 +141,12 @@ amdgpu-y += \ 
# add VCN block

amdgpu-y += \

	amdgpu_vcn.o \

	vcn_v1_0.o

	vcn_v1_0.o \

	vcn_v2_0.o



# add ATHUB block

amdgpu-y += \

	athub_v2_0.o



# add amdkfd interfaces

amdgpu-y += amdgpu_amdkfd.o
@@ -146,7 +159,8 @@ amdgpu-y += \ 
	 amdgpu_amdkfd_fence.o \

	 amdgpu_amdkfd_gpuvm.o \

	 amdgpu_amdkfd_gfx_v8.o \

	 amdgpu_amdkfd_gfx_v9.o

	 amdgpu_amdkfd_gfx_v9.o \

	 amdgpu_amdkfd_gfx_v10.o



ifneq ($(CONFIG_DRM_AMDGPU_CIK),)

amdgpu-y += amdgpu_amdkfd_gfx_v7.o

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

+37 −3
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ 
#include "amdgpu_doorbell.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_smu.h"

#include "amdgpu_discovery.h"

#include "amdgpu_mes.h"



#define MAX_GPU_INSTANCE		16
@@ -142,7 +144,6 @@ extern uint amdgpu_sdma_phase_quantum; 
extern char *amdgpu_disable_cu;

extern char *amdgpu_virtual_display;

extern uint amdgpu_pp_feature_mask;

extern int amdgpu_vram_page_split;

extern int amdgpu_ngg;

extern int amdgpu_prim_buf_per_se;

extern int amdgpu_pos_buf_per_se;
@@ -155,9 +156,14 @@ extern int amdgpu_gpu_recovery; 
extern int amdgpu_emu_mode;

extern uint amdgpu_smu_memory_pool_size;

extern uint amdgpu_dc_feature_mask;

extern uint amdgpu_dm_abm_level;

extern struct amdgpu_mgpu_info mgpu_info;

extern int amdgpu_ras_enable;

extern uint amdgpu_ras_mask;

extern int amdgpu_async_gfx_ring;

extern int amdgpu_mcbp;

extern int amdgpu_discovery;

extern int amdgpu_mes;



#ifdef CONFIG_DRM_AMDGPU_SI

extern int amdgpu_si_support;
@@ -213,7 +219,8 @@ struct amdgpu_atif; 
struct kfd_vm_fault_info;



enum amdgpu_cp_irq {

	AMDGPU_CP_IRQ_GFX_EOP = 0,

	AMDGPU_CP_IRQ_GFX_ME0_PIPE0_EOP = 0,

	AMDGPU_CP_IRQ_GFX_ME0_PIPE1_EOP,

	AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE0_EOP,

	AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE1_EOP,

	AMDGPU_CP_IRQ_COMPUTE_MEC1_PIPE2_EOP,
@@ -659,6 +666,8 @@ struct amdgpu_nbio_funcs { 
	u32 (*get_memsize)(struct amdgpu_device *adev);

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

			bool use_doorbell, int doorbell_index, int doorbell_size);

	void (*vcn_doorbell_range)(struct amdgpu_device *adev, bool use_doorbell,

			int doorbell_index);

	void (*enable_doorbell_aperture)(struct amdgpu_device *adev,

					 bool enable);

	void (*enable_doorbell_selfring_aperture)(struct amdgpu_device *adev,
@@ -678,7 +687,7 @@ struct amdgpu_nbio_funcs { 
};



struct amdgpu_df_funcs {

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

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

	void (*enable_broadcast_mode)(struct amdgpu_device *adev,

				      bool enable);

	u32 (*get_fb_channel_number)(struct amdgpu_device *adev);
@@ -729,6 +738,7 @@ struct amd_powerplay { 
};



#define AMDGPU_RESET_MAGIC_NUM 64

#define AMDGPU_MAX_DF_PERFMONS 4

struct amdgpu_device {

	struct device			*dev;

	struct drm_device		*ddev;
@@ -755,6 +765,7 @@ struct amdgpu_device { 
	struct amdgpu_debugfs		debugfs[AMDGPU_DEBUGFS_MAX_COMPONENTS];

	unsigned			debugfs_count;

#if defined(CONFIG_DEBUG_FS)

	struct dentry                   *debugfs_preempt;

	struct dentry			*debugfs_regs[AMDGPU_DEBUGFS_MAX_COMPONENTS];

#endif

	struct amdgpu_atif		*atif;
@@ -905,6 +916,13 @@ struct amdgpu_device { 
	/* display related functionality */

	struct amdgpu_display_manager dm;



	/* discovery */

	uint8_t				*discovery;



	/* mes */

	bool                            enable_mes;

	struct amdgpu_mes               mes;



	struct amdgpu_ip_block          ip_blocks[AMDGPU_MAX_IP_NUM];

	int				num_ip_blocks;

	struct mutex	mn_lock;
@@ -959,6 +977,7 @@ struct amdgpu_device { 
	long				compute_timeout;



	uint64_t			unique_id;

	uint64_t	df_perfmon_config_assign_mask[AMDGPU_MAX_DF_PERFMONS];

};



static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev)
@@ -1198,4 +1217,19 @@ static inline int amdgpu_dm_display_resume(struct amdgpu_device *adev) { return 
#endif



#include "amdgpu_object.h"



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

#define AMDGPU_PMU_ATTR(_name, _object)					\

static ssize_t								\

_name##_show(struct device *dev,					\

			       struct device_attribute *attr,		\

			       char *page)				\

{									\

	BUILD_BUG_ON(sizeof(_object) >= PAGE_SIZE - 1);			\

	return sprintf(page, _object "\n");				\

}									\

									\

static struct device_attribute pmu_attr_##_name = __ATTR_RO(_name)



#endif

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

+16 −4
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev) 
	case CHIP_POLARIS10:

	case CHIP_POLARIS11:

	case CHIP_POLARIS12:

	case CHIP_VEGAM:

		kfd2kgd = amdgpu_amdkfd_gfx_8_0_get_functions();

		break;

	case CHIP_VEGA10:
@@ -86,6 +87,9 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev) 
	case CHIP_RAVEN:

		kfd2kgd = amdgpu_amdkfd_gfx_9_0_get_functions();

		break;

	case CHIP_NAVI10:

		kfd2kgd = amdgpu_amdkfd_gfx_10_0_get_functions();

		break;

	default:

		dev_info(adev->dev, "kfd not supported on this ASIC\n");

		return;
@@ -158,7 +162,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 


		/* remove the KIQ bit as well */

		if (adev->gfx.kiq.ring.sched.ready)

			clear_bit(amdgpu_gfx_queue_to_bit(adev,

			clear_bit(amdgpu_gfx_mec_queue_to_bit(adev,

							  adev->gfx.kiq.ring.me - 1,

							  adev->gfx.kiq.ring.pipe,

							  adev->gfx.kiq.ring.queue),
@@ -436,9 +440,12 @@ void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd, 


	if (amdgpu_sriov_vf(adev))

		mem_info->mem_clk_max = adev->clock.default_mclk / 100;

	else if (adev->powerplay.pp_funcs)

		mem_info->mem_clk_max = amdgpu_dpm_get_mclk(adev, false) / 100;

	else if (adev->powerplay.pp_funcs) {

		if (amdgpu_emu_mode == 1)

			mem_info->mem_clk_max = 0;

		else

			mem_info->mem_clk_max = amdgpu_dpm_get_mclk(adev, false) / 100;

	} else

		mem_info->mem_clk_max = 100;

}
@@ -701,6 +708,11 @@ struct kfd2kgd_calls *amdgpu_amdkfd_gfx_9_0_get_functions(void) 
	return NULL;

}



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_10_0_get_functions(void)

{

	return NULL;

}



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

			      const struct kfd2kgd_calls *f2g)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle); 
struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_9_0_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_10_0_get_functions(void);



bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);

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

0 → 100644
+975 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE