Commit 26c7a181 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2025-11-27' of... 

Merge tag 'drm-misc-fixes-2025-11-27' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

Short summary of fixes pull:

bridge:
- sil902x: Fix HDMI detection

imagination:
- Update documentation

sti:
- Fix leaks in probe

vga_switcheroo:
- Avoid race condition during fbcon initialization

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patch.msgid.link/20251127081007.GA13578@2a02-2454-fd5e-fd00-689d-32c0-780c-bb87.dyn6.pyur.net
parents 4fc3ad63 eb76d0f5

drivers/gpu/drm/bridge/sii902x.c

+8 −12
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ struct sii902x { 
	struct drm_connector connector;

	struct gpio_desc *reset_gpio;

	struct i2c_mux_core *i2cmux;

	bool sink_is_hdmi;

	u32 bus_width;



	/*
@@ -315,8 +314,6 @@ static int sii902x_get_modes(struct drm_connector *connector) 
		drm_edid_free(drm_edid);

	}



	sii902x->sink_is_hdmi = connector->display_info.is_hdmi;



	return num;

}
@@ -342,9 +339,17 @@ static void sii902x_bridge_atomic_enable(struct drm_bridge *bridge, 
					 struct drm_atomic_state *state)

{

	struct sii902x *sii902x = bridge_to_sii902x(bridge);

	struct drm_connector *connector;

	u8 output_mode = SII902X_SYS_CTRL_OUTPUT_DVI;



	connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);

	if (connector && connector->display_info.is_hdmi)

		output_mode = SII902X_SYS_CTRL_OUTPUT_HDMI;



	mutex_lock(&sii902x->mutex);



	regmap_update_bits(sii902x->regmap, SII902X_SYS_CTRL_DATA,

			   SII902X_SYS_CTRL_OUTPUT_MODE, output_mode);

	regmap_update_bits(sii902x->regmap, SII902X_PWR_STATE_CTRL,

			   SII902X_AVI_POWER_STATE_MSK,

			   SII902X_AVI_POWER_STATE_D(0));
@@ -359,16 +364,12 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge, 
				    const struct drm_display_mode *adj)

{

	struct sii902x *sii902x = bridge_to_sii902x(bridge);

	u8 output_mode = SII902X_SYS_CTRL_OUTPUT_DVI;

	struct regmap *regmap = sii902x->regmap;

	u8 buf[HDMI_INFOFRAME_SIZE(AVI)];

	struct hdmi_avi_infoframe frame;

	u16 pixel_clock_10kHz = adj->clock / 10;

	int ret;



	if (sii902x->sink_is_hdmi)

		output_mode = SII902X_SYS_CTRL_OUTPUT_HDMI;



	buf[0] = pixel_clock_10kHz & 0xff;

	buf[1] = pixel_clock_10kHz >> 8;

	buf[2] = drm_mode_vrefresh(adj);
@@ -384,11 +385,6 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge, 


	mutex_lock(&sii902x->mutex);



	ret = regmap_update_bits(sii902x->regmap, SII902X_SYS_CTRL_DATA,

				 SII902X_SYS_CTRL_OUTPUT_MODE, output_mode);

	if (ret)

		goto out;



	ret = regmap_bulk_write(regmap, SII902X_TPI_VIDEO_DATA, buf, 10);

	if (ret)

		goto out;

drivers/gpu/drm/drm_fb_helper.c

+0 −14
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ 


#include <linux/console.h>

#include <linux/export.h>

#include <linux/pci.h>

#include <linux/sysrq.h>

#include <linux/vga_switcheroo.h>



#include <drm/drm_atomic.h>

#include <drm/drm_drv.h>
@@ -566,11 +564,6 @@ EXPORT_SYMBOL(drm_fb_helper_release_info); 
 */

void drm_fb_helper_unregister_info(struct drm_fb_helper *fb_helper)

{

	struct fb_info *info = fb_helper->info;

	struct device *dev = info->device;



	if (dev_is_pci(dev))

		vga_switcheroo_client_fb_set(to_pci_dev(dev), NULL);

	unregister_framebuffer(fb_helper->info);

}

EXPORT_SYMBOL(drm_fb_helper_unregister_info);
@@ -1632,7 +1625,6 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper) 
	struct drm_client_dev *client = &fb_helper->client;

	struct drm_device *dev = fb_helper->dev;

	struct drm_fb_helper_surface_size sizes;

	struct fb_info *info;

	int ret;



	if (drm_WARN_ON(dev, !dev->driver->fbdev_probe))
@@ -1653,12 +1645,6 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper) 


	strcpy(fb_helper->fb->comm, "[fbcon]");



	info = fb_helper->info;



	/* Set the fb info for vgaswitcheroo clients. Does nothing otherwise. */

	if (dev_is_pci(info->device))

		vga_switcheroo_client_fb_set(to_pci_dev(info->device), info);



	return 0;

}

drivers/gpu/drm/imagination/pvr_device.h

+8 −0
Original line number Diff line number Diff line
@@ -146,6 +146,14 @@ struct pvr_device { 
	 */

	struct clk *mem_clk;



	/**

	 * @power: Optional power domain devices.

	 *

	 * On platforms with more than one power domain for the GPU, they are

	 * stored here in @domain_devs, along with links between them in

	 * @domain_links. The size of @domain_devs is given by @domain_count,

	 * while the size of @domain_links is (2 * @domain_count) - 1.

	 */

	struct pvr_device_power {

		struct device **domain_devs;

		struct device_link **domain_links;

drivers/gpu/drm/sti/sti_vtg.c

+6 −1
Original line number Diff line number Diff line
@@ -143,12 +143,17 @@ struct sti_vtg { 
struct sti_vtg *of_vtg_find(struct device_node *np)

{

	struct platform_device *pdev;

	struct sti_vtg *vtg;



	pdev = of_find_device_by_node(np);

	if (!pdev)

		return NULL;



	return (struct sti_vtg *)platform_get_drvdata(pdev);

	vtg = platform_get_drvdata(pdev);



	put_device(&pdev->dev);



	return vtg;

}



static void vtg_reset(struct sti_vtg *vtg)

drivers/video/fbdev/core/fbcon.c

+9 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#include <linux/string.h>

#include <linux/kd.h>

#include <linux/panic.h>

#include <linux/pci.h>

#include <linux/printk.h>

#include <linux/slab.h>

#include <linux/fb.h>
@@ -78,6 +79,7 @@ 
#include <linux/interrupt.h>

#include <linux/crc32.h> /* For counting font checksums */

#include <linux/uaccess.h>

#include <linux/vga_switcheroo.h>

#include <asm/irq.h>



#include "fbcon.h"
@@ -2899,6 +2901,9 @@ void fbcon_fb_unregistered(struct fb_info *info) 


	console_lock();



	if (info->device && dev_is_pci(info->device))

		vga_switcheroo_client_fb_set(to_pci_dev(info->device), NULL);



	fbcon_registered_fb[info->node] = NULL;

	fbcon_num_registered_fb--;
@@ -3032,6 +3037,10 @@ static int do_fb_registered(struct fb_info *info) 
		}

	}



	/* Set the fb info for vga_switcheroo clients. Does nothing otherwise. */

	if (info->device && dev_is_pci(info->device))

		vga_switcheroo_client_fb_set(to_pci_dev(info->device), info);



	return ret;

}