From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 24 Jan 2023 16:36:29 +0000 (+0100)
Subject: Merge tag 'drm-misc-next-2023-01-19' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: 6.3-rc-smb3-client-fixes-part2~33^2~22
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=b8f55f24bc82ed7064645cc7f6675430609314a5;p=sfrench%2Fcifs-2.6.git

Merge tag 'drm-misc-next-2023-01-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for $kernel-version:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:

 * Cleanup unneeded include statements wrt <linux/fb.h>, <drm/drm_fb_helper.h>
   and <drm/drm_crtc_helper.h>

 * Remove unused helper DRM_DEBUG_KMS_RATELIMITED()

 * fbdev: Remove obsolete aperture field from struct fb_device, plus
   driver cleanups; Remove unused flag FBINFO_MISC_FIRMWARE

 * MIPI-DSI: Fix brightness, plus rsp. driver updates

 * scheduler: Deprecate drm_sched_resubmit_jobs()

 * ttm: Fix MIPS build; Remove ttm_bo_wait(); Documentation fixes

Driver Changes:

 * Remove obsolete drivers for userspace modesetting i810, mga, r128,
   savage, sis, tdfx, via

 * bridge: Support CDNS DSI J721E, plus DT bindings; lt9611: Various
   fixes and improvements; sil902x: Various fixes; Fixes

 * nouveau: Removed support for legacy ioctls; Replace zero-size array;
   Cleanups

 * panel: Fixes

 * radeon: Use new DRM logging helpers

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y8kDk5YX7Yz3eRhM@linux-uq9g
---

b8f55f24bc82ed7064645cc7f6675430609314a5
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 4f38c55e767e,09042486e66e..76a2b4a4de10
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@@ -36,8 -36,8 +36,9 @@@
  #include <generated/utsrelease.h>
  #include <linux/pci-p2pdma.h>
  
 +#include <drm/drm_aperture.h>
  #include <drm/drm_atomic_helper.h>
+ #include <drm/drm_crtc_helper.h>
  #include <drm/drm_fb_helper.h>
  #include <drm/drm_probe_helper.h>
  #include <drm/amdgpu_drm.h>
diff --cc drivers/gpu/drm/i915/display/intel_fbdev.c
index 03ed4607a46d,0d19c61b786a..bbdb98d7c96e
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@@ -281,12 -277,9 +277,9 @@@ static int intelfb_create(struct drm_fb
  					i915_gem_object_get_dma_address(obj, 0));
  		info->fix.smem_len = obj->base.size;
  	} else {
- 		info->apertures->ranges[0].base = ggtt->gmadr.start;
- 		info->apertures->ranges[0].size = ggtt->mappable_end;
- 
  		/* Our framebuffer is the entirety of fbdev's system memory */
  		info->fix.smem_start =
 -			(unsigned long)(ggtt->gmadr.start + vma->node.start);
 +			(unsigned long)(ggtt->gmadr.start + i915_ggtt_offset(vma));
  		info->fix.smem_len = vma->size;
  	}