<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);">
the smu driver many place will use AMD_IS_APU flags,</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
i think we'd better add a new member "is_apu" in smu_context"</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Best Regards,<br>
kevin</div>
<div id="appendonsend"></div>
<div style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)">
<br>
</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> Monday, September 23, 2019 4:43 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> arron.liu@amd.com <arron.liu@amd.com>; Huang, Ray <Ray.Huang@amd.com>; Liang, Prike <Prike.Liang@amd.com>; Quan, Evan <Evan.Quan@amd.com>; Feng, Kenneth <Kenneth.Feng@amd.com><br>
<b>Subject:</b> [PATCH 1/5] 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 table,<br>
thus will not initialize smu_dpm_context and aviod null pointer check guard for APU.<br>
<br>
Signed-off-by: Prike Liang <Prike.Liang@amd.com><br>
---<br>
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 10 +++++++---<br>
1 file changed, 7 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 90fa444..3afd2cd 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c<br>
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c<br>
@@ -1554,7 +1554,9 @@ 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>
+ struct amdgpu_device *adev = smu->adev;<br>
+<br>
+ if (!(adev->flags & AMD_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>
@@ -1751,8 +1753,9 @@ enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu)<br>
{<br>
struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);<br>
enum amd_dpm_forced_level level;<br>
+ struct amdgpu_device *adev = smu->adev;<br>
<br>
- if (!smu_dpm_ctx->dpm_context)<br>
+ if (!(adev->flags & AMD_IS_APU) && !smu_dpm_ctx->dpm_context)<br>
return -EINVAL;<br>
<br>
mutex_lock(&(smu->mutex));<br>
@@ -1766,8 +1769,9 @@ int smu_force_performance_level(struct smu_context *smu, enum amd_dpm_forced_lev<br>
{<br>
struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);<br>
int ret = 0;<br>
+ struct amdgpu_device *adev = smu->adev;<br>
<br>
- if (!smu_dpm_ctx->dpm_context)<br>
+ if (!(adev->flags & AMD_IS_APU) && !smu_dpm_ctx->dpm_context)<br>
return -EINVAL;<br>
<br>
ret = smu_enable_umd_pstate(smu, &level);<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>