]> git.samba.org - sfrench/cifs-2.6.git/commitdiff
Merge tag 'drm-misc-next-2023-01-19' of git://anongit.freedesktop.org/drm/drm-misc...
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 24 Jan 2023 16:36:29 +0000 (17:36 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 24 Jan 2023 16:36:29 +0000 (17:36 +0100)
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
21 files changed:
1  2 
MAINTAINERS
drivers/gpu/drm/Makefile
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
drivers/gpu/drm/i915/display/intel_fbdev.c
drivers/video/fbdev/core/fbcon.c
drivers/video/fbdev/hyperv_fb.c
include/drm/drm_drv.h
samples/vfio-mdev/mdpy-fb.c

diff --cc MAINTAINERS
Simple merge
Simple merge
index 4f38c55e767e1bf313c228fa409c1ce923a55f26,09042486e66e29dac845b73c95681c53cd978cd7..76a2b4a4de10e57091627439ff315e2d468b5aca
@@@ -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>
Simple merge
Simple merge
index 03ed4607a46d2181dded13e42398ddfffa38b944,0d19c61b786a061cb062dc3636b3ff3b3b46aabd..bbdb98d7c96e01ec45e004be48e3625fdb4459d5
@@@ -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;
        }
  
Simple merge
Simple merge
Simple merge
Simple merge