diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0631-drm-amdgpu-add-VCE-support-for-Stoney-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0631-drm-amdgpu-add-VCE-support-for-Stoney-v2.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0631-drm-amdgpu-add-VCE-support-for-Stoney-v2.patch b/common/recipes-kernel/linux/files/0631-drm-amdgpu-add-VCE-support-for-Stoney-v2.patch new file mode 100644 index 00000000..51c4e06c --- /dev/null +++ b/common/recipes-kernel/linux/files/0631-drm-amdgpu-add-VCE-support-for-Stoney-v2.patch @@ -0,0 +1,65 @@ +From b4566cd6660edff50db3fa4a26fe3978314bfe3a Mon Sep 17 00:00:00 2001 +From: Samuel Li <samuel.li@amd.com> +Date: Thu, 8 Oct 2015 16:27:55 -0400 +Subject: [PATCH 0631/1050] drm/amdgpu: add VCE support for Stoney (v2) + +Stoney is VCE 3.x single. + +v2: Stoney is single pipe like Fiji + +Signed-off-by: Samuel Li <samuel.li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 +++++ + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 5 +++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +index 74f2038a..03f0c3b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +@@ -49,6 +49,7 @@ + #define FIRMWARE_TONGA "amdgpu/tonga_vce.bin" + #define FIRMWARE_CARRIZO "amdgpu/carrizo_vce.bin" + #define FIRMWARE_FIJI "amdgpu/fiji_vce.bin" ++#define FIRMWARE_STONEY "amdgpu/stoney_vce.bin" + + #ifdef CONFIG_DRM_AMDGPU_CIK + MODULE_FIRMWARE(FIRMWARE_BONAIRE); +@@ -60,6 +61,7 @@ MODULE_FIRMWARE(FIRMWARE_MULLINS); + MODULE_FIRMWARE(FIRMWARE_TONGA); + MODULE_FIRMWARE(FIRMWARE_CARRIZO); + MODULE_FIRMWARE(FIRMWARE_FIJI); ++MODULE_FIRMWARE(FIRMWARE_STONEY); + + static void amdgpu_vce_idle_work_handler(struct work_struct *work); + +@@ -106,6 +108,9 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) + case CHIP_FIJI: + fw_name = FIRMWARE_FIJI; + break; ++ case CHIP_STONEY: ++ fw_name = FIRMWARE_STONEY; ++ break; + + default: + return -EINVAL; +diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +index b1bf27b..6a52db6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +@@ -205,8 +205,9 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) + u32 tmp; + unsigned ret; + +- /* Fiji is single pipe */ +- if (adev->asic_type == CHIP_FIJI) { ++ /* Fiji, Stoney are single pipe */ ++ if ((adev->asic_type == CHIP_FIJI) || ++ (adev->asic_type == CHIP_STONEY)){ + ret = AMDGPU_VCE_HARVEST_VCE1; + return ret; + } +-- +1.9.1 + |