sync with OpenBSD -current
This commit is contained in:
parent
9d1bed226b
commit
569ffd723a
GPG key ID:
F42C07F07E2E35B7
17 changed files with 59 additions and 43 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: acpi_x86.c,v 1.31 2024/08/31 15:53:44 deraadt Exp $ */
|
||||
/* $OpenBSD: acpi_x86.c,v 1.32 2024/09/21 19:06:06 deraadt Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
|
||||
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
|
||||
|
|
@ -32,12 +32,13 @@ sleep_showstate(void *v, int sleepmode)
|
|||
{
|
||||
struct acpi_softc *sc = v;
|
||||
int fallback_state = -1;
|
||||
extern int lid_action;
|
||||
|
||||
switch (sleepmode) {
|
||||
case SLEEP_SUSPEND:
|
||||
sc->sc_state = ACPI_STATE_S3;
|
||||
#ifdef __amd64__
|
||||
if (sc->sc_fadt->flags & FADT_POWER_S0_IDLE_CAPABLE)
|
||||
if (lid_action == -1)
|
||||
sc->sc_state = ACPI_STATE_S0;
|
||||
fallback_state = ACPI_STATE_S0; /* No S3, use S0 */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: acpibtn.c,v 1.53 2024/08/06 17:38:56 kettenis Exp $ */
|
||||
/* $OpenBSD: acpibtn.c,v 1.54 2024/09/21 19:06:06 deraadt Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
|
||||
*
|
||||
|
|
@ -254,6 +254,7 @@ acpibtn_notify(struct aml_node *node, int notify_type, void *arg)
|
|||
|
||||
switch (lid_action) {
|
||||
case 1:
|
||||
case -1:
|
||||
goto sleep;
|
||||
#ifdef HIBERNATE
|
||||
case 2:
|
||||
|
|
|
|||
|
|
@ -230,8 +230,11 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
7600, 7600 XT, Pro W7600 */
|
||||
{0x1002, 0x7483 }, /* Radeon RX 7600M */
|
||||
{0x1002, 0x7489 }, /* Radeon Pro W7500 */
|
||||
{0x1002, 0x7499 }, /* Radeon RX 7300, 7400, Pro W7400 */
|
||||
|
||||
/* GC 11.0.3, DCN 3.2.0, dGPU, "Navi 32" */
|
||||
{0x1002, 0x7460 }, /* Radeon Pro V710 */
|
||||
{0x1002, 0x7461 }, /* Radeon Pro V710 */
|
||||
{0x1002, 0x7470 }, /* Radeon Pro W7700 */
|
||||
{0x1002, 0x747e }, /* Radeon RX 7700 XT, 7800 XT */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2089 2024/09/06 03:48:20 jsg Exp $
|
||||
$OpenBSD: pcidevs,v 1.2090 2024/09/23 03:59:03 jsg Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -2166,11 +2166,14 @@ product ATI NAVI31_2 0x7448 Navi 31
|
|||
product ATI NAVI31_4 0x744a Navi 31
|
||||
product ATI NAVI31_1 0x744c Navi 31
|
||||
product ATI NAVI31_3 0x745e Navi 31
|
||||
product ATI NAVI32_3 0x7460 Navi 32
|
||||
product ATI NAVI32_4 0x7461 Navi 32
|
||||
product ATI NAVI32_1 0x7470 Navi 32
|
||||
product ATI NAVI32_2 0x747e Navi 32
|
||||
product ATI NAVI33_1 0x7480 Navi 33
|
||||
product ATI NAVI33_2 0x7483 Navi 33
|
||||
product ATI NAVI33_3 0x7489 Navi 33
|
||||
product ATI NAVI33_4 0x7499 Navi 33
|
||||
product ATI MI300A 0x74a0 MI300A
|
||||
product ATI MI300X 0x74a1 MI300X
|
||||
product ATI RADEON_9000IGP 0x7834 Radeon 9000/9100 IGP
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2089 2024/09/06 03:48:20 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2090 2024/09/23 03:59:03 jsg Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -2171,11 +2171,14 @@
|
|||
#define PCI_PRODUCT_ATI_NAVI31_4 0x744a /* Navi 31 */
|
||||
#define PCI_PRODUCT_ATI_NAVI31_1 0x744c /* Navi 31 */
|
||||
#define PCI_PRODUCT_ATI_NAVI31_3 0x745e /* Navi 31 */
|
||||
#define PCI_PRODUCT_ATI_NAVI32_3 0x7460 /* Navi 32 */
|
||||
#define PCI_PRODUCT_ATI_NAVI32_4 0x7461 /* Navi 32 */
|
||||
#define PCI_PRODUCT_ATI_NAVI32_1 0x7470 /* Navi 32 */
|
||||
#define PCI_PRODUCT_ATI_NAVI32_2 0x747e /* Navi 32 */
|
||||
#define PCI_PRODUCT_ATI_NAVI33_1 0x7480 /* Navi 33 */
|
||||
#define PCI_PRODUCT_ATI_NAVI33_2 0x7483 /* Navi 33 */
|
||||
#define PCI_PRODUCT_ATI_NAVI33_3 0x7489 /* Navi 33 */
|
||||
#define PCI_PRODUCT_ATI_NAVI33_4 0x7499 /* Navi 33 */
|
||||
#define PCI_PRODUCT_ATI_MI300A 0x74a0 /* MI300A */
|
||||
#define PCI_PRODUCT_ATI_MI300X 0x74a1 /* MI300X */
|
||||
#define PCI_PRODUCT_ATI_RADEON_9000IGP 0x7834 /* Radeon 9000/9100 IGP */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2089 2024/09/06 03:48:20 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2090 2024/09/23 03:59:03 jsg Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -6791,6 +6791,14 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI31_3,
|
||||
"Navi 31",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_3,
|
||||
"Navi 32",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_4,
|
||||
"Navi 32",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_1,
|
||||
"Navi 32",
|
||||
|
|
@ -6811,6 +6819,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI33_3,
|
||||
"Navi 33",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI33_4,
|
||||
"Navi 33",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MI300A,
|
||||
"MI300A",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue