diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3528-drm-amdgpu-Basic-emulation-support.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3528-drm-amdgpu-Basic-emulation-support.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3528-drm-amdgpu-Basic-emulation-support.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3528-drm-amdgpu-Basic-emulation-support.patch new file mode 100644 index 00000000..ffe5eaac --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3528-drm-amdgpu-Basic-emulation-support.patch @@ -0,0 +1,86 @@ +From 98d2f11975a8c7465a967fc9d3bd9d06a463786c Mon Sep 17 00:00:00 2001 +From: Shaoyun Liu <Shaoyun.Liu@amd.com> +Date: Thu, 1 Feb 2018 17:37:50 -0500 +Subject: [PATCH 3528/4131] drm/amdgpu: Basic emulation support + +Add amdgpu_emu_mode module parameter to control the emulation mode +Avoid vbios operation on emulation since there is no vbios post duirng emulation, +use the common hw_init to simulate the post + +Signed-off-by: Shaoyun Liu <Shaoyun.Liu@amd.com> +Acked-By: Alex Deucher <alexander.deucher@amd.com> +Acked-By: Christian Konig <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 08f7b78..1aab1a3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1336,6 +1336,20 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) + return r; + } + adev->ip_blocks[i].status.sw = true; ++ ++ if (amdgpu_emu_mode == 1) { ++ /* Need to do common hw init first on emulation */ ++ if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON) { ++ r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev); ++ if (r) { ++ DRM_ERROR("hw_init of IP block <%s> failed %d\n", ++ adev->ip_blocks[i].version->funcs->name, r); ++ return r; ++ } ++ adev->ip_blocks[i].status.hw = true; ++ } ++ } ++ + /* need to do gmc hw init early so we can allocate gpu mem */ + if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) { + r = amdgpu_device_vram_scratch_init(adev); +@@ -1369,8 +1383,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) + for (i = 0; i < adev->num_ip_blocks; i++) { + if (!adev->ip_blocks[i].status.sw) + continue; +- /* gmc hw init is done early */ +- if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) ++ if (adev->ip_blocks[i].status.hw) + continue; + r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev); + if (r) { +@@ -1914,6 +1927,9 @@ int amdgpu_device_init(struct amdgpu_device *adev, + if (runtime) + vga_switcheroo_init_domain_pm_ops(adev->dev, &adev->vga_pm_domain); + ++ if (amdgpu_emu_mode == 1) ++ goto fence_driver_init; ++ + /* Read BIOS */ + if (!amdgpu_get_bios(adev)) { + r = -EINVAL; +@@ -1966,6 +1982,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, + amdgpu_atombios_i2c_init(adev); + } + ++fence_driver_init: + /* Fence driver */ + r = amdgpu_fence_driver_init(adev); + if (r) { +@@ -2108,7 +2125,10 @@ void amdgpu_device_fini(struct amdgpu_device *adev) + /* free i2c buses */ + if (!amdgpu_device_has_dc_support(adev)) + amdgpu_i2c_fini(adev); +- amdgpu_atombios_fini(adev); ++ ++ if (amdgpu_emu_mode != 1) ++ amdgpu_atombios_fini(adev); ++ + kfree(adev->bios); + adev->bios = NULL; + if (!pci_is_thunderbolt_attached(adev->pdev)) +-- +2.7.4 + |