Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0544edfd authored by Thomas Bächler's avatar Thomas Bächler Committed by Eric Anholt
Browse files

gpu/drm/i915: Add a blacklist to omit modeset on LID open 

On some machines (currently only the Toshiba Tecra A11 is known), the GPU
locks up when modeset is forced on LID open. This patch adds a new DMI
blacklist and omits modesetting for all matches.

Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15550



Signed-off-by: default avatarThomas Bächler <thomas@archlinux.org>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent d6486813

drivers/gpu/drm/i915/intel_lvds.c

+23 −0
Original line number Diff line number Diff line
@@ -599,6 +599,26 @@ static int intel_lvds_get_modes(struct drm_connector *connector) 
	return 0;

}



static int intel_no_modeset_on_lid_dmi_callback(const struct dmi_system_id *id)

{

	DRM_DEBUG_KMS("Skipping forced modeset for %s\n", id->ident);

	return 1;

}



/* The GPU hangs up on these systems if modeset is performed on LID open */

static const struct dmi_system_id intel_no_modeset_on_lid[] = {

	{

		.callback = intel_no_modeset_on_lid_dmi_callback,

		.ident = "Toshiba Tecra A11",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

			DMI_MATCH(DMI_PRODUCT_NAME, "TECRA A11"),

		},

	},



	{ }	/* terminating entry */

};



/*

 * Lid events. Note the use of 'modeset_on_lid':

 *  - we set it on lid close, and reset it on open
@@ -622,6 +642,9 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, 
	 */

	if (connector)

		connector->status = connector->funcs->detect(connector);

	/* Don't force modeset on machines where it causes a GPU lockup */

	if (dmi_check_system(intel_no_modeset_on_lid))

		return NOTIFY_OK;

	if (!acpi_lid_open()) {

		dev_priv->modeset_on_lid = 1;

		return NOTIFY_OK;