]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'drm-misc-next-2023-05-11' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Fri, 19 May 2023 01:37:52 +0000 (11:37 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 19 May 2023 01:37:59 +0000 (11:37 +1000)
drm-misc-next for 6.5:

UAPI Changes:

Cross-subsystem Changes:
 - arch: Consolidate <asm/fb.h>

Core Changes:
 - aperture: Ignore firmware framebuffers with non-primary devices
 - fbdev: Use fbdev's I/O helpers
 - sysfs: Expose DRM connector ID
 - tests: More tests for drm_rect

Driver Changes:
 - armada: Implement fbdev emulation as a client
 - bridge:
   - fsl-ldb: Support i.MX6SX
   - lt9211: Remove blanking packets
   - lt9611: Remove blanking packets
   - tc358768: Implement input bus formats reporting, fix various
     timings and clocks settings
   - ti-sn65dsi86: Implement wait_hpd_asserted
 - nouveau: Improve NULL pointer checks before dereference
 - panel:
   - nt36523: Support Lenovo J606F
   - st7703: Support Anbernic RG353V-V2
   - new panels: InnoLux G070ACE-L01
 - sun4i: Fix MIPI-DSI dotclock
 - vc4: RGB Range toggle property, BT601 and BT2020 support for HDMI
 - vkms: Convert to drmm helpers, Add reflection and rotation support

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/2pxmxdzsk2ekjy6xvbpj67zrhtwvkkhfspuvdm5pfm5i54hed6@sooct7yq6z4w
1  2 
MAINTAINERS
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/scheduler/sched_main.c
drivers/video/fbdev/arcfb.c
drivers/video/fbdev/stifb.c
drivers/video/fbdev/vfb.c
include/drm/display/drm_dp.h

diff --cc MAINTAINERS
Simple merge
Simple merge
index 024d0ee4f04f93eae748e420a05c920f8db880c5,7750e020839ecd91fb736db5495c9ffd92d30eb1..91ac29b6a89c890934dce3b64c149ee35a7918ee
@@@ -523,9 -526,9 +526,9 @@@ static int arcfb_probe(struct platform_
  
        info = framebuffer_alloc(sizeof(struct arcfb_par), &dev->dev);
        if (!info)
 -              goto err;
 +              goto err_fb_alloc;
  
-       info->screen_base = (char __iomem *)videomemory;
+       info->screen_buffer = videomemory;
        info->fbops = &arcfb_ops;
  
        info->var = arcfb_var;
Simple merge
Simple merge
Simple merge