Commit a6b8720c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'amd-drm-next-5.12-2021-01-20' of... 

Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-5.12-2021-01-20:

amdgpu:
- Fix non-x86 build
- W=1 fixes from Lee Jones
- Enable GPU reset on Navy Flounder
- Kernel doc fixes
- SMU workload profile fixes for APUs
- Display updates
- SR-IOV fixes
- Vangogh SMU feature enablment and bug fixes
- GPU reset support for Vangogh
- Misc cleanups

Conflicts:
	drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c

Resolve the conflict by picking the initialization value from amd from
f03e80d2 ("drm/amd/display: Initialize stack variable") over the
one Linus picked in 61d79136 ("drm/amd/display: avoid
uninitialized variable warning"). It shouldn't matter.

From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210120060951.22600-1-alexander.deucher@amd.com


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 71c46fc3 4aef0ebc

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ AMD KFD 
M:	Felix Kuehling <Felix.Kuehling@amd.com>

L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git git://people.freedesktop.org/~agd5f/linux

T:	git https://gitlab.freedesktop.org/agd5f/linux.git

F:	drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd*.[ch]

F:	drivers/gpu/drm/amd/amdkfd/

F:	drivers/gpu/drm/amd/include/cik_structs.h
@@ -14821,7 +14821,7 @@ M: Alex Deucher <alexander.deucher@amd.com> 
M:	Christian König <christian.koenig@amd.com>

L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git git://people.freedesktop.org/~agd5f/linux

T:	git https://gitlab.freedesktop.org/agd5f/linux.git

F:	drivers/gpu/drm/amd/

F:	drivers/gpu/drm/radeon/

F:	include/uapi/drm/amdgpu_drm.h

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \

	amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \

	amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \

	amdgpu_fw_attestation.o

	amdgpu_fw_attestation.o amdgpu_securedisplay.o



amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o

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

+36 −17
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev) 
union igp_info {

	struct atom_integrated_system_info_v1_11 v11;

	struct atom_integrated_system_info_v1_12 v12;

	struct atom_integrated_system_info_v2_1 v21;

};



union umc_info {
@@ -209,9 +210,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
		if (adev->flags & AMD_IS_APU) {

			igp_info = (union igp_info *)

				(mode_info->atom_context->bios + data_offset);

			switch (frev) {

			case 1:

				switch (crev) {

				case 11:

				case 12:

					mem_channel_number = igp_info->v11.umachannelnumber;

					if (!mem_channel_number)

						mem_channel_number = 1;

					/* channel width is 64 */

					if (vram_width)

						*vram_width = mem_channel_number * 64;
@@ -219,18 +225,31 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
					if (vram_type)

						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

					break;

			case 12:

				mem_channel_number = igp_info->v12.umachannelnumber;

				default:

					return -EINVAL;

				}

				break;

			case 2:

				switch (crev) {

				case 1:

				case 2:

					mem_channel_number = igp_info->v21.umachannelnumber;

					if (!mem_channel_number)

						mem_channel_number = 1;

					/* channel width is 64 */

					if (vram_width)

						*vram_width = mem_channel_number * 64;

				mem_type = igp_info->v12.memorytype;

					mem_type = igp_info->v21.memorytype;

					if (vram_type)

						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

					break;

				default:

					return -EINVAL;

				}

				break;

			default:

				return -EINVAL;

			}

		} else {

			vram_info = (union vram_info *)

				(mode_info->atom_context->bios + data_offset);

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

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "amdgpu_dm_debugfs.h"

#include "amdgpu_ras.h"

#include "amdgpu_rap.h"

#include "amdgpu_securedisplay.h"

#include "amdgpu_fw_attestation.h"



/**
@@ -1669,6 +1670,8 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) 


	amdgpu_rap_debugfs_init(adev);



	amdgpu_securedisplay_debugfs_init(adev);



	amdgpu_fw_attestation_debugfs_init(adev);



	return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,

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

+6 −1
Original line number Diff line number Diff line
@@ -3119,7 +3119,10 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev) 
	 */

	adev->gfx_timeout = msecs_to_jiffies(10000);

	adev->sdma_timeout = adev->video_timeout = adev->gfx_timeout;

	if (amdgpu_sriov_vf(adev) || amdgpu_passthrough(adev))

	if (amdgpu_sriov_vf(adev))

		adev->compute_timeout = amdgpu_sriov_is_pp_one_vf(adev) ?

					msecs_to_jiffies(60000) : msecs_to_jiffies(10000);

	else if (amdgpu_passthrough(adev))

		adev->compute_timeout =  msecs_to_jiffies(60000);

	else

		adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;
@@ -4208,6 +4211,8 @@ bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev) 
		case CHIP_NAVI14:

		case CHIP_NAVI12:

		case CHIP_SIENNA_CICHLID:

		case CHIP_NAVY_FLOUNDER:

		case CHIP_VANGOGH:

			break;

		default:

			goto disabled;