diff options
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0876-drm-amd-powerplay-add-dummy-pp-table-for-raven.-v2.patch')
| -rw-r--r-- | meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0876-drm-amd-powerplay-add-dummy-pp-table-for-raven.-v2.patch | 119 |
1 files changed, 0 insertions, 119 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0876-drm-amd-powerplay-add-dummy-pp-table-for-raven.-v2.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0876-drm-amd-powerplay-add-dummy-pp-table-for-raven.-v2.patch deleted file mode 100644 index 7cb13308..00000000 --- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0876-drm-amd-powerplay-add-dummy-pp-table-for-raven.-v2.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 56ab043e7a17e29d64338324b06d112630cf8a29 Mon Sep 17 00:00:00 2001 -From: Rex Zhu <Rex.Zhu@amd.com> -Date: Thu, 24 Aug 2017 13:29:52 +0800 -Subject: [PATCH 0876/4131] drm/amd/powerplay: add dummy pp table for raven. - (v2) - -As there is no PPTable in RV, it is difficult to -cleanly decouple PPTABLE functionality in existing -codes. - -v2: agd: squash in clean build fix - -Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 61 +++++++++++++++++----- - 1 file changed, 49 insertions(+), 12 deletions(-) - -diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c -index 2716721..0f61e67 100644 ---- a/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c -+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c -@@ -24,7 +24,7 @@ - #include <linux/types.h> - #include <linux/kernel.h> - #include <linux/slab.h> -- -+#include <drm/amdgpu_drm.h> - #include "processpptables.h" - #include <atom-types.h> - #include <atombios.h> -@@ -790,6 +790,39 @@ static const ATOM_PPLIB_STATE_V2 *get_state_entry_v2( - return pstate; - } - -+static unsigned char soft_dummy_pp_table[] = { -+ 0xe1, 0x01, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x4a, 0x00, 0x6c, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x42, 0x00, 0x02, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -+ 0x00, 0x4e, 0x00, 0x88, 0x00, 0x00, 0x9e, 0x00, 0x17, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, -+ 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, -+ 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x18, 0x05, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x00, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, -+ 0x8e, 0x01, 0x00, 0x00, 0xb8, 0x01, 0x00, 0x00, 0x08, 0x30, 0x75, 0x00, 0x80, 0x00, 0xa0, 0x8c, -+ 0x00, 0x7e, 0x00, 0x71, 0xa5, 0x00, 0x7c, 0x00, 0xe5, 0xc8, 0x00, 0x70, 0x00, 0x91, 0xf4, 0x00, -+ 0x64, 0x00, 0x40, 0x19, 0x01, 0x5a, 0x00, 0x0e, 0x28, 0x01, 0x52, 0x00, 0x80, 0x38, 0x01, 0x4a, -+ 0x00, 0x00, 0x09, 0x30, 0x75, 0x00, 0x30, 0x75, 0x00, 0x40, 0x9c, 0x00, 0x40, 0x9c, 0x00, 0x59, -+ 0xd8, 0x00, 0x59, 0xd8, 0x00, 0x91, 0xf4, 0x00, 0x91, 0xf4, 0x00, 0x0e, 0x28, 0x01, 0x0e, 0x28, -+ 0x01, 0x90, 0x5f, 0x01, 0x90, 0x5f, 0x01, 0x00, 0x77, 0x01, 0x00, 0x77, 0x01, 0xca, 0x91, 0x01, -+ 0xca, 0x91, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x7e, 0x00, 0x01, -+ 0x7c, 0x00, 0x02, 0x70, 0x00, 0x03, 0x64, 0x00, 0x04, 0x5a, 0x00, 0x05, 0x52, 0x00, 0x06, 0x4a, -+ 0x00, 0x07, 0x08, 0x08, 0x00, 0x08, 0x00, 0x01, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x03, -+ 0x02, 0x04, 0x02, 0x00, 0x08, 0x40, 0x9c, 0x00, 0x30, 0x75, 0x00, 0x74, 0xb5, 0x00, 0xa0, 0x8c, -+ 0x00, 0x60, 0xea, 0x00, 0x74, 0xb5, 0x00, 0x0e, 0x28, 0x01, 0x60, 0xea, 0x00, 0x90, 0x5f, 0x01, -+ 0x40, 0x19, 0x01, 0xb2, 0xb0, 0x01, 0x90, 0x5f, 0x01, 0xc0, 0xd4, 0x01, 0x00, 0x77, 0x01, 0x5e, -+ 0xff, 0x01, 0xca, 0x91, 0x01, 0x08, 0x80, 0x00, 0x00, 0x7e, 0x00, 0x01, 0x7c, 0x00, 0x02, 0x70, -+ 0x00, 0x03, 0x64, 0x00, 0x04, 0x5a, 0x00, 0x05, 0x52, 0x00, 0x06, 0x4a, 0x00, 0x07, 0x00, 0x08, -+ 0x80, 0x00, 0x30, 0x75, 0x00, 0x7e, 0x00, 0x40, 0x9c, 0x00, 0x7c, 0x00, 0x59, 0xd8, 0x00, 0x70, -+ 0x00, 0xdc, 0x0b, 0x01, 0x64, 0x00, 0x80, 0x38, 0x01, 0x5a, 0x00, 0x80, 0x38, 0x01, 0x52, 0x00, -+ 0x80, 0x38, 0x01, 0x4a, 0x00, 0x80, 0x38, 0x01, 0x08, 0x30, 0x75, 0x00, 0x80, 0x00, 0xa0, 0x8c, -+ 0x00, 0x7e, 0x00, 0x71, 0xa5, 0x00, 0x7c, 0x00, 0xe5, 0xc8, 0x00, 0x74, 0x00, 0x91, 0xf4, 0x00, -+ 0x66, 0x00, 0x40, 0x19, 0x01, 0x58, 0x00, 0x0e, 0x28, 0x01, 0x52, 0x00, 0x80, 0x38, 0x01, 0x4a, -+ 0x00 -+}; - - static const ATOM_PPLIB_POWERPLAYTABLE *get_powerplay_table( - struct pp_hwmgr *hwmgr) -@@ -799,12 +832,17 @@ static const ATOM_PPLIB_POWERPLAYTABLE *get_powerplay_table( - uint16_t size; - - if (!table_addr) { -- table_addr = cgs_atom_get_data_table(hwmgr->device, -- GetIndexIntoMasterTable(DATA, PowerPlayInfo), -- &size, &frev, &crev); -- -- hwmgr->soft_pp_table = table_addr; -- hwmgr->soft_pp_table_size = size; -+ if (hwmgr->chip_id == CHIP_RAVEN) { -+ table_addr = &soft_dummy_pp_table[0]; -+ hwmgr->soft_pp_table = &soft_dummy_pp_table[0]; -+ hwmgr->soft_pp_table_size = sizeof(soft_dummy_pp_table); -+ } else { -+ table_addr = cgs_atom_get_data_table(hwmgr->device, -+ GetIndexIntoMasterTable(DATA, PowerPlayInfo), -+ &size, &frev, &crev); -+ hwmgr->soft_pp_table = table_addr; -+ hwmgr->soft_pp_table_size = size; -+ } - } - - return (const ATOM_PPLIB_POWERPLAYTABLE *)table_addr; -@@ -924,15 +962,14 @@ int pp_tables_get_entry(struct pp_hwmgr *hwmgr, - } - } - -- if ((0 == result) && -- (0 != (ps->classification.flags & PP_StateClassificationFlag_Boot))) -- result = hwmgr->hwmgr_func->patch_boot_state(hwmgr, &(ps->hardware)); -+ if ((0 == result) && (0 != (ps->classification.flags & PP_StateClassificationFlag_Boot))) { -+ if (hwmgr->chip_family < AMDGPU_FAMILY_RV) -+ result = hwmgr->hwmgr_func->patch_boot_state(hwmgr, &(ps->hardware)); -+ } - - return result; - } - -- -- - static int init_powerplay_tables( - struct pp_hwmgr *hwmgr, - const ATOM_PPLIB_POWERPLAYTABLE *powerplay_table --- -2.7.4 - |