sync with OpenBSD -current

This commit is contained in:
purplerain 2024-08-10 04:57:45 +00:00
parent 3b22df548f
commit 32e75f5310
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
36 changed files with 465 additions and 1000 deletions

View file

@ -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 */

View file

@ -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() */