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: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 1 year ago

Commit f858f632 parents 8f5ae30 54d4f4412 files · +85 −28Browse files

Unified · Split

12 files

drivers/gpu/drm/bridge/aux-bridge.c +2 −0
drivers/gpu/drm/drm_bridge.c +1 −0
drivers/gpu/drm/nouveau/nouveau_display.c +3 −6
drivers/gpu/drm/nouveau/nouveau_display.h +3 −0
drivers/gpu/drm/omapdrm/omap_fb.c +10 −13
drivers/gpu/drm/omapdrm/omap_fb.h +2 −0
drivers/gpu/drm/omapdrm/omap_fbdev.c +4 −1
drivers/gpu/drm/panfrost/panfrost_gem.c +1 −1
drivers/gpu/drm/radeon/radeon_display.c +3 −2
drivers/gpu/drm/radeon/radeon_fbdev.c +6 −5
drivers/gpu/drm/radeon/radeon_mode.h +2 −0
include/drm/drm_bridge.h +48 −0

drivers/gpu/drm/bridge/aux-bridge.c+2−0

 {
 	struct auxiliary_device *adev = to_auxiliary_dev(dev);
+	of_node_put(dev->of_node);
 	ida_free(&drm_aux_bridge_ida, adev->id);
 	kfree(adev);
 	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

@@ -1227,6 +1227,7 @@ EXPORT_SYMBOL(drm_atomic_bridge_chain_check); · 1226 unmodified lines
1227	/**	1227	/**
1228	* drm_bridge_detect - check if anything is attached to the bridge output	1228	* drm_bridge_detect - check if anything is attached to the bridge output
1229	* @bridge: bridge control structure	1229	* @bridge: bridge control structure
		1230	* @connector: attached connector
1230	*	1231	*
1231	* If the bridge supports output detection, as reported by the	1232	* If the bridge supports output detection, as reported by the
1232	* DRM_BRIDGE_OP_DETECT bridge ops flag, call &drm_bridge_funcs.detect for the	1233	* DRM_BRIDGE_OP_DETECT bridge ops flag, call &drm_bridge_funcs.detect for the

drivers/gpu/drm/nouveau/nouveau_display.c+3−6

 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)
 	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;
 		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,
 	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);
 	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

 #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

 		}
 	}
-	fb = omap_framebuffer_init(dev, mode_cmd, bos);
+	fb = omap_framebuffer_init(dev, info, mode_cmd, bos);
 	if (IS_ERR(fb))
 		goto error;
 }
 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];
 			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;
 	}
 	fb = &omap_fb->base;
-	omap_fb->format = format;
+	omap_fb->format = info;
 	mutex_init(&omap_fb->lock);
 	/*
 	 * 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;
 		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) {

drivers/gpu/drm/omapdrm/omap_fb.h+2−0

 struct drm_device;
 struct drm_file;
 struct drm_framebuffer;
+struct drm_format_info;
 struct drm_gem_object;
 struct drm_mode_fb_cmd2;
 struct drm_plane_state;
 		struct drm_file *file, const struct drm_format_info *info,
 		const struct drm_mode_fb_cmd2 *mode_cmd);
 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);
 int omap_framebuffer_pin(struct drm_framebuffer *fb);
 void omap_framebuffer_unpin(struct drm_framebuffer *fb);

drivers/gpu/drm/omapdrm/omap_fbdev.c+4−1

 		goto fail;
 	}
-	fb = omap_framebuffer_init(dev, &mode_cmd, &bo);
+	fb = omap_framebuffer_init(dev,
+				   drm_get_format_info(dev, mode_cmd.pixel_format,
+						       mode_cmd.modifier[0]),
+				   &mode_cmd, &bo);
 	if (IS_ERR(fb)) {
 		dev_err(dev->dev, "failed to allocate fb\n");
 		/* note: if fb creation failed, we can't rely on fb destroy

drivers/gpu/drm/panfrost/panfrost_gem.c+1−1

@@ -432,7 +432,7 @@ static void panfrost_gem_debugfs_bo_print(struct panfrost_gem_object *bo, · 431 unmodified lines
432	if (!refcount)	432	if (!refcount)
433	return;	433	return;
434		434
435	resident_size = bo->base.pages ? bo->base.base.size : 0;	435	resident_size = panfrost_gem_rss(&bo->base.base);
436		436
437	snprintf(creator_info, sizeof(creator_info),	437	snprintf(creator_info, sizeof(creator_info),
438	"%s/%d", bo->debugfs.creator.process_name, bo->debugfs.creator.tgid);	438	"%s/%d", bo->debugfs.creator.process_name, bo->debugfs.creator.tgid);

drivers/gpu/drm/radeon/radeon_display.c+3−2

 int
 radeon_framebuffer_init(struct drm_device *dev,
 			struct drm_framebuffer *fb,
+			const struct drm_format_info *info,
 			const struct drm_mode_fb_cmd2 *mode_cmd,
 			struct drm_gem_object *obj)
 {
 	int ret;
 	fb->obj[0] = obj;
-	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, &radeon_fb_funcs);
 	if (ret) {
 		fb->obj[0] = NULL;
 		return ERR_PTR(-ENOMEM);
 	}
-	ret = radeon_framebuffer_init(dev, fb, mode_cmd, obj);
+	ret = radeon_framebuffer_init(dev, fb, info, mode_cmd, obj);
 	if (ret) {
 		kfree(fb);
 		drm_gem_object_put(obj);

drivers/gpu/drm/radeon/radeon_fbdev.c+6−5

 }
 static int radeon_fbdev_create_pinned_object(struct drm_fb_helper *fb_helper,
+					     const struct drm_format_info *info,
 					     struct drm_mode_fb_cmd2 *mode_cmd,
 					     struct drm_gem_object **gobj_p)
 {
-	const struct drm_format_info *info;
 	struct radeon_device *rdev = fb_helper->dev->dev_private;
 	struct drm_gem_object *gobj = NULL;
 	struct radeon_bo *rbo = NULL;
 	int height = mode_cmd->height;
 	u32 cpp;
-	info = drm_get_format_info(rdev_to_drm(rdev), mode_cmd->pixel_format,
-				   mode_cmd->modifier[0]);
 	cpp = info->cpp[0];
 	/* need to align pitch with crtc limits */
 				    struct drm_fb_helper_surface_size *sizes)
 {
 	struct radeon_device *rdev = fb_helper->dev->dev_private;
+	const struct drm_format_info *format_info;
 	struct drm_mode_fb_cmd2 mode_cmd = { };
 	struct fb_info *info;
 	struct drm_gem_object *gobj;
 	mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
 							  sizes->surface_depth);
-	ret = radeon_fbdev_create_pinned_object(fb_helper, &mode_cmd, &gobj);
+	format_info = drm_get_format_info(rdev_to_drm(rdev), mode_cmd.pixel_format,
+					  mode_cmd.modifier[0]);
+	ret = radeon_fbdev_create_pinned_object(fb_helper, format_info, &mode_cmd, &gobj);
 	if (ret) {
 		DRM_ERROR("failed to create fbcon object %d\n", ret);
 		return ret;
 		ret = -ENOMEM;
 		goto err_radeon_fbdev_destroy_pinned_object;
 	}
-	ret = radeon_framebuffer_init(rdev_to_drm(rdev), fb, &mode_cmd, gobj);
+	ret = radeon_framebuffer_init(rdev_to_drm(rdev), fb, format_info, &mode_cmd, gobj);
 	if (ret) {
 		DRM_ERROR("failed to initialize framebuffer %d\n", ret);
 		goto err_kfree;

drivers/gpu/drm/radeon/radeon_mode.h+2−0

 struct drm_fb_helper;
 struct drm_fb_helper_surface_size;
+struct drm_format_info;
 struct edid;
 struct drm_edid;
 radeon_combios_encoder_dpms_scratch_regs(struct drm_encoder *encoder, bool on);
 int radeon_framebuffer_init(struct drm_device *dev,
 			     struct drm_framebuffer *rfb,
+			     const struct drm_format_info *info,
 			     const struct drm_mode_fb_cmd2 *mode_cmd,
 			     struct drm_gem_object *obj);

include/drm/drm_bridge.h+48−0

@@ -866,13 +866,61 @@ struct drm_bridge_funcs { · 865 unmodified lines
866	struct drm_connector *connector,	866	struct drm_connector *connector,
867	bool enable, int direction);	867	bool enable, int direction);
868		868
		869	/**
		870	* @hdmi_cec_init:
		871	*
		872	* Initialize CEC part of the bridge.
		873	*
		874	* This callback is optional, it can be implemented by bridges that
		875	* set the @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER flag in their
		876	* &drm_bridge->ops.
		877	*
		878	* Returns:
		879	* 0 on success, a negative error code otherwise
		880	*/
869	int (hdmi_cec_init)(struct drm_bridge bridge,	881	int (hdmi_cec_init)(struct drm_bridge bridge,
870	struct drm_connector *connector);	882	struct drm_connector *connector);
871		883
		884	/**
		885	* @hdmi_cec_enable:
		886	*
		887	* Enable or disable the CEC adapter inside the bridge.
		888	*
		889	* This callback is optional, it can be implemented by bridges that
		890	* set the @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER flag in their
		891	* &drm_bridge->ops.
		892	*
		893	* Returns:
		894	* 0 on success, a negative error code otherwise
		895	*/
872	int (hdmi_cec_enable)(struct drm_bridge bridge, bool enable);	896	int (hdmi_cec_enable)(struct drm_bridge bridge, bool enable);
873		897
		898	/**
		899	* @hdmi_cec_log_addr:
		900	*
		901	* Set the logical address of the CEC adapter inside the bridge.
		902	*
		903	* This callback is optional, it can be implemented by bridges that
		904	* set the @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER flag in their
		905	* &drm_bridge->ops.
		906	*
		907	* Returns:
		908	* 0 on success, a negative error code otherwise
		909	*/
874	int (hdmi_cec_log_addr)(struct drm_bridge bridge, u8 logical_addr);	910	int (hdmi_cec_log_addr)(struct drm_bridge bridge, u8 logical_addr);
875		911
		912	/**
		913	* @hdmi_cec_transmit:
		914	*
		915	* Transmit the message using the CEC adapter inside the bridge.
		916	*
		917	* This callback is optional, it can be implemented by bridges that
		918	* set the @DRM_BRIDGE_OP_HDMI_CEC_ADAPTER flag in their
		919	* &drm_bridge->ops.
		920	*
		921	* Returns:
		922	* 0 on success, a negative error code otherwise
		923	*/
876	int (hdmi_cec_transmit)(struct drm_bridge bridge, u8 attempts,	924	int (hdmi_cec_transmit)(struct drm_bridge bridge, u8 attempts,
877	u32 signal_free_time, struct cec_msg *msg);	925	u32 signal_free_time, struct cec_msg *msg);
878		926

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code