diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4262-drm-amdgpu-change-pp_dpm-clk-mclk-pcie-input-format.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4262-drm-amdgpu-change-pp_dpm-clk-mclk-pcie-input-format.patch | 170 |
1 files changed, 170 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4262-drm-amdgpu-change-pp_dpm-clk-mclk-pcie-input-format.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4262-drm-amdgpu-change-pp_dpm-clk-mclk-pcie-input-format.patch new file mode 100644 index 00000000..dd73107a --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4262-drm-amdgpu-change-pp_dpm-clk-mclk-pcie-input-format.patch @@ -0,0 +1,170 @@ +From 251a1de871bf614d36f5bfd4e2b4630836d06729 Mon Sep 17 00:00:00 2001 +From: welu <wei.lu2@amd.com> +Date: Tue, 24 Apr 2018 09:13:20 -0400 +Subject: [PATCH 4262/5725] drm/amdgpu: change pp_dpm clk/mclk/pcie input + format. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +1. support more than 8 values when setting get_pp_dpm_mclk/ +sclk/pcie, the former design just parse command format like +"echo xxxx > pp_dpm_sclk" and current can parse "echo xx xxx + xxxx > pp_dpm_sclk" whose operation is more user-friendly +and convinent and can offer more values; +2. be compatible with former design like "xx". +3. add DOC: pp_dpm_sclk pp_dpm_mclk pp_dpm_pcie +Bug:KFD-385 + +Change-Id: Ic2d4deebce03a84104d7da058b0b281c66407772 +Signed-off-by: welu <wei.lu2@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 103 +++++++++++++++++++-------------- + 1 file changed, 59 insertions(+), 44 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +index 4cbce49..6f07b51 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -574,10 +574,10 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev, + * the power state and the clock information for those levels. + * + * To manually adjust these states, first select manual using +- * power_dpm_force_performance_level. Writing a string of the level +- * numbers to the file will select which levels you want to enable. +- * E.g., writing 456 to the file will enable levels 4, 5, and 6. +- * ++ * power_dpm_force_performance_level. ++ * Secondly,Enter a new value for each level by inputing a string that ++ * contains " echo xx xx xx > pp_dpm_sclk/mclk/pcie" ++ * E.g., echo 4 5 6 to > pp_dpm_sclk will enable sclk levels 4, 5, and 6. + */ + + static ssize_t amdgpu_get_pp_dpm_sclk(struct device *dev, +@@ -602,23 +602,27 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev, + struct amdgpu_device *adev = ddev->dev_private; + int ret; + long level; +- uint32_t i, mask = 0; +- char sub_str[2]; ++ uint32_t mask = 0; ++ char *sub_str = NULL; ++ char *tmp; ++ char buf_cpy[count]; ++ const char delimiter[3] = {' ', '\n', '\0'}; + +- for (i = 0; i < strlen(buf); i++) { +- if (*(buf + i) == '\n') +- continue; +- sub_str[0] = *(buf + i); +- sub_str[1] = '\0'; +- ret = kstrtol(sub_str, 0, &level); ++ memcpy(buf_cpy, buf, count+1); ++ tmp = buf_cpy; ++ while (tmp[0]) { ++ sub_str = strsep(&tmp, delimiter); ++ if (strlen(sub_str)) { ++ ret = kstrtol(sub_str, 0, &level); + +- if (ret) { +- count = -EINVAL; +- goto fail; +- } +- mask |= 1 << level; ++ if (ret) { ++ count = -EINVAL; ++ goto fail; ++ } ++ mask |= 1 << level; ++ } else ++ break; + } +- + if (adev->powerplay.pp_funcs->force_clock_level) + amdgpu_dpm_force_clock_level(adev, PP_SCLK, mask); + +@@ -648,21 +652,26 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev, + struct amdgpu_device *adev = ddev->dev_private; + int ret; + long level; +- uint32_t i, mask = 0; +- char sub_str[2]; ++ uint32_t mask = 0; ++ char *sub_str = NULL; ++ char *tmp; ++ char buf_cpy[count]; ++ const char delimiter[3] = {' ', '\n', '\0'}; + +- for (i = 0; i < strlen(buf); i++) { +- if (*(buf + i) == '\n') +- continue; +- sub_str[0] = *(buf + i); +- sub_str[1] = '\0'; +- ret = kstrtol(sub_str, 0, &level); ++ memcpy(buf_cpy, buf, count+1); ++ tmp = buf_cpy; ++ while (tmp[0]) { ++ sub_str = strsep(&tmp, delimiter); ++ if (strlen(sub_str)) { ++ ret = kstrtol(sub_str, 0, &level); + +- if (ret) { +- count = -EINVAL; +- goto fail; +- } +- mask |= 1 << level; ++ if (ret) { ++ count = -EINVAL; ++ goto fail; ++ } ++ mask |= 1 << level; ++ } else ++ break; + } + if (adev->powerplay.pp_funcs->force_clock_level) + amdgpu_dpm_force_clock_level(adev, PP_MCLK, mask); +@@ -693,21 +702,27 @@ static ssize_t amdgpu_set_pp_dpm_pcie(struct device *dev, + struct amdgpu_device *adev = ddev->dev_private; + int ret; + long level; +- uint32_t i, mask = 0; +- char sub_str[2]; ++ uint32_t mask = 0; ++ char *sub_str = NULL; ++ char *tmp; ++ char buf_cpy[count]; ++ const char delimiter[3] = {' ', '\n', '\0'}; + +- for (i = 0; i < strlen(buf); i++) { +- if (*(buf + i) == '\n') +- continue; +- sub_str[0] = *(buf + i); +- sub_str[1] = '\0'; +- ret = kstrtol(sub_str, 0, &level); ++ memcpy(buf_cpy, buf, count+1); ++ tmp = buf_cpy; + +- if (ret) { +- count = -EINVAL; +- goto fail; +- } +- mask |= 1 << level; ++ while (tmp[0]) { ++ sub_str = strsep(&tmp, delimiter); ++ if (strlen(sub_str)) { ++ ret = kstrtol(sub_str, 0, &level); ++ ++ if (ret) { ++ count = -EINVAL; ++ goto fail; ++ } ++ mask |= 1 << level; ++ } else ++ break; + } + if (adev->powerplay.pp_funcs->force_clock_level) + amdgpu_dpm_force_clock_level(adev, PP_PCIE, mask); +-- +2.7.4 + |