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

Merge tag 'amd-drm-fixes-6.0-2022-09-14' of... 

Merge tag 'amd-drm-fixes-6.0-2022-09-14' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.0-2022-09-14:

amdgpu:
- BACO fixes for some RDNA2 boards
- PCI AER fixes uncovered by a core PCI change
- Properly hook up dirtyfb helper
- RAS fixes for GC 11.x
- TMR fix
- DCN 3.2.x fixes
- DCN 3.1.4 fixes
- LLVM DML stack size fixes

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

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

+11 −3
Original line number Diff line number Diff line
@@ -2365,8 +2365,16 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
		}

		adev->ip_blocks[i].status.sw = true;



		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON) {

			/* need to do common hw init early so everything is set up for gmc */

			r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev);

			if (r) {

				DRM_ERROR("hw_init %d failed %d\n", i, r);

				goto init_failed;

			}

			adev->ip_blocks[i].status.hw = true;

		} else if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {

			/* need to do gmc hw init early so we can allocate gpu mem */

		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {

			/* Try to reserve bad pages early */

			if (amdgpu_sriov_vf(adev))

				amdgpu_virt_exchange_data(adev);
@@ -3052,8 +3060,8 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) 
	int i, r;



	static enum amd_ip_block_type ip_order[] = {

		AMD_IP_BLOCK_TYPE_GMC,

		AMD_IP_BLOCK_TYPE_COMMON,

		AMD_IP_BLOCK_TYPE_GMC,

		AMD_IP_BLOCK_TYPE_PSP,

		AMD_IP_BLOCK_TYPE_IH,

	};

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

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/pci.h>

#include <linux/pm_runtime.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_damage_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_fb_helper.h>
@@ -496,6 +497,7 @@ bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector, 
static const struct drm_framebuffer_funcs amdgpu_fb_funcs = {

	.destroy = drm_gem_fb_destroy,

	.create_handle = drm_gem_fb_create_handle,

	.dirty = drm_atomic_helper_dirtyfb,

};



uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev,

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

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ static int psp_tmr_init(struct psp_context *psp) 
	}



	pptr = amdgpu_sriov_vf(psp->adev) ? &tmr_buf : NULL;

	ret = amdgpu_bo_create_kernel(psp->adev, tmr_size, PSP_TMR_SIZE(psp->adev),

	ret = amdgpu_bo_create_kernel(psp->adev, tmr_size, PSP_TMR_ALIGNMENT,

				      AMDGPU_GEM_DOMAIN_VRAM,

				      &psp->tmr_bo, &psp->tmr_mc_addr, pptr);

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#define PSP_CMD_BUFFER_SIZE	0x1000

#define PSP_1_MEG		0x100000

#define PSP_TMR_SIZE(adev)	((adev)->asic_type == CHIP_ALDEBARAN ? 0x800000 : 0x400000)

#define PSP_TMR_ALIGNMENT	0x100000

#define PSP_FW_NAME_LEN		0x24



enum psp_shared_mem_size {

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

+2 −1
Original line number Diff line number Diff line
@@ -1811,7 +1811,8 @@ static void amdgpu_ras_log_on_err_counter(struct amdgpu_device *adev) 
		amdgpu_ras_query_error_status(adev, &info);



		if (adev->ip_versions[MP0_HWIP][0] != IP_VERSION(11, 0, 2) &&

		    adev->ip_versions[MP0_HWIP][0] != IP_VERSION(11, 0, 4)) {

		    adev->ip_versions[MP0_HWIP][0] != IP_VERSION(11, 0, 4) &&

		    adev->ip_versions[MP0_HWIP][0] != IP_VERSION(13, 0, 0)) {

			if (amdgpu_ras_reset_error_status(adev, info.head.block))

				dev_warn(adev->dev, "Failed to reset error counter and error status");

		}