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

Merge tag 'drm-misc-next-fixes-2022-07-21' of... 

Merge tag 'drm-misc-next-fixes-2022-07-21' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

Short summary of fixes pull:

 * amdgpu: Fix for drm buddy memory corruption
 * nouveau: PM fixes; DP fixes

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Ytj65+PdAJs4jIEO@linux-uq9g
parents 3cfb5bc9 6f2c8d5f

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

+8 −8
Original line number Diff line number Diff line
@@ -395,11 +395,11 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man, 
	unsigned long pages_per_block;

	int r;



	lpfn = place->lpfn << PAGE_SHIFT;

	lpfn = (u64)place->lpfn << PAGE_SHIFT;

	if (!lpfn)

		lpfn = man->size;



	fpfn = place->fpfn << PAGE_SHIFT;

	fpfn = (u64)place->fpfn << PAGE_SHIFT;



	max_bytes = adev->gmc.mc_vram_size;

	if (tbo->type != ttm_bo_type_kernel)
@@ -439,12 +439,12 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man, 
		/* Allocate blocks in desired range */

		vres->flags |= DRM_BUDDY_RANGE_ALLOCATION;



	remaining_size = vres->base.num_pages << PAGE_SHIFT;

	remaining_size = (u64)vres->base.num_pages << PAGE_SHIFT;



	mutex_lock(&mgr->lock);

	while (remaining_size) {

		if (tbo->page_alignment)

			min_block_size = tbo->page_alignment << PAGE_SHIFT;

			min_block_size = (u64)tbo->page_alignment << PAGE_SHIFT;

		else

			min_block_size = mgr->default_page_size;
@@ -453,12 +453,12 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man, 
		/* Limit maximum size to 2GiB due to SG table limitations */

		size = min(remaining_size, 2ULL << 30);



		if (size >= pages_per_block << PAGE_SHIFT)

			min_block_size = pages_per_block << PAGE_SHIFT;

		if (size >= (u64)pages_per_block << PAGE_SHIFT)

			min_block_size = (u64)pages_per_block << PAGE_SHIFT;



		cur_size = size;



		if (fpfn + size != place->lpfn << PAGE_SHIFT) {

		if (fpfn + size != (u64)place->lpfn << PAGE_SHIFT) {

			/*

			 * Except for actual range allocation, modify the size and

			 * min_block_size conforming to continuous flag enablement
@@ -498,7 +498,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man, 
		LIST_HEAD(temp);



		trim_list = &vres->blocks;

		original_size = vres->base.num_pages << PAGE_SHIFT;

		original_size = (u64)vres->base.num_pages << PAGE_SHIFT;



		/*

		 * If size value is rounded up to min_block_size, trim the last

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static inline u64 amdgpu_vram_mgr_block_start(struct drm_buddy_block *block) 


static inline u64 amdgpu_vram_mgr_block_size(struct drm_buddy_block *block)

{

	return PAGE_SIZE << drm_buddy_block_order(block);

	return (u64)PAGE_SIZE << drm_buddy_block_order(block);

}



static inline struct amdgpu_vram_mgr_resource *

drivers/gpu/drm/nouveau/nouveau_connector.c

+3 −5
Original line number Diff line number Diff line
@@ -1361,13 +1361,11 @@ nouveau_connector_create(struct drm_device *dev, 
		snprintf(aux_name, sizeof(aux_name), "sor-%04x-%04x",

			 dcbe->hasht, dcbe->hashm);

		nv_connector->aux.name = kstrdup(aux_name, GFP_KERNEL);

		drm_dp_aux_init(&nv_connector->aux);

		if (ret) {

			NV_ERROR(drm, "Failed to init AUX adapter for sor-%04x-%04x: %d\n",

				 dcbe->hasht, dcbe->hashm, ret);

		if (!nv_connector->aux.name) {

			kfree(nv_connector);

			return ERR_PTR(ret);

			return ERR_PTR(-ENOMEM);

		}

		drm_dp_aux_init(&nv_connector->aux);

		fallthrough;

	default:

		funcs = &nouveau_connector_funcs;

drivers/gpu/drm/nouveau/nouveau_display.c

+2 −2
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ nouveau_display_hpd_work(struct work_struct *work) 


	pm_runtime_mark_last_busy(drm->dev->dev);

noop:

	pm_runtime_put_sync(drm->dev->dev);

	pm_runtime_put_autosuspend(dev->dev);

}



#ifdef CONFIG_ACPI
@@ -537,7 +537,7 @@ nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val, 
				 * it's own hotplug events.

				 */

				pm_runtime_put_autosuspend(drm->dev->dev);

			} else if (ret == 0) {

			} else if (ret == 0 || ret == -EINPROGRESS) {

				/* We've started resuming the GPU already, so

				 * it will handle scheduling a full reprobe

				 * itself

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ nouveau_fbcon_set_suspend_work(struct work_struct *work) 
	if (state == FBINFO_STATE_RUNNING) {

		nouveau_fbcon_hotplug_resume(drm->fbcon);

		pm_runtime_mark_last_busy(drm->dev->dev);

		pm_runtime_put_sync(drm->dev->dev);

		pm_runtime_put_autosuspend(drm->dev->dev);

	}

}