Commit f858f63e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2025-08-12' of... 

Merge tag 'drm-misc-next-fixes-2025-08-12' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

Short summary of fixes pull:

bridge:
- fix OF-node leak
- fix documentation

fbdev-emulation:
- pass correct format info to drm_helper_mode_fill_fb_struct()

panfrost:
- print correct RSS size

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250812064712.GA14554@2a02-2454-fd5e-fd00-2c49-c639-c55f-a125.dyn6.pyur.net
parents 8f5ae30d 54d4f445

drivers/gpu/drm/bridge/aux-bridge.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ static void drm_aux_bridge_release(struct device *dev) 
{

	struct auxiliary_device *adev = to_auxiliary_dev(dev);



	of_node_put(dev->of_node);

	ida_free(&drm_aux_bridge_ida, adev->id);



	kfree(adev);
@@ -65,6 +66,7 @@ int drm_aux_bridge_register(struct device *parent) 


	ret = auxiliary_device_init(adev);

	if (ret) {

		of_node_put(adev->dev.of_node);

		ida_free(&drm_aux_bridge_ida, adev->id);

		kfree(adev);

		return ret;

drivers/gpu/drm/drm_bridge.c

+1 −0
Original line number Diff line number Diff line
@@ -1227,6 +1227,7 @@ EXPORT_SYMBOL(drm_atomic_bridge_chain_check); 
/**

 * drm_bridge_detect - check if anything is attached to the bridge output

 * @bridge: bridge control structure

 * @connector: attached connector

 *

 * If the bridge supports output detection, as reported by the

 * DRM_BRIDGE_OP_DETECT bridge ops flag, call &drm_bridge_funcs.detect for the

drivers/gpu/drm/nouveau/nouveau_display.c

+3 −6
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ nouveau_check_bl_size(struct nouveau_drm *drm, struct nouveau_bo *nvbo, 


int

nouveau_framebuffer_new(struct drm_device *dev,

			const struct drm_format_info *info,

			const struct drm_mode_fb_cmd2 *mode_cmd,

			struct drm_gem_object *gem,

			struct drm_framebuffer **pfb)
@@ -260,7 +261,6 @@ nouveau_framebuffer_new(struct drm_device *dev, 
	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_bo *nvbo = nouveau_gem_object(gem);

	struct drm_framebuffer *fb;

	const struct drm_format_info *info;

	unsigned int height, i;

	uint32_t tile_mode;

	uint8_t kind;
@@ -295,9 +295,6 @@ nouveau_framebuffer_new(struct drm_device *dev, 
		kind = nvbo->kind;

	}



	info = drm_get_format_info(dev, mode_cmd->pixel_format,

				   mode_cmd->modifier[0]);



	for (i = 0; i < info->num_planes; i++) {

		height = drm_format_info_plane_height(info,

						      mode_cmd->height,
@@ -321,7 +318,7 @@ nouveau_framebuffer_new(struct drm_device *dev, 
	if (!(fb = *pfb = kzalloc(sizeof(*fb), GFP_KERNEL)))

		return -ENOMEM;



	drm_helper_mode_fill_fb_struct(dev, fb, NULL, mode_cmd);

	drm_helper_mode_fill_fb_struct(dev, fb, info, mode_cmd);

	fb->obj[0] = gem;



	ret = drm_framebuffer_init(dev, fb, &nouveau_framebuffer_funcs);
@@ -344,7 +341,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev, 
	if (!gem)

		return ERR_PTR(-ENOENT);



	ret = nouveau_framebuffer_new(dev, mode_cmd, gem, &fb);

	ret = nouveau_framebuffer_new(dev, info, mode_cmd, gem, &fb);

	if (ret == 0)

		return fb;

drivers/gpu/drm/nouveau/nouveau_display.h

+3 −0
Original line number Diff line number Diff line
@@ -8,8 +8,11 @@ 


#include <drm/drm_framebuffer.h>



struct drm_format_info;



int

nouveau_framebuffer_new(struct drm_device *dev,

			const struct drm_format_info *info,

			const struct drm_mode_fb_cmd2 *mode_cmd,

			struct drm_gem_object *gem,

			struct drm_framebuffer **pfb);

drivers/gpu/drm/omapdrm/omap_fb.c

+10 −13
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev, 
		}

	}



	fb = omap_framebuffer_init(dev, mode_cmd, bos);

	fb = omap_framebuffer_init(dev, info, mode_cmd, bos);

	if (IS_ERR(fb))

		goto error;
@@ -365,9 +365,9 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev, 
}



struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,

		const struct drm_format_info *info,

		const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos)

{

	const struct drm_format_info *format = NULL;

	struct omap_framebuffer *omap_fb = NULL;

	struct drm_framebuffer *fb = NULL;

	unsigned int pitch = mode_cmd->pitches[0];
@@ -377,15 +377,12 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, 
			dev, mode_cmd, mode_cmd->width, mode_cmd->height,

			(char *)&mode_cmd->pixel_format);



	format = drm_get_format_info(dev, mode_cmd->pixel_format,

				     mode_cmd->modifier[0]);



	for (i = 0; i < ARRAY_SIZE(formats); i++) {

		if (formats[i] == mode_cmd->pixel_format)

			break;

	}



	if (!format || i == ARRAY_SIZE(formats)) {

	if (i == ARRAY_SIZE(formats)) {

		dev_dbg(dev->dev, "unsupported pixel format: %4.4s\n",

			(char *)&mode_cmd->pixel_format);

		ret = -EINVAL;
@@ -399,7 +396,7 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, 
	}



	fb = &omap_fb->base;

	omap_fb->format = format;

	omap_fb->format = info;

	mutex_init(&omap_fb->lock);



	/*
@@ -407,23 +404,23 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, 
	 * that the two planes of multiplane formats need the same number of

	 * bytes per pixel.

	 */

	if (format->num_planes == 2 && pitch != mode_cmd->pitches[1]) {

	if (info->num_planes == 2 && pitch != mode_cmd->pitches[1]) {

		dev_dbg(dev->dev, "pitches differ between planes 0 and 1\n");

		ret = -EINVAL;

		goto fail;

	}



	if (pitch % format->cpp[0]) {

	if (pitch % info->cpp[0]) {

		dev_dbg(dev->dev,

			"buffer pitch (%u bytes) is not a multiple of pixel size (%u bytes)\n",

			pitch, format->cpp[0]);

			pitch, info->cpp[0]);

		ret = -EINVAL;

		goto fail;

	}



	for (i = 0; i < format->num_planes; i++) {

	for (i = 0; i < info->num_planes; i++) {

		struct plane *plane = &omap_fb->planes[i];

		unsigned int vsub = i == 0 ? 1 : format->vsub;

		unsigned int vsub = i == 0 ? 1 : info->vsub;

		unsigned int size;



		size = pitch * mode_cmd->height / vsub;
@@ -440,7 +437,7 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, 
		plane->dma_addr  = 0;

	}



	drm_helper_mode_fill_fb_struct(dev, fb, NULL, mode_cmd);

	drm_helper_mode_fill_fb_struct(dev, fb, info, mode_cmd);



	ret = drm_framebuffer_init(dev, fb, &omap_framebuffer_funcs);

	if (ret) {