Commit 39436e1d authored May 01, 2026 by Dave Airlie

Merge tag 'drm-misc-fixes-2026-04-30' of...

Merge tag 'drm-misc-fixes-2026-04-30' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

Short summary of fixes pull:

DRM core and helpers:
- calculate framebuffer geometry with format helpers
- fix docs

appletbdrm:
- allocate protocol buffers with kvzalloc()

dma-buf:
- fix docs

imagination:
- avoid segfault in debugfs

ofdrm:
- put PCI device reference on errors

udl:
- increase USB timeout

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patch.msgid.link/20260430064521.GA14957@linux.fritz.box

parents 254f4963 ac2c9966

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
		Ahmad Masri <quic_amasri@quicinc.com> <amasri@codeaurora.org>
		Adam Oldham <oldhamca@gmail.com>
		Adam Radford <aradford@gmail.com>
		Aditya Garg <gargaditya08@proton.me> <gargaditya08@live.com>
		Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
		Adrian Bunk <bunk@stusta.de>
		Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -7873,7 +7873,7 @@ F: drivers/gpu/drm/sun4i/sun8i*

		DRM DRIVER FOR APPLE TOUCH BARS
		M: Aun-Ali Zaidi <admin@kodeit.net>
		M: Aditya Garg <gargaditya08@live.com>
		M: Aditya Garg <gargaditya08@proton.me>
		L: dri-devel@lists.freedesktop.org
		S: Maintained
		T: git https://gitlab.freedesktop.org/drm/misc/kernel.git

drivers/gpu/drm/drm_color_mgmt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -831,7 +831,7 @@ static void fill_palette_332(struct drm_crtc *crtc, u16 r, u16 g, u16 b,
		}

		/**
		* drm_crtc_fill_palette_332 - Programs a default palette for R332-like formats
		* drm_crtc_fill_palette_332 - Programs a default palette for RGB332-like formats
		* @crtc: The displaying CRTC
		* @set_palette: Callback for programming the hardware gamma LUT
		*

drivers/gpu/drm/drm_gem_framebuffer_helper.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -172,8 +172,8 @@ int drm_gem_fb_init_with_funcs(struct drm_device *dev,
		}

		for (i = 0; i < info->num_planes; i++) {
		unsigned int width = mode_cmd->width / (i ? info->hsub : 1);
		unsigned int height = mode_cmd->height / (i ? info->vsub : 1);
		unsigned int width = drm_format_info_plane_width(info, mode_cmd->width, i);
		unsigned int height = drm_format_info_plane_height(info, mode_cmd->height, i);
		unsigned int min_size;

		objs[i] = drm_gem_object_lookup(file, mode_cmd->handles[i]);

drivers/gpu/drm/imagination/pvr_fw_trace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -558,6 +558,6 @@ pvr_fw_trace_debugfs_init(struct pvr_device pvr_dev, struct dentry dir)
		&pvr_fw_trace_fops);
		}

		debugfs_create_file("trace_mask", 0600, dir, fw_trace,
		debugfs_create_file("trace_mask", 0600, dir, pvr_dev,
		&pvr_fw_trace_mask_fops);
		}