Commit 385b6432 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-fixes

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

amdgpu:
- GC 12.x DCC fix
- DC DCE 6.x fix
- Hibernation fix
- HPD fix
- Backlight fixes
- Color depth fix
- UAF fix in hdcp_work
- VCE 2.x fix
- GC 12.x PTE fix

amdkfd:
- Queue eviction fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250312190931.216506-1-alexander.deucher@amd.com
parents 80e54e84 6cc30748

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

+9 −2
Original line number Diff line number Diff line
@@ -2555,7 +2555,6 @@ static int amdgpu_pmops_freeze(struct device *dev) 
	int r;



	r = amdgpu_device_suspend(drm_dev, true);

	adev->in_s4 = false;

	if (r)

		return r;
@@ -2567,8 +2566,13 @@ static int amdgpu_pmops_freeze(struct device *dev) 
static int amdgpu_pmops_thaw(struct device *dev)

{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);

	int r;



	return amdgpu_device_resume(drm_dev, true);

	r = amdgpu_device_resume(drm_dev, true);

	adev->in_s4 = false;



	return r;

}



static int amdgpu_pmops_poweroff(struct device *dev)
@@ -2581,6 +2585,9 @@ static int amdgpu_pmops_poweroff(struct device *dev) 
static int amdgpu_pmops_restore(struct device *dev)

{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);



	adev->in_s4 = false;



	return amdgpu_device_resume(drm_dev, true);

}

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

+3 −2
Original line number Diff line number Diff line
@@ -528,8 +528,9 @@ static void gmc_v12_0_get_vm_pte(struct amdgpu_device *adev, 


	bo_adev = amdgpu_ttm_adev(bo->tbo.bdev);

	coherent = bo->flags & AMDGPU_GEM_CREATE_COHERENT;

	is_system = (bo->tbo.resource->mem_type == TTM_PL_TT) ||

		(bo->tbo.resource->mem_type == AMDGPU_PL_PREEMPT);

	is_system = bo->tbo.resource &&

		(bo->tbo.resource->mem_type == TTM_PL_TT ||

		 bo->tbo.resource->mem_type == AMDGPU_PL_PREEMPT);



	if (bo && bo->flags & AMDGPU_GEM_CREATE_GFX12_DCC)

		*flags |= AMDGPU_PTE_DCC;

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

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int vce_v2_0_stop(struct amdgpu_device *adev) 
		return 0;

	}



	ip_block = amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCN);

	ip_block = amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCE);

	if (!ip_block)

		return -EINVAL;

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

+5 −3
Original line number Diff line number Diff line
@@ -1230,11 +1230,13 @@ static int evict_process_queues_cpsch(struct device_queue_manager *dqm, 
		decrement_queue_count(dqm, qpd, q);



		if (dqm->dev->kfd->shared_resources.enable_mes) {

			retval = remove_queue_mes(dqm, q, qpd);

			if (retval) {

			int err;



			err = remove_queue_mes(dqm, q, qpd);

			if (err) {

				dev_err(dev, "Failed to evict queue %d\n",

					q->properties.queue_id);

				goto out;

				retval = err;

			}

		}

	}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+16 −1
Original line number Diff line number Diff line
@@ -245,6 +245,10 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, 
static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector);

static void handle_hpd_rx_irq(void *param);



static void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm,

					 int bl_idx,

					 u32 user_brightness);



static bool

is_timing_unchanged_for_freesync(struct drm_crtc_state *old_crtc_state,

				 struct drm_crtc_state *new_crtc_state);
@@ -3371,8 +3375,19 @@ static int dm_resume(struct amdgpu_ip_block *ip_block) 


		mutex_unlock(&dm->dc_lock);



		/* set the backlight after a reset */

		for (i = 0; i < dm->num_of_edps; i++) {

			if (dm->backlight_dev[i])

				amdgpu_dm_backlight_set_level(dm, i, dm->brightness[i]);

		}



		return 0;

	}



	/* leave display off for S4 sequence */

	if (adev->in_s4)

		return 0;



	/* Recreate dc_state - DC invalidates it when setting power state to S3. */

	dc_state_release(dm_state->context);

	dm_state->context = dc_state_create(dm->dc, NULL);
@@ -4906,6 +4921,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector) 
	dm->backlight_dev[aconnector->bl_idx] =

		backlight_device_register(bl_name, aconnector->base.kdev, dm,

					  &amdgpu_dm_backlight_ops, &props);

	dm->brightness[aconnector->bl_idx] = props.brightness;



	if (IS_ERR(dm->backlight_dev[aconnector->bl_idx])) {

		DRM_ERROR("DM: Backlight registration failed!\n");
@@ -4973,7 +4989,6 @@ static void setup_backlight_device(struct amdgpu_display_manager *dm, 
	aconnector->bl_idx = bl_idx;



	amdgpu_dm_update_backlight_caps(dm, bl_idx);

	dm->brightness[bl_idx] = AMDGPU_MAX_BL_LEVEL;

	dm->backlight_link[bl_idx] = link;

	dm->num_of_edps++;