From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 5 Jul 2024 08:35:14 +0000 (+0200)
Subject: Merge v6.10-rc6 into drm-next
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/86634fa4e6aeff2e190616c304156899beb4d76b

Merge v6.10-rc6 into drm-next

The exynos-next pull is based on a newer -rc than drm-next. hence
backmerge first to make sure the unrelated conflicts we accumulated
don't end up randomly in the exynos merge pull, but are separated out.

Conflicts are all benign: Adjacent changes in amdgpu and fbdev-dma
code, and cherry-pick conflict in xe.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

86634fa4e6aeff2e190616c304156899beb4d76b
diff --cc drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
index 12a7b0634ed5,2e32b085824a..ac0dd6b97f8d
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
@@@ -272,8 -272,7 +272,8 @@@
  	__SMU_DUMMY_MAP(SetSoftMinVpe), \
  	__SMU_DUMMY_MAP(GetMetricsVersion), \
  	__SMU_DUMMY_MAP(EnableUCLKShadow), \
- 	__SMU_DUMMY_MAP(RmaDueToBadPageThreshold),\
+ 	__SMU_DUMMY_MAP(RmaDueToBadPageThreshold), \
 +	__SMU_DUMMY_MAP(SelectPstatePolicy), \
  	__SMU_DUMMY_MAP(MALLPowerController), \
  	__SMU_DUMMY_MAP(MALLPowerState),
  
diff --cc drivers/gpu/drm/drm_fbdev_dma.c
index 97ef6300d47e,13cd754af311..4b0527ddeb5a
--- a/drivers/gpu/drm/drm_fbdev_dma.c
+++ b/drivers/gpu/drm/drm_fbdev_dma.c
@@@ -137,22 -130,14 +137,25 @@@ static int drm_fbdev_dma_helper_fb_prob
  		info->flags |= FBINFO_READS_FAST; /* signal caching */
  	info->screen_size = sizes->surface_height * fb->pitches[0];
  	info->screen_buffer = map.vaddr;
- 	info->fix.smem_start = page_to_phys(virt_to_page(info->screen_buffer));
+ 	if (!(info->flags & FBINFO_HIDE_SMEM_START)) {
+ 		if (!drm_WARN_ON(dev, is_vmalloc_addr(info->screen_buffer)))
+ 			info->fix.smem_start = page_to_phys(virt_to_page(info->screen_buffer));
+ 	}
  	info->fix.smem_len = info->screen_size;
  
 +	/* deferred I/O */
 +	fb_helper->fbdefio.delay = HZ / 20;
 +	fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io;
 +
 +	info->fbdefio = &fb_helper->fbdefio;
 +	ret = fb_deferred_io_init(info);
 +	if (ret)
 +		goto err_drm_fb_helper_release_info;
 +
  	return 0;
  
 +err_drm_fb_helper_release_info:
 +	drm_fb_helper_release_info(fb_helper);
  err_drm_client_buffer_vunmap:
  	fb_helper->fb = NULL;
  	fb_helper->buffer = NULL;