From patchwork Fri Aug 18 14:16:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 110390 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp889393obb; Fri, 18 Aug 2017 07:16:50 -0700 (PDT) X-Received: by 10.99.191.6 with SMTP id v6mr8654038pgf.212.1503065810898; Fri, 18 Aug 2017 07:16:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503065810; cv=none; d=google.com; s=arc-20160816; b=Rg/Bs11uczH1CDODWrsviHKImIUvHn3QCWnDKxrTpruDfyTaq8qOCxPHUckJ9FBpS7 1GfnIR1Hv5OtI4NdtYea95Yx5tZHH9jXAQo+k2ubbjnkbIrwhjXngbwxkMlxSevoC+Aw wvJolbSQbxOHgCg+TRLtVG1en8PeSJxXeTtOszBYKRwfmopjxt8Dn08NA7+b3xGsVTNM CaURKMd7sWtEu11aasMKxjEdf4LyBZ1OmZd+kAZwOlm40wF9qsthNKMaY1XoGwvAmG7K LmItPO1vtM61150FkyBQDopWz3OcSjkDpuPxt6qLizESL9WELTqV67JVqDxc78lYRP6S n/tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=fPvxh0qR9CW6WhPE5CJMXBqbGYGNaBIq2sr3FMXrPZM=; b=ITtH4xa1EY2IHQd2lFv2kJpvA35v0I5hwobLrJw0qqIAJQfLqRGfFRuCpIyy9l5X3X jTErO+BEcwlg6SK9ZbsvBzAsEoWHfFWlpplobTk1+lsg/2RGTG9NnhXRzDXeRQlkYZd/ FyoeKoc+MioCGA69I75nJteOSPwLJ3K5Q0j3nEptI9auND5XuOpl8MzaDrKT5Hue1EyX b49enq92N9yzYla2JzrYTRkfNuRY4MXkGcHGKEg6/tblvMim4mQC1RsD6CX1Sp3boFnF PN4bdBqExTXcdfefqEjvR/2CAF8BarrAXi0VqSwh0I0a7DbLiNd33XGlsm85RKojJ16N x0+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EaJLf6li; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u10si3957256plu.864.2017.08.18.07.16.50; Fri, 18 Aug 2017 07:16:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EaJLf6li; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753508AbdHROQt (ORCPT + 26 others); Fri, 18 Aug 2017 10:16:49 -0400 Received: from mail-wr0-f179.google.com ([209.85.128.179]:36358 "EHLO mail-wr0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753124AbdHROQq (ORCPT ); Fri, 18 Aug 2017 10:16:46 -0400 Received: by mail-wr0-f179.google.com with SMTP id f8so27683397wrf.3 for ; Fri, 18 Aug 2017 07:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fPvxh0qR9CW6WhPE5CJMXBqbGYGNaBIq2sr3FMXrPZM=; b=EaJLf6liG2i161ib+BVCt3tJMdsmV5GWeYW8mTXE+WElQxyGF9q/4VkE7YvhGEmvlO s9c+0tFV8uO8RrCxQcTC5rWWnghy38lTjOoIma9bsluXPxdPb/TgUJNdgitwEaK4rlHw cM8N7X9K25RbUI4bkxviEU8z+nCxEvM6f7HMY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fPvxh0qR9CW6WhPE5CJMXBqbGYGNaBIq2sr3FMXrPZM=; b=V9A/K4DLJubS/Ert7lHSV2ZSquwN7snSLdul2bVRHLm8Tyo9kXXPoqg0lck9BZxzKk PavyepVh0qGMSN3sdZpyEpcf97M3VgNT7cq4Bm1NweFkTUf29XKvlpZYeHyVUq7Pmbg1 XPqED3t4XXdvWz4bTqffebejUdR740rXIgdNUvwWOaw6jxFveFbFzSCRDskFE2ul2F3r d7hPZqnWLU4iTF2nRtsd6jAajMX0SKB85ZrbIur8a8R11890PYDnNKVvflrUV0ux/8H6 bzbrhccYMt0Q48MQ2iy98hJV6fWgdGIhDZ8C+Kux8vq7qm5fUJPToK9uFNng9dWKK62C clyQ== X-Gm-Message-State: AHYfb5gYKqum3GI3rZ4Szt6fTnvnCrAuyIcsfvdJkKMJSHQERjAG3nZX La91phDnP84Tsaa5 X-Received: by 10.223.160.240 with SMTP id n45mr5361589wrn.74.1503065805474; Fri, 18 Aug 2017 07:16:45 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id 55sm1387383wrv.32.2017.08.18.07.16.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Aug 2017 07:16:45 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: Pawel Osciak , Marek Szyprowski , Kyungmin Park , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stanimir Varbanov Subject: [PATCH 2/7] media: venus: venc: set correct resolution on compressed stream Date: Fri, 18 Aug 2017 17:16:01 +0300 Message-Id: <20170818141606.4835-3-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170818141606.4835-1-stanimir.varbanov@linaro.org> References: <20170818141606.4835-1-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This change the alignment restriction for output type of buffers only, also set corect input resolution and fill bidirectional vb2 queue flag in order to map output type buffers read/write. The last is needed by encoder firmware to add padding at the bottom of output (input buffers). Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/venc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.11.0 diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 39748e7a08e4..01af1ac89edf 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -289,7 +289,7 @@ venc_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f) pixmp->height = clamp(pixmp->height, inst->cap_height.min, inst->cap_height.max); - if (inst->core->res->hfi_version == HFI_VERSION_1XX) + if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) pixmp->height = ALIGN(pixmp->height, 32); pixmp->width = ALIGN(pixmp->width, 2); @@ -747,8 +747,8 @@ static int venc_init_session(struct venus_inst *inst) if (ret) return ret; - ret = venus_helper_set_input_resolution(inst, inst->out_width, - inst->out_height); + ret = venus_helper_set_input_resolution(inst, inst->width, + inst->height); if (ret) goto deinit; @@ -1010,6 +1010,8 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, src_vq->allow_zero_bytesused = 1; src_vq->min_buffers_needed = 1; src_vq->dev = inst->core->dev; + if (inst->core->res->hfi_version == HFI_VERSION_1XX) + src_vq->bidirectional = 1; ret = vb2_queue_init(src_vq); if (ret) return ret;