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

Merge tag 'amd-drm-fixes-6.4-2023-06-14' of... 

Merge tag 'amd-drm-fixes-6.4-2023-06-14' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.4-2023-06-14:

amdgpu:
- GFX9 preemption fixes
- Add missing radeon secondary PCI ID
- vblflash fixes
- SMU 13 fix
- VCN 4.0 fix
- Re-enable TOPDOWN flag for large BAR systems to fix regression
- eDP fix
- PSR hang fix
- DPIA fix

radeon:
- fbdev client warning fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230615024011.7773-1-alexander.deucher@amd.com
parents 858fd168 7c5835bc

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

+1 −0
Original line number Diff line number Diff line
@@ -1615,6 +1615,7 @@ static const u16 amdgpu_unsupported_pciidlist[] = { 
	0x5874,

	0x5940,

	0x5941,

	0x5b70,

	0x5b72,

	0x5b73,

	0x5b74,

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

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *abo, u32 domain) 


		if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)

			places[c].lpfn = visible_pfn;

		else if (adev->gmc.real_vram_size != adev->gmc.visible_vram_size)

		else

			places[c].flags |= TTM_PL_FLAG_TOPDOWN;



		if (flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)

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

+5 −2
Original line number Diff line number Diff line
@@ -3548,6 +3548,9 @@ static ssize_t amdgpu_psp_vbflash_read(struct file *filp, struct kobject *kobj, 
	void *fw_pri_cpu_addr;

	int ret;



	if (adev->psp.vbflash_image_size == 0)

		return -EINVAL;



	dev_info(adev->dev, "VBIOS flash to PSP started");



	ret = amdgpu_bo_create_kernel(adev, adev->psp.vbflash_image_size,
@@ -3599,13 +3602,13 @@ static ssize_t amdgpu_psp_vbflash_status(struct device *dev, 
}



static const struct bin_attribute psp_vbflash_bin_attr = {

	.attr = {.name = "psp_vbflash", .mode = 0664},

	.attr = {.name = "psp_vbflash", .mode = 0660},

	.size = 0,

	.write = amdgpu_psp_vbflash_write,

	.read = amdgpu_psp_vbflash_read,

};



static DEVICE_ATTR(psp_vbflash_status, 0444, amdgpu_psp_vbflash_status, NULL);

static DEVICE_ATTR(psp_vbflash_status, 0440, amdgpu_psp_vbflash_status, NULL);



int amdgpu_psp_sysfs_init(struct amdgpu_device *adev)

{

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

+18 −0
Original line number Diff line number Diff line
@@ -581,3 +581,21 @@ void amdgpu_ring_ib_end(struct amdgpu_ring *ring) 
	if (ring->is_sw_ring)

		amdgpu_sw_ring_ib_end(ring);

}



void amdgpu_ring_ib_on_emit_cntl(struct amdgpu_ring *ring)

{

	if (ring->is_sw_ring)

		amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_CONTROL);

}



void amdgpu_ring_ib_on_emit_ce(struct amdgpu_ring *ring)

{

	if (ring->is_sw_ring)

		amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_CE);

}



void amdgpu_ring_ib_on_emit_de(struct amdgpu_ring *ring)

{

	if (ring->is_sw_ring)

		amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_DE);

}

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

+9 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ struct amdgpu_ring_funcs { 
	int (*preempt_ib)(struct amdgpu_ring *ring);

	void (*emit_mem_sync)(struct amdgpu_ring *ring);

	void (*emit_wave_limit)(struct amdgpu_ring *ring, bool enable);

	void (*patch_cntl)(struct amdgpu_ring *ring, unsigned offset);

	void (*patch_ce)(struct amdgpu_ring *ring, unsigned offset);

	void (*patch_de)(struct amdgpu_ring *ring, unsigned offset);

};



struct amdgpu_ring {
@@ -318,10 +321,16 @@ struct amdgpu_ring { 
#define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r))

#define amdgpu_ring_patch_cond_exec(r,o) (r)->funcs->patch_cond_exec((r),(o))

#define amdgpu_ring_preempt_ib(r) (r)->funcs->preempt_ib(r)

#define amdgpu_ring_patch_cntl(r, o) ((r)->funcs->patch_cntl((r), (o)))

#define amdgpu_ring_patch_ce(r, o) ((r)->funcs->patch_ce((r), (o)))

#define amdgpu_ring_patch_de(r, o) ((r)->funcs->patch_de((r), (o)))



int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned ndw);

void amdgpu_ring_ib_begin(struct amdgpu_ring *ring);

void amdgpu_ring_ib_end(struct amdgpu_ring *ring);

void amdgpu_ring_ib_on_emit_cntl(struct amdgpu_ring *ring);

void amdgpu_ring_ib_on_emit_ce(struct amdgpu_ring *ring);

void amdgpu_ring_ib_on_emit_de(struct amdgpu_ring *ring);



void amdgpu_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count);

void amdgpu_ring_generic_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib);