Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e367ea4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Fix various decoder downscalar issues"

parents faea63d1 bbd25d05

drivers/media/platform/msm/vidc/hfi_response_handler.c

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ static void hfi_process_session_error( 
	case HFI_ERR_SESSION_INVALID_SCALE_FACTOR:

	case HFI_ERR_SESSION_UNSUPPORT_BUFFERTYPE:

	case HFI_ERR_SESSION_UNSUPPORTED_SETTING:

	case HFI_ERR_SESSION_UPSCALE_NOT_SUPPORTED:

		dprintk(VIDC_INFO, "Non Fatal : HFI_EVENT_SESSION_ERROR\n");

		break;

	default:

drivers/media/platform/msm/vidc/msm_vidc_common.c

+14 −9
Original line number Diff line number Diff line
@@ -2186,7 +2186,7 @@ static int set_output_buffers(struct msm_vidc_inst *inst, 
	int rc = 0;

	struct msm_smem *handle;

	struct internal_buf *binfo;

	struct vidc_buffer_addr_info buffer_info;

	struct vidc_buffer_addr_info buffer_info = {0};

	u32 smem_flags = 0, buffer_size;

	struct hal_buffer_requirements *output_buf, *extradata_buf;

	int i;
@@ -2206,19 +2206,21 @@ static int set_output_buffers(struct msm_vidc_inst *inst, 
		output_buf->buffer_count_actual,

		output_buf->buffer_size);



	buffer_size = output_buf->buffer_size;



	extradata_buf = get_buff_req_buffer(inst, HAL_BUFFER_EXTRADATA_OUTPUT);

	if (!extradata_buf) {

		dprintk(VIDC_DBG,

			"This extradata buffer not required, buffer_type: %x\n",

			buffer_type);

		return 0;

	}

	if (extradata_buf) {

		dprintk(VIDC_DBG,

			"extradata: num = %d, size = %d\n",

			extradata_buf->buffer_count_actual,

			extradata_buf->buffer_size);

		buffer_size += extradata_buf->buffer_size;

	} else {

		dprintk(VIDC_DBG,

			"This extradata buffer not required, buffer_type: %x\n",

			buffer_type);

	}



	buffer_size = output_buf->buffer_size + extradata_buf->buffer_size;

	if (inst->flags & VIDC_SECURE)

		smem_flags |= SMEM_SECURE;
@@ -2256,7 +2258,10 @@ static int set_output_buffers(struct msm_vidc_inst *inst, 
			buffer_info.align_device_addr = handle->device_addr;

			buffer_info.extradata_addr = handle->device_addr +

				output_buf->buffer_size;

			buffer_info.extradata_size = extradata_buf->buffer_size;

			if (extradata_buf) {

				buffer_info.extradata_size =

					extradata_buf->buffer_size;

			}

			dprintk(VIDC_DBG, "Output buffer address: 0x%pa\n",

					&buffer_info.align_device_addr);

			dprintk(VIDC_DBG, "Output extradata address: 0x%pa\n",

drivers/media/platform/msm/vidc/vidc_hfi_helper.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
#define HFI_ERR_SESSION_UNSUPPORT_BUFFERTYPE	(HFI_COMMON_BASE + 0x1010)

#define HFI_ERR_SESSION_BUFFERCOUNT_TOOSMALL	(HFI_COMMON_BASE + 0x1011)

#define HFI_ERR_SESSION_INVALID_SCALE_FACTOR	(HFI_COMMON_BASE + 0x1012)

#define HFI_ERR_SESSION_UPSCALE_NOT_SUPPORTED	(HFI_COMMON_BASE + 0x1013)



#define HFI_EVENT_SYS_ERROR				(HFI_COMMON_BASE + 0x1)

#define HFI_EVENT_SESSION_ERROR			(HFI_COMMON_BASE + 0x2)