Commit d519072d authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu: fix incompatible types in conditional expression 



Use proper type.

Fixes: 9d4346bd ("drm/amdgpu: add VPE 6.1.0 support")
Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarSolomon Chiu <solomon.chiu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202309020608.FwP8QMht-lkp@intel.com


Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eb3b214c

drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct amdgpu_vpe; 


struct vpe_funcs {

	uint32_t (*get_reg_offset)(struct amdgpu_vpe *vpe, uint32_t inst, uint32_t offset);

	void (*set_regs)(struct amdgpu_vpe *vpe);

	int (*set_regs)(struct amdgpu_vpe *vpe);

	int (*irq_init)(struct amdgpu_vpe *vpe);

	int (*init_microcode)(struct amdgpu_vpe *vpe);

	int (*load_microcode)(struct amdgpu_vpe *vpe);

drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c

+3 −1
Original line number Diff line number Diff line
@@ -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 = {