<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<p style="font-family:Arial;font-size:10pt;color:#0000FF;margin:5pt;font-style:normal;font-weight:normal;text-decoration:none;" align="Left">
[AMD Official Use Only - General]<br>
</p>
<br>
<div>
<div style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
<p style="font-family: Calibri, Arial, Helvetica, sans-serif; margin-top: 0px; margin-bottom: 0px; background-color: rgb(255, 255, 255);" class="ContentPasted0">
Looks good to me.</p>
<p style="font-family: Calibri, Arial, Helvetica, sans-serif; margin-top: 0px; margin-bottom: 0px; background-color: rgb(255, 255, 255);" class="ContentPasted0">
<br>
</p>
<p style="font-family: Calibri, Arial, Helvetica, sans-serif; margin-top: 0px; margin-bottom: 0px; background-color: rgb(255, 255, 255);" class="ContentPasted0">
Series is:</p>
<p style="font-family: Calibri, Arial, Helvetica, sans-serif; margin-top: 0px; margin-bottom: 0px; background-color: rgb(255, 255, 255);" class="ContentPasted0">
Reviewed-by: Solomon Chiu <solomon.chiu@amd.com></p>
<br>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Yu, Lang <Lang.Yu@amd.com><br>
<b>Sent:</b> Monday, September 4, 2023 12:22 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Deucher, Alexander <Alexander.Deucher@amd.com>; Chiu, Solomon <Solomon.Chiu@amd.com>; Yu, Lang <Lang.Yu@amd.com>; kernel test robot <lkp@intel.com><br>
<b>Subject:</b> [PATCH] drm/amdgpu: fix incompatible types in conditional expression</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Fixes: ab041551f4a7 ("drm/amdgpu: add VPE 6.1.0 support")<br>
<br>
Signed-off-by: Lang Yu <Lang.Yu@amd.com><br>
Reported-by: kernel test robot <lkp@intel.com><br>
Link: <a href="https://lore.kernel.org/oe-kbuild-all/202309020608.FwP8QMht-lkp@intel.com">
https://lore.kernel.org/oe-kbuild-all/202309020608.FwP8QMht-lkp@intel.com</a><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h | 2 +-<br>
drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 4 +++-<br>
2 files changed, 4 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h<br>
index b590205d6a28..29d56f7ae4a9 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h<br>
@@ -31,7 +31,7 @@ struct amdgpu_vpe;<br>
<br>
struct vpe_funcs {<br>
uint32_t (*get_reg_offset)(struct amdgpu_vpe *vpe, uint32_t inst, uint32_t offset);<br>
- void (*set_regs)(struct amdgpu_vpe *vpe);<br>
+ int (*set_regs)(struct amdgpu_vpe *vpe);<br>
int (*irq_init)(struct amdgpu_vpe *vpe);<br>
int (*init_microcode)(struct amdgpu_vpe *vpe);<br>
int (*load_microcode)(struct amdgpu_vpe *vpe);<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c b/drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c<br>
index 1259b150dc96..756f39348dd9 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c<br>
@@ -254,13 +254,15 @@ static int vpe_v6_1_process_trap_irq(struct amdgpu_device *adev,<br>
return 0;<br>
}<br>
<br>
-static void vpe_v6_1_set_regs(struct amdgpu_vpe *vpe)<br>
+static int vpe_v6_1_set_regs(struct amdgpu_vpe *vpe)<br>
{<br>
vpe->regs.queue0_rb_rptr_lo = regVPEC_QUEUE0_RB_RPTR;<br>
vpe->regs.queue0_rb_rptr_hi = regVPEC_QUEUE0_RB_RPTR_HI;<br>
vpe->regs.queue0_rb_wptr_lo = regVPEC_QUEUE0_RB_WPTR;<br>
vpe->regs.queue0_rb_wptr_hi = regVPEC_QUEUE0_RB_WPTR_HI;<br>
vpe->regs.queue0_preempt = regVPEC_QUEUE0_PREEMPT;<br>
+<br>
+ return 0;<br>
}<br>
<br>
static const struct vpe_funcs vpe_v6_1_funcs = {<br>
-- <br>
2.25.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>