[Mesa-stable] [PATCH] radeon/vcn: fix mpeg4 msg buffer settings

[Mark Janes]

Leo Liu <leo.liu at amd.com> writes:

> Reviewed-by: Leo Liu <leo.liu at amd.com>
>
> And Cc Mesa-stable as well.

Please include stable tags in your commit message, eg:

Cc: 18.0 18.1 <mesa-stable at lists.freedesktop.org>

> On 2018-04-24 04:49 PM, boyuan.zhang at amd.com wrote:
>> From: Boyuan Zhang <boyuan.zhang at amd.com>
>>
>> Previous bit-fields assignments are incorrect and will result certain mpeg4
>> decode failed due to wrong flag values. This patch fixes these assignments.
>>
>> Signed-off-by: Boyuan Zhang <boyuan.zhang at amd.com>
>> ---
>>   src/gallium/drivers/radeon/radeon_vcn_dec.c | 18 +++++++++---------
>>   1 file changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c b/src/gallium/drivers/radeon/radeon_vcn_dec.c
>> index f83e9e5..4bc922d 100644
>> --- a/src/gallium/drivers/radeon/radeon_vcn_dec.c
>> +++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c
>> @@ -554,15 +554,15 @@ static rvcn_dec_message_mpeg4_asp_vld_t get_mpeg4_msg(struct radeon_decoder *dec
>>   
>>   	result.vop_time_increment_resolution = pic->vop_time_increment_resolution;
>>   
>> -	result.short_video_header |= pic->short_video_header << 0;
>> -	result.interlaced |= pic->interlaced << 2;
>> -        result.load_intra_quant_mat |= 1 << 3;
>> -	result.load_nonintra_quant_mat |= 1 << 4;
>> -	result.quarter_sample |= pic->quarter_sample << 5;
>> -	result.complexity_estimation_disable |= 1 << 6;
>> -	result.resync_marker_disable |= pic->resync_marker_disable << 7;
>> -	result.newpred_enable |= 0 << 10; //
>> -	result.reduced_resolution_vop_enable |= 0 << 11;
>> +	result.short_video_header = pic->short_video_header;
>> +	result.interlaced = pic->interlaced;
>> +	result.load_intra_quant_mat = 1;
>> +	result.load_nonintra_quant_mat = 1;
>> +	result.quarter_sample = pic->quarter_sample;
>> +	result.complexity_estimation_disable = 1;
>> +	result.resync_marker_disable = pic->resync_marker_disable;
>> +	result.newpred_enable = 0;
>> +	result.reduced_resolution_vop_enable = 0;
>>   
>>   	result.quant_type = pic->quant_type;
>>   
>
> _______________________________________________
> mesa-stable mailing list
> mesa-stable at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-stable