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

Merge tag 'amd-drm-fixes-6.11-2024-07-25' of... 

Merge tag 'amd-drm-fixes-6.11-2024-07-25' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-fixes-6.11-2024-07-25:

amdgpu:
- SDMA 5.2 workaround
- GFX12 fixes
- Uninitialized variable fix
- VCN/JPEG 4.0.3 fixes
- Misc display fixes
- RAS fixes
- VCN4/5 harvest fix
- GPU reset fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240725202900.2155572-1-alexander.deucher@amd.com
parents 86f259cb 5659b0c9

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ amdgpu-y += \ 
	df_v1_7.o \

	df_v3_6.o \

	df_v4_3.o \

	df_v4_6_2.o

	df_v4_6_2.o \

	df_v4_15.o



# add GMC block

amdgpu-y += \

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

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct amdgpu_df_hash_status { 
struct amdgpu_df_funcs {

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

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

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

	void (*enable_broadcast_mode)(struct amdgpu_device *adev,

				      bool enable);

	u32 (*get_fb_channel_number)(struct amdgpu_device *adev);

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

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "df_v3_6.h"

#include "df_v4_3.h"

#include "df_v4_6_2.h"

#include "df_v4_15.h"

#include "nbio_v6_1.h"

#include "nbio_v7_0.h"

#include "nbio_v7_4.h"
@@ -2803,6 +2804,10 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(4, 6, 2):

		adev->df.funcs = &df_v4_6_2_funcs;

		break;

	case IP_VERSION(4, 15, 0):

	case IP_VERSION(4, 15, 1):

		adev->df.funcs = &df_v4_15_funcs;

		break;

	default:

		break;

	}

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

+1 −3
Original line number Diff line number Diff line
@@ -1630,9 +1630,7 @@ static int psp_ras_send_cmd(struct psp_context *psp, 


	switch (cmd) {

	case TA_RAS_COMMAND__TRIGGER_ERROR:

		if (ret || psp->cmd_buf_mem->resp.status)

			ret = -EINVAL;

		else if (out)

		if (!ret && out)

			memcpy(out, &ras_cmd->ras_status, sizeof(ras_cmd->ras_status));

		break;

	case TA_RAS_COMMAND__QUERY_ADDRESS:

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

+3 −0
Original line number Diff line number Diff line
@@ -1011,6 +1011,9 @@ int amdgpu_ras_eeprom_read(struct amdgpu_ras_eeprom_control *control, 


uint32_t amdgpu_ras_eeprom_max_record_count(struct amdgpu_ras_eeprom_control *control)

{

	/* get available eeprom table version first before eeprom table init */

	amdgpu_ras_set_eeprom_table_version(control);



	if (control->tbl_hdr.version == RAS_TABLE_VER_V2_1)

		return RAS_MAX_RECORD_COUNT_V2_1;

	else