Merge tag 'drm-misc-next-fixes-2019-06-27' of... (44c15367) · Commits · 戴 / test

Merge tag 'drm-misc-next-fixes-2019-06-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next drm-misc-next-fixes for v5.3: - Fixes to the tfp410 bridge. - Small build fix for vga_switcheroo to prevent building against modular fbcon. Signed-off-by:

Dave Airlie <airlied@redhat.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20a62234-bc27-00eb-e0e2-22b55eec1cb2@linux.intel.com

drivers/gpu/drm/bridge/ti-tfp410.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -70,7 +70,12 @@ static int tfp410_get_modes(struct drm_connector *connector)

		drm_connector_update_edid_property(connector, edid);

		return drm_add_edid_modes(connector, edid);
		ret = drm_add_edid_modes(connector, edid);

		kfree(edid);

		return ret;

		fallback:
		/* No EDID, fallback on the XGA standard modes */
		ret = drm_add_modes_noedid(connector, 1920, 1200);
		@@ -376,6 +381,7 @@ static int tfp410_fini(struct device *dev)
		{
		struct tfp410 *dvi = dev_get_drvdata(dev);

		if (dvi->hpd_irq >= 0)
		cancel_delayed_work_sync(&dvi->hpd_work);

		drm_bridge_remove(&dvi->bridge);

drivers/gpu/vga/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ config VGA_SWITCHEROO
		depends on X86
		depends on ACPI
		depends on PCI
		depends on (FRAMEBUFFER_CONSOLE=n \|\| FB=y)
		select VGA_ARB
		help
		Many laptops released in 2008/9/10 have two GPUs with a multiplexer

Admin message