Commit 147d211c authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Mauro Carvalho Chehab
Browse files

media: cedrus: Fix H265 status definitions 



Some of the H265 status flags are wrong. Redefine them to corespond to
Allwinner CedarC open source userspace library. Only one of these flags
is actually used and new value also matches value used in libvdpau-sunxi
library, which is proven to be working.

Note that wrong (old) value in right circumstances (in combination with
another H265 decoding bug) causes driver lock up. With this fix decoding
is still broken (green output) but at least driver doesn't lock up.

Fixes: 86caab29 ("media: cedrus: Add HEVC/H.265 decoding support")
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 87e780db

drivers/staging/media/sunxi/cedrus/cedrus_regs.h

+9 −8
Original line number Diff line number Diff line
@@ -443,16 +443,17 @@ 
#define VE_DEC_H265_STATUS_STCD_BUSY		BIT(21)

#define VE_DEC_H265_STATUS_WB_BUSY		BIT(20)

#define VE_DEC_H265_STATUS_BS_DMA_BUSY		BIT(19)

#define VE_DEC_H265_STATUS_IQIT_BUSY		BIT(18)

#define VE_DEC_H265_STATUS_IT_BUSY		BIT(18)

#define VE_DEC_H265_STATUS_INTER_BUSY		BIT(17)

#define VE_DEC_H265_STATUS_MORE_DATA		BIT(16)

#define VE_DEC_H265_STATUS_VLD_BUSY		BIT(14)

#define VE_DEC_H265_STATUS_DEBLOCKING_BUSY	BIT(13)

#define VE_DEC_H265_STATUS_DEBLOCKING_DRAM_BUSY	BIT(12)

#define VE_DEC_H265_STATUS_INTRA_BUSY		BIT(11)

#define VE_DEC_H265_STATUS_SAO_BUSY		BIT(10)

#define VE_DEC_H265_STATUS_MVP_BUSY		BIT(9)

#define VE_DEC_H265_STATUS_SWDEC_BUSY		BIT(8)

#define VE_DEC_H265_STATUS_DBLK_BUSY		BIT(15)

#define VE_DEC_H265_STATUS_IREC_BUSY		BIT(14)

#define VE_DEC_H265_STATUS_INTRA_BUSY		BIT(13)

#define VE_DEC_H265_STATUS_MCRI_BUSY		BIT(12)

#define VE_DEC_H265_STATUS_IQIT_BUSY		BIT(11)

#define VE_DEC_H265_STATUS_MVP_BUSY		BIT(10)

#define VE_DEC_H265_STATUS_IS_BUSY		BIT(9)

#define VE_DEC_H265_STATUS_VLD_BUSY		BIT(8)

#define VE_DEC_H265_STATUS_OVER_TIME		BIT(3)

#define VE_DEC_H265_STATUS_VLD_DATA_REQ		BIT(2)

#define VE_DEC_H265_STATUS_ERROR		BIT(1)