fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-25 09:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

radeon/vce: make reloc offset signed

Browse source 
We need a negative offset for FW 50.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2015-06-15 20:19:48 +02:00 • committed by Marek Olšák
parent 57fabe9f3a
commit 42bc4e6be4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/radeon/radeon_vce.c
View file

@ -217,7 +217,7 @@ struct rvce_cpb_slot *l1_slot(struct rvce_encoder *enc)
* Calculate the offsets into the CPB
*/
void rvce_frame_offset(struct rvce_encoder *enc, struct rvce_cpb_slot *slot,
unsigned *luma_offset, unsigned *chroma_offset)
signed *luma_offset, signed *chroma_offset)
{
unsigned pitch = align(enc->luma->level[0].pitch_bytes, 128);
unsigned vpitch = align(enc->luma->npix_y, 16);
@ -501,7 +501,7 @@ bool rvce_is_fw_version_supported(struct r600_common_screen *rscreen)
*/
void rvce_add_buffer(struct rvce_encoder *enc, struct radeon_winsys_cs_handle *buf,
enum radeon_bo_usage usage, enum radeon_bo_domain domain,
uint32_t offset)
signed offset)
{
int reloc_idx;

4
src/gallium/drivers/radeon/radeon_vce.h
View file

@ -118,7 +118,7 @@ struct rvce_cpb_slot *current_slot(struct rvce_encoder *enc);
struct rvce_cpb_slot *l0_slot(struct rvce_encoder *enc);
struct rvce_cpb_slot *l1_slot(struct rvce_encoder *enc);
void rvce_frame_offset(struct rvce_encoder *enc, struct rvce_cpb_slot *slot,
unsigned *luma_offset, unsigned *chroma_offset);
signed *luma_offset, signed *chroma_offset);
struct pipe_video_codec *rvce_create_encoder(struct pipe_context *context,
const struct pipe_video_codec *templat,
@ -129,7 +129,7 @@ bool rvce_is_fw_version_supported(struct r600_common_screen *rscreen);
void rvce_add_buffer(struct rvce_encoder *enc, struct radeon_winsys_cs_handle *buf,
enum radeon_bo_usage usage, enum radeon_bo_domain domain,
uint32_t offset);
signed offset);
/* init vce fw 40.2.2 specific callbacks */
void radeon_vce_40_2_2_init(struct rvce_encoder *enc);

2
src/gallium/drivers/radeon/radeon_vce_40_2_2.c
View file

@ -294,8 +294,8 @@ static void config(struct rvce_encoder *enc)
static void encode(struct rvce_encoder *enc)
{
signed luma_offset, chroma_offset;
int i;
unsigned luma_offset, chroma_offset;
enc->task_info(enc, 0x00000003, 0, 0, 0);

2
src/gallium/drivers/radeon/radeon_vce_50.c
View file

@ -78,8 +78,8 @@ static void rate_control(struct rvce_encoder *enc)
static void encode(struct rvce_encoder *enc)
{
signed luma_offset, chroma_offset;
int i;
unsigned luma_offset, chroma_offset;
enc->task_info(enc, 0x00000003, 0, 0, 0);