diff options
| author | Lang Yu <[email protected]> | 2023-09-04 03:59:59 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2023-09-06 18:35:29 +0000 |
| commit | d519072d26949f9a00a679e112b0297306960696 (patch) | |
| tree | a26deec35d91364da9cd5b7872d8344a0eb46bfd /drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | |
| parent | drm/amdgpu: Use min_t to replace min (diff) | |
| download | kernel-d519072d26949f9a00a679e112b0297306960696.tar.gz kernel-d519072d26949f9a00a679e112b0297306960696.zip | |
drm/amdgpu: fix incompatible types in conditional expression
Use proper type.
Fixes: 9d4346bdbc64 ("drm/amdgpu: add VPE 6.1.0 support")
Signed-off-by: Lang Yu <[email protected]>
Reviewed-by: Solomon Chiu <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Reported-by: kernel test robot <[email protected]>
Link: https://lore.kernel.org/oe-kbuild-all/[email protected]
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c b/drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c index 1259b150dc96..756f39348dd9 100644 --- a/drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c +++ b/drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c @@ -254,13 +254,15 @@ static int vpe_v6_1_process_trap_irq(struct amdgpu_device *adev, return 0; } -static void vpe_v6_1_set_regs(struct amdgpu_vpe *vpe) +static int vpe_v6_1_set_regs(struct amdgpu_vpe *vpe) { vpe->regs.queue0_rb_rptr_lo = regVPEC_QUEUE0_RB_RPTR; vpe->regs.queue0_rb_rptr_hi = regVPEC_QUEUE0_RB_RPTR_HI; vpe->regs.queue0_rb_wptr_lo = regVPEC_QUEUE0_RB_WPTR; vpe->regs.queue0_rb_wptr_hi = regVPEC_QUEUE0_RB_WPTR_HI; vpe->regs.queue0_preempt = regVPEC_QUEUE0_PREEMPT; + + return 0; } static const struct vpe_funcs vpe_v6_1_funcs = { |