diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2233-drm-amdgpu-discovery-add-module-param-for-ip-discove.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2233-drm-amdgpu-discovery-add-module-param-for-ip-discove.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2233-drm-amdgpu-discovery-add-module-param-for-ip-discove.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2233-drm-amdgpu-discovery-add-module-param-for-ip-discove.patch new file mode 100644 index 00000000..b736622a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2233-drm-amdgpu-discovery-add-module-param-for-ip-discove.patch @@ -0,0 +1,81 @@ +From 67bccfb07fb96ba67494f2e8ee852752e4808efb Mon Sep 17 00:00:00 2001 +From: Xiaojie Yuan <xiaojie.yuan@amd.com> +Date: Wed, 27 Mar 2019 12:39:18 +0800 +Subject: [PATCH 2233/2940] drm/amdgpu/discovery: add module param for ip + discovery enablement + +Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com> +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +++++ + 3 files changed, 16 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index e6597318cc30..b187c052117d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -164,6 +164,7 @@ extern int amdgpu_ras_enable; + extern uint amdgpu_ras_mask; + extern int amdgpu_async_gfx_ring; + extern int amdgpu_mcbp; ++extern int amdgpu_discovery; + + #ifdef CONFIG_DRM_AMDGPU_SI + extern int amdgpu_si_support; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 73d1f84640f1..5c46c150a962 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -2566,6 +2566,14 @@ int amdgpu_device_init(struct amdgpu_device *adev, + if (amdgpu_mcbp) + DRM_INFO("MCBP is enabled\n"); + ++ if (amdgpu_discovery) { ++ r = amdgpu_discovery_init(adev); ++ if (r) { ++ dev_err(adev->dev, "amdgpu_discovery_init failed\n"); ++ return r; ++ } ++ } ++ + /* early init functions */ + r = amdgpu_device_ip_early_init(adev); + if (r) +@@ -2842,6 +2850,8 @@ void amdgpu_device_fini(struct amdgpu_device *adev) + device_remove_file(adev->dev, &dev_attr_pcie_replay_count); + amdgpu_ucode_sysfs_fini(adev); + amdgpu_debugfs_preempt_cleanup(adev); ++ if (amdgpu_discovery) ++ amdgpu_discovery_fini(adev); + } + + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index 93afc2f1c5e4..8fa4d0437212 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -143,6 +143,7 @@ uint amdgpu_smu_memory_pool_size = 0; + uint amdgpu_dc_feature_mask = 0; + int amdgpu_async_gfx_ring = 1; + int amdgpu_mcbp = 0; ++int amdgpu_discovery = 0; + + struct amdgpu_mgpu_info mgpu_info = { + .mutex = __MUTEX_INITIALIZER(mgpu_info.mutex), +@@ -591,6 +592,10 @@ MODULE_PARM_DESC(mcbp, + "Enable Mid-command buffer preemption (0 = disabled (default), 1 = enabled)"); + module_param_named(mcbp, amdgpu_mcbp, int, 0444); + ++MODULE_PARM_DESC(discovery, ++ "Allow driver to discover hardware IPs from IP Discovery table at the top of VRAM"); ++module_param_named(discovery, amdgpu_discovery, int, 0444); ++ + /** + * DOC: dcfeaturemask (uint) + * Override display features enabled. See enum DC_FEATURE_MASK in drivers/gpu/drm/amd/include/amd_shared.h. +-- +2.17.1 + |