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

Commit c99b8972 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: Avoid sending CONTINUE_DATA_TRANSFER packet for venus 3xx"

parents 2108f385 89fa9044

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

+3 −0
Original line number Diff line number Diff line
@@ -2132,7 +2132,10 @@ static int create_3x_pkt_cmd_session_set_property( 
	}

	/* Deprecated param on Venus 3xx */

	case HAL_PARAM_VDEC_CONTINUE_DATA_TRANSFER:

	{

		rc = -ENOTSUPP;

		break;

	}

	default:

		rc = create_pkt_cmd_session_set_property(pkt,

				session, ptype, pdata);

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

+7 −1
Original line number Diff line number Diff line
@@ -2525,7 +2525,13 @@ static int venus_hfi_session_set_property(void *sess, 


	rc = call_hfi_pkt_op(device, session_set_property,

			pkt, session, ptype, pdata);

	if (rc) {



	if (rc == -ENOTSUPP) {

		dprintk(VIDC_DBG,

			"set property: unsupported prop id: %#x\n", ptype);

		rc = 0;

		goto err_set_prop;

	} else if (rc) {

		dprintk(VIDC_ERR, "set property: failed to create packet\n");

		rc = -EINVAL;

		goto err_set_prop;