hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'acpica', 'acpi-ec', 'acpi-pmic' and 'acpi-video' 

Merge assorted fixes and cleanups and one new backlight quirk list
item for 5.16-rc1.

* acpica:
  ACPI: Drop ACPI_USE_BUILTIN_STDARG ifdef from acgcc.h

* acpi-ec:
  ACPI: EC: Remove initialization of static variables to false
  ACPI: EC: Use ec_no_wakeup on HP ZHAN 66 Pro

* acpi-pmic:
  ACPI: PMIC: Fix intel_pmic_regs_handler() read accesses

* acpi-video:
  ACPI: video: use platform backlight driver on Xiaomi Mi Pad 2
  ACPI: video: Drop dmi_system_id.ident settings from video_detect_dmi_table[]
This commit is contained in:
Rafael J. Wysocki 2021-11-10 14:03:14 +01:00
parent 2c49dabad8 63b0a7b16f 69cace6e18 009a789443 60e6655f0a
commit 314c6e2b45
4 changed files with 80 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/ec.c
View File

@ -133,7 +133,7 @@ static unsigned int ec_storm_threshold __read_mostly = 8;
module_param(ec_storm_threshold, uint, 0644); module_param(ec_storm_threshold, uint, 0644);
MODULE_PARM_DESC(ec_storm_threshold, "Maxim false GPE numbers not considered as GPE storm"); MODULE_PARM_DESC(ec_storm_threshold, "Maxim false GPE numbers not considered as GPE storm");
static bool ec_freeze_events __read_mostly = false; static bool ec_freeze_events __read_mostly;
module_param(ec_freeze_events, bool, 0644); module_param(ec_freeze_events, bool, 0644);
MODULE_PARM_DESC(ec_freeze_events, "Disabling event handling during suspend/resume"); MODULE_PARM_DESC(ec_freeze_events, "Disabling event handling during suspend/resume");
@ -177,7 +177,7 @@ struct acpi_ec *first_ec;
EXPORT_SYMBOL(first_ec); EXPORT_SYMBOL(first_ec);
static struct acpi_ec *boot_ec; static struct acpi_ec *boot_ec;
static bool boot_ec_is_ecdt = false; static bool boot_ec_is_ecdt;
static struct workqueue_struct *ec_wq; static struct workqueue_struct *ec_wq;
static struct workqueue_struct *ec_query_wq; static struct workqueue_struct *ec_query_wq;
@ -2152,6 +2152,13 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = {
DMI_MATCH(DMI_PRODUCT_FAMILY, "ThinkPad X1 Yoga 3rd"), DMI_MATCH(DMI_PRODUCT_FAMILY, "ThinkPad X1 Yoga 3rd"),
}, },
}, },
{
.ident = "HP ZHAN 66 Pro",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "HP"),
DMI_MATCH(DMI_PRODUCT_FAMILY, "103C_5336AN HP ZHAN 66 Pro"),
},
},
{ }, { },
}; };

51
drivers/acpi/pmic/intel_pmic.c
View File

@ -211,31 +211,36 @@ static acpi_status intel_pmic_regs_handler(u32 function,
void *handler_context, void *region_context) void *handler_context, void *region_context)
{ {
struct intel_pmic_opregion *opregion = region_context; struct intel_pmic_opregion *opregion = region_context;
int result = 0; int result = -EINVAL;
switch (address) { if (function == ACPI_WRITE) {
case 0: switch (address) {
return AE_OK; case 0:
case 1: return AE_OK;
opregion->ctx.addr |= (*value64 & 0xff) << 8; case 1:
return AE_OK; opregion->ctx.addr |= (*value64 & 0xff) << 8;
case 2: return AE_OK;
opregion->ctx.addr |= *value64 & 0xff; case 2:
return AE_OK; opregion->ctx.addr |= *value64 & 0xff;
case 3: return AE_OK;
opregion->ctx.val = *value64 & 0xff; case 3:
return AE_OK; opregion->ctx.val = *value64 & 0xff;
case 4: return AE_OK;
if (*value64) { case 4:
result = regmap_write(opregion->regmap, opregion->ctx.addr, if (*value64) {
opregion->ctx.val); result = regmap_write(opregion->regmap, opregion->ctx.addr,
} else { opregion->ctx.val);
result = regmap_read(opregion->regmap, opregion->ctx.addr, } else {
&opregion->ctx.val); result = regmap_read(opregion->regmap, opregion->ctx.addr,
if (result == 0) &opregion->ctx.val);
*value64 = opregion->ctx.val; }
opregion->ctx.addr = 0;
} }
memset(&opregion->ctx, 0x00, sizeof(opregion->ctx)); }
if (function == ACPI_READ && address == 3) {
*value64 = opregion->ctx.val;
return AE_OK;
} }
if (result < 0) { if (result < 0) {

78
drivers/acpi/video_detect.c
View File

@ -115,7 +115,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
*/ */
{ {
.callback = video_detect_force_vendor, .callback = video_detect_force_vendor,
.ident = "X360", /* X360 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, "X360"), DMI_MATCH(DMI_PRODUCT_NAME, "X360"),
@ -124,7 +124,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_vendor, .callback = video_detect_force_vendor,
.ident = "Asus UL30VT", /* Asus UL30VT */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "UL30VT"), DMI_MATCH(DMI_PRODUCT_NAME, "UL30VT"),
@ -132,7 +132,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_vendor, .callback = video_detect_force_vendor,
.ident = "Asus UL30A", /* Asus UL30A */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "UL30A"), DMI_MATCH(DMI_PRODUCT_NAME, "UL30A"),
@ -140,7 +140,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_vendor, .callback = video_detect_force_vendor,
.ident = "GIGABYTE GB-BXBT-2807", /* GIGABYTE GB-BXBT-2807 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"),
DMI_MATCH(DMI_PRODUCT_NAME, "GB-BXBT-2807"), DMI_MATCH(DMI_PRODUCT_NAME, "GB-BXBT-2807"),
@ -148,12 +148,20 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_vendor, .callback = video_detect_force_vendor,
.ident = "Sony VPCEH3U1E", /* Sony VPCEH3U1E */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
DMI_MATCH(DMI_PRODUCT_NAME, "VPCEH3U1E"), DMI_MATCH(DMI_PRODUCT_NAME, "VPCEH3U1E"),
}, },
}, },
{
.callback = video_detect_force_vendor,
/* Xiaomi Mi Pad 2 */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Xiaomi Inc"),
DMI_MATCH(DMI_PRODUCT_NAME, "Mipad2"),
},
},
/* /*
* These models have a working acpi_video backlight control, and using * These models have a working acpi_video backlight control, and using
@ -164,7 +172,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
*/ */
{ {
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "ThinkPad T420", /* ThinkPad T420 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T420"), DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T420"),
@ -172,7 +180,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "ThinkPad T520", /* ThinkPad T520 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T520"), DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T520"),
@ -180,7 +188,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "ThinkPad X201s", /* ThinkPad X201s */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"), DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),
@ -188,7 +196,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "ThinkPad X201T", /* ThinkPad X201T */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201T"), DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201T"),
@ -199,7 +207,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugs.freedesktop.org/show_bug.cgi?id=81515 */ /* https://bugs.freedesktop.org/show_bug.cgi?id=81515 */
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "HP ENVY 15 Notebook", /* HP ENVY 15 Notebook */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"), DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),
@ -207,7 +215,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "SAMSUNG 870Z5E/880Z5E/680Z5E", /* SAMSUNG 870Z5E/880Z5E/680Z5E */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, "870Z5E/880Z5E/680Z5E"), DMI_MATCH(DMI_PRODUCT_NAME, "870Z5E/880Z5E/680Z5E"),
@ -215,7 +223,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "SAMSUNG 370R4E/370R4V/370R5E/3570RE/370R5V", /* SAMSUNG 370R4E/370R4V/370R5E/3570RE/370R5V */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, DMI_MATCH(DMI_PRODUCT_NAME,
@ -225,7 +233,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1186097 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1186097 */
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "SAMSUNG 3570R/370R/470R/450R/510R/4450RV", /* SAMSUNG 3570R/370R/470R/450R/510R/4450RV */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, DMI_MATCH(DMI_PRODUCT_NAME,
@ -235,7 +243,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1557060 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1557060 */
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "SAMSUNG 670Z5E", /* SAMSUNG 670Z5E */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, "670Z5E"), DMI_MATCH(DMI_PRODUCT_NAME, "670Z5E"),
@ -244,7 +252,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1094948 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1094948 */
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "SAMSUNG 730U3E/740U3E", /* SAMSUNG 730U3E/740U3E */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, "730U3E/740U3E"), DMI_MATCH(DMI_PRODUCT_NAME, "730U3E/740U3E"),
@ -253,7 +261,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugs.freedesktop.org/show_bug.cgi?id=87286 */ /* https://bugs.freedesktop.org/show_bug.cgi?id=87286 */
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "SAMSUNG 900X3C/900X3D/900X3E/900X4C/900X4D", /* SAMSUNG 900X3C/900X3D/900X3E/900X4C/900X4D */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, DMI_MATCH(DMI_PRODUCT_NAME,
@ -263,7 +271,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1272633 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1272633 */
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "Dell XPS14 L421X", /* Dell XPS14 L421X */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"), DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"),
@ -272,7 +280,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1163574 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1163574 */
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "Dell XPS15 L521X", /* Dell XPS15 L521X */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "XPS L521X"), DMI_MATCH(DMI_PRODUCT_NAME, "XPS L521X"),
@ -281,7 +289,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.kernel.org/show_bug.cgi?id=108971 */ /* https://bugzilla.kernel.org/show_bug.cgi?id=108971 */
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "SAMSUNG 530U4E/540U4E", /* SAMSUNG 530U4E/540U4E */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
DMI_MATCH(DMI_PRODUCT_NAME, "530U4E/540U4E"), DMI_MATCH(DMI_PRODUCT_NAME, "530U4E/540U4E"),
@ -290,7 +298,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
/* https://bugs.launchpad.net/bugs/1894667 */ /* https://bugs.launchpad.net/bugs/1894667 */
{ {
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "HP 635 Notebook", /* HP 635 Notebook */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
DMI_MATCH(DMI_PRODUCT_NAME, "HP 635 Notebook PC"), DMI_MATCH(DMI_PRODUCT_NAME, "HP 635 Notebook PC"),
@ -301,7 +309,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1201530 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1201530 */
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Lenovo Ideapad S405", /* Lenovo Ideapad S405 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_BOARD_NAME, "Lenovo IdeaPad S405"), DMI_MATCH(DMI_BOARD_NAME, "Lenovo IdeaPad S405"),
@ -310,7 +318,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1187004 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1187004 */
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Lenovo Ideapad Z570", /* Lenovo Ideapad Z570 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_NAME, "102434U"), DMI_MATCH(DMI_PRODUCT_NAME, "102434U"),
@ -318,7 +326,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Lenovo E41-25", /* Lenovo E41-25 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_NAME, "81FS"), DMI_MATCH(DMI_PRODUCT_NAME, "81FS"),
@ -326,7 +334,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Lenovo E41-45", /* Lenovo E41-45 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_NAME, "82BK"), DMI_MATCH(DMI_PRODUCT_NAME, "82BK"),
@ -335,7 +343,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1217249 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1217249 */
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Apple MacBook Pro 12,1", /* Apple MacBook Pro 12,1 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."), DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro12,1"), DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro12,1"),
@ -343,7 +351,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Dell Vostro V131", /* Dell Vostro V131 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"), DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),
@ -352,7 +360,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.redhat.com/show_bug.cgi?id=1123661 */ /* https://bugzilla.redhat.com/show_bug.cgi?id=1123661 */
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Dell XPS 17 L702X", /* Dell XPS 17 L702X */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "Dell System XPS L702X"), DMI_MATCH(DMI_PRODUCT_NAME, "Dell System XPS L702X"),
@ -360,7 +368,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Dell Precision 7510", /* Dell Precision 7510 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"), DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"),
@ -368,7 +376,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Acer Aspire 5738z", /* Acer Aspire 5738z */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Acer"), DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
@ -378,7 +386,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
{ {
/* https://bugzilla.kernel.org/show_bug.cgi?id=207835 */ /* https://bugzilla.kernel.org/show_bug.cgi?id=207835 */
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "Acer TravelMate 5735Z", /* Acer TravelMate 5735Z */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Acer"), DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5735Z"), DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5735Z"),
@ -387,7 +395,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "ASUSTeK COMPUTER INC. GA401", /* ASUSTeK COMPUTER INC. GA401 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA401"), DMI_MATCH(DMI_PRODUCT_NAME, "GA401"),
@ -395,7 +403,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "ASUSTeK COMPUTER INC. GA502", /* ASUSTeK COMPUTER INC. GA502 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA502"), DMI_MATCH(DMI_PRODUCT_NAME, "GA502"),
@ -403,7 +411,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_native, .callback = video_detect_force_native,
.ident = "ASUSTeK COMPUTER INC. GA503", /* ASUSTeK COMPUTER INC. GA503 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_PRODUCT_NAME, "GA503"), DMI_MATCH(DMI_PRODUCT_NAME, "GA503"),
@ -416,7 +424,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
*/ */
{ {
.callback = video_detect_force_none, .callback = video_detect_force_none,
.ident = "Dell OptiPlex 9020M", /* Dell OptiPlex 9020M */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 9020M"), DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 9020M"),
@ -424,7 +432,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
}, },
{ {
.callback = video_detect_force_none, .callback = video_detect_force_none,
.ident = "MSI MS-7721", /* MSI MS-7721 */
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "MSI"), DMI_MATCH(DMI_SYS_VENDOR, "MSI"),
DMI_MATCH(DMI_PRODUCT_NAME, "MS-7721"), DMI_MATCH(DMI_PRODUCT_NAME, "MS-7721"),

13
include/acpi/platform/acgcc.h
View File

@ -10,25 +10,12 @@
#ifndef __ACGCC_H__ #ifndef __ACGCC_H__
#define __ACGCC_H__ #define __ACGCC_H__
/*
* Use compiler specific <stdarg.h> is a good practice for even when
* -nostdinc is specified (i.e., ACPI_USE_STANDARD_HEADERS undefined.
*/
#ifndef va_arg #ifndef va_arg
#ifdef ACPI_USE_BUILTIN_STDARG
typedef __builtin_va_list va_list;
#define va_start(v, l) __builtin_va_start(v, l)
#define va_end(v) __builtin_va_end(v)
#define va_arg(v, l) __builtin_va_arg(v, l)
#define va_copy(d, s) __builtin_va_copy(d, s)
#else
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/stdarg.h> #include <linux/stdarg.h>
#else #else
/* Used to build acpi tools */
#include <stdarg.h> #include <stdarg.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* ACPI_USE_BUILTIN_STDARG */
#endif /* ! va_arg */ #endif /* ! va_arg */
#define ACPI_INLINE __inline__ #define ACPI_INLINE __inline__