Commit 862aecd1 authored by jan.koester's avatar jan.koester
Browse files

some fixes

parent 1d9009f0

drivers/acpi/video_detect.c

+12 −80
Original line number Diff line number Diff line
@@ -118,6 +118,18 @@ static int video_detect_force_vendor(const struct dmi_system_id *d) 
	return 0;

}



static int video_detect_force_video(const struct dmi_system_id *d)

{

	acpi_backlight_dmi = acpi_backlight_video;

	return 0;

}



static int video_detect_force_native(const struct dmi_system_id *d)

{

	acpi_backlight_dmi = acpi_backlight_native;

	return 0;

}



static int video_detect_portege_r100(const struct dmi_system_id *d)

{

	struct pci_dev *dev;
@@ -284,86 +296,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		},

	},



	/*

	 * Toshiba Portégé R100 has working both acpi_video and toshiba_acpi

	 * vendor driver. But none of them gets activated as it has a VGA with

	 * no kernel driver (Trident CyberBlade XP4m32).

	 * The DMI strings are generic so check for the VGA chip in callback.

	 */

	{

	 .callback = video_detect_portege_r100,

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),

		DMI_MATCH(DMI_BOARD_NAME, "Portable PC")

		},

	},



	/*

	 * Toshiba Portégé R100 has working both acpi_video and toshiba_acpi

	 * vendor driver. But none of them gets activated as it has a VGA with

	 * no kernel driver (Trident CyberBlade XP4m32).

	 * The DMI strings are generic so check for the VGA chip in callback.

	 */

	{

	 .callback = video_detect_portege_r100,

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),

		DMI_MATCH(DMI_BOARD_NAME, "Portable PC")

		},

	},



	/*

	 * Toshiba Portégé R100 has working both acpi_video and toshiba_acpi

	 * vendor driver. But none of them gets activated as it has a VGA with

	 * no kernel driver (Trident CyberBlade XP4m32).

	 * The DMI strings are generic so check for the VGA chip in callback.

	 */

	{

	 .callback = video_detect_portege_r100,

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),

		DMI_MATCH(DMI_BOARD_NAME, "Portable PC")

		},

	},



	/*

	 * Toshiba Portégé R100 has working both acpi_video and toshiba_acpi

	 * vendor driver. But none of them gets activated as it has a VGA with

	 * no kernel driver (Trident CyberBlade XP4m32).

	 * The DMI strings are generic so check for the VGA chip in callback.

	 */

	{

	 .callback = video_detect_portege_r100,

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),

		DMI_MATCH(DMI_BOARD_NAME, "Portable PC")

		},

	},



	/*

	 * Toshiba Portégé R100 has working both acpi_video and toshiba_acpi

	 * vendor driver. But none of them gets activated as it has a VGA with

	 * no kernel driver (Trident CyberBlade XP4m32).

	 * The DMI strings are generic so check for the VGA chip in callback.

	 */

	{

	 .callback = video_detect_portege_r100,

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),

		DMI_MATCH(DMI_BOARD_NAME, "Portable PC")

		},

	},



	/*

	 * Models which need acpi_video backlight control where the GPU drivers

	 * do not call acpi_video_register_backlight() because no internal panel