<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
comment inline.</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Liang, Prike <Prike.Liang@amd.com><br>
<b>Sent:</b> Thursday, September 26, 2019 11:50 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Liang, Prike <Prike.Liang@amd.com>; Quan, Evan <Evan.Quan@amd.com>; Huang, Ray <Ray.Huang@amd.com>; keneth.feng@amd.com <keneth.feng@amd.com><br>
<b>Subject:</b> [PATCH 1/8] drm/amd/powerplay: bypass dpm_context null pointer check guard for some smu series</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt">
<div class="PlainText">For now APU has no smu_dpm_context structure for containing default/current related dpm tables,<br>
thus will needn't initialize smu_dpm_context to aviod APU null pointer issue.<br>
<br>
Signed-off-by: Prike Liang <Prike.Liang@amd.com><br>
---<br>
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 7 ++++---<br>
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 +<br>
drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 1 +<br>
3 files changed, 6 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c<br>
index 23293e1..ae4a82e 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c<br>
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c<br>
@@ -1557,7 +1557,8 @@ static int smu_enable_umd_pstate(void *handle,<br>
<br>
struct smu_context *smu = (struct smu_context*)(handle);<br>
struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);<br>
- if (!smu->pm_enabled || !smu_dpm_ctx->dpm_context)<br>
+<br>
+ if (!smu->is_apu && (!smu->pm_enabled || !smu_dpm_ctx->dpm_context))<br>
return -EINVAL;<br>
<br>
if (!(smu_dpm_ctx->dpm_level & profile_mode_mask)) {<br>
@@ -1755,7 +1756,7 @@ enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu)<br>
struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);<br>
enum amd_dpm_forced_level level;<br>
<br>
- if (!smu_dpm_ctx->dpm_context)<br>
+ if (!smu->is_apu && !smu_dpm_ctx->dpm_context)<br>
return -EINVAL;<br>
<br>
mutex_lock(&(smu->mutex));<br>
@@ -1770,7 +1771,7 @@ int smu_force_performance_level(struct smu_context *smu, enum amd_dpm_forced_lev<br>
struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);<br>
int ret = 0;<br>
<br>
- if (!smu_dpm_ctx->dpm_context)<br>
+ if (!smu->is_apu && !smu_dpm_ctx->dpm_context)<br>
return -EINVAL;<br>
<br>
ret = smu_enable_umd_pstate(smu, &level);<br>
diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h<br>
index 5c89844..bd1e621 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h<br>
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h<br>
@@ -387,6 +387,7 @@ struct smu_context<br>
uint32_t power_profile_mode;<br>
uint32_t default_power_profile_mode;<br>
bool pm_enabled;<br>
+ bool is_apu;<br>
<br>
uint32_t smc_if_version;<br>
<br>
diff --git a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c<br>
index 9311b6a..a4e44d3 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c<br>
+++ b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c<br>
@@ -141,6 +141,7 @@ static int renoir_get_smu_table_index(struct smu_context *smc, uint32_t index)<br>
static int renoir_tables_init(struct smu_context *smu, struct smu_table *tables)<br>
{<br>
struct smu_table_context *smu_table = &smu->smu_table;<br>
+ smu->is_apu = true;</div>
<div class="PlainText">[keivn]:</div>
<div class="PlainText">i'd like move this into function of "renoir_set_ppt_funcs".</div>
<div class="PlainText">and this member should be set default value in amdgpu_smu.c</div>
<div class="PlainText"><br>
</div>
<div class="PlainText">after fixed:</div>
<div class="PlainText">Reviewed-by: Kevin Wang <kevin1.wang@amd.com></div>
<div class="PlainText"> <br>
SMU_TABLE_INIT(tables, SMU_TABLE_WATERMARKS, sizeof(Watermarks_t),<br>
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);<br>
-- <br>
2.7.4<br>
<br>
_______________________________________________<br>
amd-gfx mailing list<br>
amd-gfx@lists.freedesktop.org<br>
<a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a></div>
</span></font></div>
</body>
</html>