diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0907-drm-amdgpu-iceland-use-CI-based-MC-IP.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0907-drm-amdgpu-iceland-use-CI-based-MC-IP.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/common/recipes-kernel/linux/files/0907-drm-amdgpu-iceland-use-CI-based-MC-IP.patch b/common/recipes-kernel/linux/files/0907-drm-amdgpu-iceland-use-CI-based-MC-IP.patch deleted file mode 100644 index d473df91..00000000 --- a/common/recipes-kernel/linux/files/0907-drm-amdgpu-iceland-use-CI-based-MC-IP.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 94755bf9973943af05e1cb58cfafd866c3a0ac7d Mon Sep 17 00:00:00 2001 -From: Ken Wang <Qingqing.Wang@amd.com> -Date: Wed, 3 Feb 2016 19:16:54 +0800 -Subject: [PATCH 0907/1565] drm/amdgpu: iceland use CI based MC IP -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Reviewed-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Signed-off-by: Ken Wang <Qingqing.Wang@amd.com> -Cc: stable@vger.kernel.org ---- - drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 10 +++++++++- - drivers/gpu/drm/amd/amdgpu/vi.c | 7 ++++--- - 2 files changed, 13 insertions(+), 4 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c -index 3f95606..069abc8 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c -@@ -42,6 +42,7 @@ static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev); - - MODULE_FIRMWARE("radeon/bonaire_mc.bin"); - MODULE_FIRMWARE("radeon/hawaii_mc.bin"); -+MODULE_FIRMWARE("amdgpu/topaz_mc.bin"); - - /** - * gmc8_mc_wait_for_idle - wait for MC idle callback. -@@ -132,13 +133,20 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev) - case CHIP_HAWAII: - chip_name = "hawaii"; - break; -+ case CHIP_TOPAZ: -+ chip_name = "topaz"; -+ break; - case CHIP_KAVERI: - case CHIP_KABINI: - return 0; - default: BUG(); - } - -- snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name); -+ if(adev->asic_type == CHIP_TOPAZ) -+ snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name); -+ else -+ snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name); -+ - err = request_firmware(&adev->mc.fw, fw_name, adev->dev); - if (err) - goto out; -diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c -index 652e766..d94c625 100644 ---- a/drivers/gpu/drm/amd/amdgpu/vi.c -+++ b/drivers/gpu/drm/amd/amdgpu/vi.c -@@ -61,6 +61,7 @@ - #include "vi.h" - #include "vi_dpm.h" - #include "gmc_v8_0.h" -+#include "gmc_v7_0.h" - #include "gfx_v8_0.h" - #include "sdma_v2_4.h" - #include "sdma_v3_0.h" -@@ -1109,10 +1110,10 @@ static const struct amdgpu_ip_block_version topaz_ip_blocks[] = - }, - { - .type = AMD_IP_BLOCK_TYPE_GMC, -- .major = 8, -- .minor = 0, -+ .major = 7, -+ .minor = 4, - .rev = 0, -- .funcs = &gmc_v8_0_ip_funcs, -+ .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type = AMD_IP_BLOCK_TYPE_IH, --- -1.9.1 - |