radeon/vce: fix VCE fail after rebase
Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
parent
fa80c1fe20
commit
e91a67abfa
|
@ -96,13 +96,11 @@ static void encode(struct rvce_encoder *enc)
|
||||||
task_info(enc, 0x00000003);
|
task_info(enc, 0x00000003);
|
||||||
|
|
||||||
RVCE_BEGIN(0x05000001); // context buffer
|
RVCE_BEGIN(0x05000001); // context buffer
|
||||||
RVCE_READWRITE(enc->cpb.res->cs_buf, enc->cpb.res->domains, 0); // encodeContextAddressHi
|
RVCE_READWRITE(enc->cpb.res->cs_buf, enc->cpb.res->domains, 0); // encodeContextAddressHi/Lo
|
||||||
RVCE_CS(0x00000000); // encodeContextAddressLo
|
|
||||||
RVCE_END();
|
RVCE_END();
|
||||||
|
|
||||||
RVCE_BEGIN(0x05000004); // video bitstream buffer
|
RVCE_BEGIN(0x05000004); // video bitstream buffer
|
||||||
RVCE_WRITE(enc->bs_handle, RADEON_DOMAIN_GTT, 0); // videoBitstreamRingAddressHi
|
RVCE_WRITE(enc->bs_handle, RADEON_DOMAIN_GTT, 0); // videoBitstreamRingAddressHi/Lo
|
||||||
RVCE_CS(0x00000000); // videoBitstreamRingAddressLo
|
|
||||||
RVCE_CS(enc->bs_size); // videoBitstreamRingSize
|
RVCE_CS(enc->bs_size); // videoBitstreamRingSize
|
||||||
RVCE_END();
|
RVCE_END();
|
||||||
|
|
||||||
|
@ -127,10 +125,10 @@ static void encode(struct rvce_encoder *enc)
|
||||||
RVCE_CS(0x00000000); // insertAUD
|
RVCE_CS(0x00000000); // insertAUD
|
||||||
RVCE_CS(0x00000000); // endOfSequence
|
RVCE_CS(0x00000000); // endOfSequence
|
||||||
RVCE_CS(0x00000000); // endOfStream
|
RVCE_CS(0x00000000); // endOfStream
|
||||||
RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM, 0); // inputPictureLumaAddressHi
|
RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM,
|
||||||
RVCE_CS(enc->luma->level[0].offset); // inputPictureLumaAddressLo
|
enc->luma->level[0].offset); // inputPictureLumaAddressHi/Lo
|
||||||
RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM, 0); // inputPictureChromaAddressHi
|
RVCE_READ(enc->handle, RADEON_DOMAIN_VRAM,
|
||||||
RVCE_CS(enc->chroma->level[0].offset); // inputPictureChromaAddressLo
|
enc->chroma->level[0].offset); // inputPictureChromaAddressHi/Lo
|
||||||
RVCE_CS(align(enc->luma->npix_y, 16)); // encInputFrameYPitch
|
RVCE_CS(align(enc->luma->npix_y, 16)); // encInputFrameYPitch
|
||||||
RVCE_CS(enc->luma->level[0].pitch_bytes); // encInputPicLumaPitch
|
RVCE_CS(enc->luma->level[0].pitch_bytes); // encInputPicLumaPitch
|
||||||
RVCE_CS(enc->chroma->level[0].pitch_bytes); // encInputPicChromaPitch
|
RVCE_CS(enc->chroma->level[0].pitch_bytes); // encInputPicChromaPitch
|
||||||
|
|
Loading…
Reference in New Issue