sync with OpenBSD -current
This commit is contained in:
parent
3b22df548f
commit
32e75f5310
GPG key ID:
F42C07F07E2E35B7
36 changed files with 465 additions and 1000 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: intelpmc.c,v 1.2 2024/08/08 07:01:22 kettenis Exp $ */
|
||||
/* $OpenBSD: intelpmc.c,v 1.3 2024/08/08 18:46:13 kettenis Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2024 Mark Kettenis <kettenis@openbsd.org>
|
||||
*
|
||||
|
|
@ -278,7 +278,7 @@ intelpmc_suspend(void *cookie)
|
|||
acpi_gasio(sc->sc_acpi, ACPI_IOREAD,
|
||||
sc->sc_counter[i].address_space_id,
|
||||
sc->sc_counter[i].address,
|
||||
(1 << sc->sc_counter[i].access_size),
|
||||
(1 << (sc->sc_counter[i].access_size - 1)),
|
||||
sc->sc_counter[i].register_bit_width / 8,
|
||||
&sc->sc_lpit[i][0]);
|
||||
}
|
||||
|
|
@ -321,7 +321,7 @@ intelpmc_resume(void *cookie)
|
|||
acpi_gasio(sc->sc_acpi, ACPI_IOREAD,
|
||||
sc->sc_counter[i].address_space_id,
|
||||
sc->sc_counter[i].address,
|
||||
(1 << sc->sc_counter[i].access_size),
|
||||
(1 << (sc->sc_counter[i].access_size - 1)),
|
||||
sc->sc_counter[i].register_bit_width / 8,
|
||||
&sc->sc_lpit[i][1]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,9 +201,15 @@ static const struct pci_matchid amdgpu_devices[] = {
|
|||
{0x1002, 0x1435 }, /* Custom GPU 0932 */
|
||||
{0x1002, 0x163f }, /* Custom GPU 0405 */
|
||||
|
||||
/* GC 10.3.6, DCN 3.1.5, APU, Ryzen 7000 "Raphael" */
|
||||
/*
|
||||
* GC 10.3.6, DCN 3.1.5, APU, Ryzen 7000 "Raphael"
|
||||
* GC 10.3.6, DCN 3.1.5, APU, Ryzen 7045 "Dragon Range"
|
||||
*/
|
||||
{0x1002, 0x164e }, /* Radeon 610M */
|
||||
|
||||
/* GC 10.3.6, DCN 3.1.5, APU, Ryzen 9000 "Granite Ridge" */
|
||||
{0x1002, 0x13c0 }, /* Radeon Graphics */
|
||||
|
||||
/* GC 10.3.7, DCN 3.1.6, APU, Ryzen 7020 "Mendocino" */
|
||||
{0x1002, 0x1506 }, /* Radeon 610M */
|
||||
|
||||
|
|
|
|||
|
|
@ -2301,13 +2301,18 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux)
|
|||
|
||||
/* Device parameters start as a copy of module parameters. */
|
||||
i915_params_copy(&dev_priv->params, &i915_modparams);
|
||||
dev_priv->params.enable_guc = 0;
|
||||
dev_priv->params.request_timeout_ms = 0;
|
||||
dev_priv->params.enable_psr = 0;
|
||||
|
||||
/* Set up device info and initial runtime info. */
|
||||
intel_device_info_driver_create(dev_priv, dev->pdev->device, info);
|
||||
|
||||
/* uc_expand_default_options() with no GuC submission */
|
||||
if (GRAPHICS_VER(dev_priv) >= 12 &&
|
||||
!IS_TIGERLAKE(dev_priv) && !IS_ROCKETLAKE(dev_priv) &&
|
||||
!IS_XEHPSDV(dev_priv) && !IS_PONTEVECCHIO(dev_priv))
|
||||
dev_priv->params.enable_guc = ENABLE_GUC_LOAD_HUC;
|
||||
|
||||
mmio_bar = (GRAPHICS_VER(dev_priv) == 2) ? 0x14 : 0x10;
|
||||
|
||||
/* from intel_uncore_setup_mmio() */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2081 2024/08/07 06:48:55 jsg Exp $
|
||||
$OpenBSD: pcidevs,v 1.2082 2024/08/09 01:50:16 jsg Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -1333,6 +1333,7 @@ product ATI KAVERI_19 0x1318 Kaveri Radeon R5
|
|||
product ATI KAVERI_20 0x131b Kaveri Radeon R4
|
||||
product ATI KAVERI_21 0x131c Kaveri Radeon R7
|
||||
product ATI KAVERI_22 0x131d Kaveri Radeon R6
|
||||
product ATI GRANITE_RIDGE 0x13c0 Granite Ridge
|
||||
product ATI CYAN_SKILLFISH_1 0x13fe Cyan Skillfish
|
||||
product ATI VANGOGH_0932 0x1435 Van Gogh
|
||||
product ATI CYAN_SKILLFISH_2 0x143f Cyan Skillfish
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2081 2024/08/07 06:48:55 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2082 2024/08/09 01:50:16 jsg Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -1338,6 +1338,7 @@
|
|||
#define PCI_PRODUCT_ATI_KAVERI_20 0x131b /* Kaveri Radeon R4 */
|
||||
#define PCI_PRODUCT_ATI_KAVERI_21 0x131c /* Kaveri Radeon R7 */
|
||||
#define PCI_PRODUCT_ATI_KAVERI_22 0x131d /* Kaveri Radeon R6 */
|
||||
#define PCI_PRODUCT_ATI_GRANITE_RIDGE 0x13c0 /* Granite Ridge */
|
||||
#define PCI_PRODUCT_ATI_CYAN_SKILLFISH_1 0x13fe /* Cyan Skillfish */
|
||||
#define PCI_PRODUCT_ATI_VANGOGH_0932 0x1435 /* Van Gogh */
|
||||
#define PCI_PRODUCT_ATI_CYAN_SKILLFISH_2 0x143f /* Cyan Skillfish */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2081 2024/08/07 06:48:55 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2082 2024/08/09 01:50:16 jsg Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -3459,6 +3459,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_KAVERI_22,
|
||||
"Kaveri Radeon R6",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_GRANITE_RIDGE,
|
||||
"Granite Ridge",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_CYAN_SKILLFISH_1,
|
||||
"Cyan Skillfish",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue