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

Merge tag 'amd-drm-fixes-6.14-2025-03-06' of... 

Merge tag 'amd-drm-fixes-6.14-2025-03-06' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.14-2025-03-06:

amdgpu:
- Fix NULL check in DC code
- SMU 14 fix

amdkfd:
- Fix NULL check in queue validation

radeon:
- RS400 HyperZ fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250306193424.27413-1-alexander.deucher@amd.com
parents eea6520c da552bda

drivers/gpu/drm/amd/amdkfd/kfd_queue.c

+2 −2
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_prope 
	/* EOP buffer is not required for all ASICs */

	if (properties->eop_ring_buffer_address) {

		if (properties->eop_ring_buffer_size != topo_dev->node_props.eop_buffer_size) {

			pr_debug("queue eop bo size 0x%lx not equal to node eop buf size 0x%x\n",

				properties->eop_buf_bo->tbo.base.size,

			pr_debug("queue eop bo size 0x%x not equal to node eop buf size 0x%x\n",

				properties->eop_ring_buffer_size,

				topo_dev->node_props.eop_buffer_size);

			err = -EINVAL;

			goto out_err_unreserve;

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+2 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,8 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) 
	DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);



	/* Invalid input */

	if (!plane_state->dst_rect.width ||

	if (!plane_state ||

			!plane_state->dst_rect.width ||

			!plane_state->dst_rect.height ||

			!plane_state->src_rect.width ||

			!plane_state->src_rect.height) {

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c

+1 −11
Original line number Diff line number Diff line
@@ -1895,16 +1895,6 @@ static int smu_v14_0_allow_ih_interrupt(struct smu_context *smu) 
				    NULL);

}



static int smu_v14_0_process_pending_interrupt(struct smu_context *smu)

{

	int ret = 0;



	if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_ACDC_BIT))

		ret = smu_v14_0_allow_ih_interrupt(smu);



	return ret;

}



int smu_v14_0_enable_thermal_alert(struct smu_context *smu)

{

	int ret = 0;
@@ -1916,7 +1906,7 @@ int smu_v14_0_enable_thermal_alert(struct smu_context *smu) 
	if (ret)

		return ret;



	return smu_v14_0_process_pending_interrupt(smu);

	return smu_v14_0_allow_ih_interrupt(smu);

}



int smu_v14_0_disable_thermal_alert(struct smu_context *smu)

drivers/gpu/drm/radeon/r300.c

+2 −1
Original line number Diff line number Diff line
@@ -359,7 +359,8 @@ int r300_mc_wait_for_idle(struct radeon_device *rdev) 
	return -1;

}



static void r300_gpu_init(struct radeon_device *rdev)

/* rs400_gpu_init also calls this! */

void r300_gpu_init(struct radeon_device *rdev)

{

	uint32_t gb_tile_config, tmp;

drivers/gpu/drm/radeon/radeon_asic.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ void r200_set_safe_registers(struct radeon_device *rdev); 
 */

extern int r300_init(struct radeon_device *rdev);

extern void r300_fini(struct radeon_device *rdev);

extern void r300_gpu_init(struct radeon_device *rdev);

extern int r300_suspend(struct radeon_device *rdev);

extern int r300_resume(struct radeon_device *rdev);

extern int r300_asic_reset(struct radeon_device *rdev, bool hard);