Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp1291272pxy; Thu, 29 Apr 2021 04:02:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyt57D3czJ704ObNv9hwRaR1gh34tLO/PZ5+ZeOfKUC6DCftfQLr7RBczb+YQY+leyK9tKM X-Received: by 2002:a17:906:a0d4:: with SMTP id bh20mr34027539ejb.348.1619694151422; Thu, 29 Apr 2021 04:02:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619694151; cv=none; d=google.com; s=arc-20160816; b=dQVlsqWwiAYdU/bhr4FgvyX2j7XT1FeoYLUnmtAqZzrjVhs3WtEBoF2RxjhcSH1NTC l7jG1tXk44Wn46u+8DTbfc+sJ/YdyxOULnMclrC9P+V0UZu/Ypg+EiXjmJc83Wjlztcm nFDzY7v3O+it+brLEpSB+9vsZn1OtqS3fLgcwADza0tWVE9+KCjnQ63mr1y4oALLL66Y Q/DNW0mCOH2X8jNC3ky57GSl5EBWq2KyQtQ/Q0X07FuqStQg8q7F50QRQSSisjs10Rd4 fSpqQ7GbJVHNXaG3gOZQP3fcRQu6ZqFoMp1VV1ownmaBNiDAgq2a2wbg/RK4Y2oYwNa8 PsDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jYGJrgcD3VZ6SXpUQWlC7sPvB5W5iGe6cdJ7Wlftem4=; b=0nqYIQrbblNkQXNL6fvWS2oNS5/08UHC+hgNgP7lPJ8l5jR0obCENPfm+9Ye1I4T3g 5Sy4vvXsPirDW4ou+yC3y9gOw4k8vTJUt7tX/IiivWIZa6HHQmp2VWnleP0EQcZsYi0T JIZdJlbTDVYgAUF3v7VW2IfndcAW1bziUUBoRzImUKin/KnV+Sd9YuwyeCQn692Bb7OY Cyj5mOotMSoIFVTfAdtavRc5ArgciU/wYjl+hav8HfikvSGCDVEZ3bGODz5q3wjBkMi0 dq/asU6U6B4M3xEaqyhrf0cNiAGNsBhR88Gn/uJLitTNRE6LFmCct9KrOmjxZvovCy7e 1OAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ADIoes40; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id p26si2728402edx.483.2021.04.29.04.02.07; Thu, 29 Apr 2021 04:02:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ADIoes40; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S232108AbhD2K7S (ORCPT + 99 others); Thu, 29 Apr 2021 06:59:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240450AbhD2K7L (ORCPT ); Thu, 29 Apr 2021 06:59:11 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68557C061342 for ; Thu, 29 Apr 2021 03:58:23 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id n2so13263191wrm.0 for ; Thu, 29 Apr 2021 03:58:23 -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 :mime-version:content-transfer-encoding; bh=jYGJrgcD3VZ6SXpUQWlC7sPvB5W5iGe6cdJ7Wlftem4=; b=ADIoes40mv9HPIIbqdGFoDHMemrLKFIIoekd16bjNbrdN0jTPOABBHL6aVDrZtbFQu 7yk3Ot02f5nje4Dfdavqy/n6jXkmJhVsKKM6ODhMiL4XHbz18aF6X0PQo9i6ImbgrUyD OjgKTI+8ledcS6TazyTztiodS79qw9g4xLDhe69oI54YQ33KjU2eGgHAXnqiXBDxJDja lTDSTikmPZZFnJLmwdgeHTAuOzpg6iUEsfE5yipAg1HwUKST/Iud/WqweIL2UAP4Ih7C P2s0cC/MdYNPRPMR19Z782MZ2QXyr0NLZjHVfHlld6ZW9Vn3zqkRax4EK4gJaM0rJfOX 4uNg== 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:mime-version:content-transfer-encoding; bh=jYGJrgcD3VZ6SXpUQWlC7sPvB5W5iGe6cdJ7Wlftem4=; b=QDC7xyFiJekW01wCMXQM0vXds2u+c6pa7sAMM7mGfXM/JJ5Q4Btr0Ke4tHMawvkUzy jzy84OXQzgMUEizsat3QLNuifW9jVwL6Ltbo3oQXVYtH6VaUb1ljOVlVmbX2mpILlJVm v3O2a3lel5TXsgtcPfkwMnmMQG0aRu0B006wTEIU7mPuFYcOdYzSYeGseOMgaA3elFuN jS063+oheXfF9GO5QxuXo3I0aM7+rqjaMv1LghZRp9AmQCfcla0WLvHYifHLhTb7o2Gh c7ehy4sBNrAApGg8GWTWaYvdvv7YX8nhSZLkCHV/KBsPZLyySt5I907lTKljbO54wGey bgsw== X-Gm-Message-State: AOAM532GpFwZOCZL5egnFGh+LTLTSlSqYmqovNlIf4Ibd4sQDCoeVXra AIr4ubMGrmRymdIOSVsU9RXDUA== X-Received: by 2002:a05:6000:2c6:: with SMTP id o6mr164098wry.203.1619693902137; Thu, 29 Apr 2021 03:58:22 -0700 (PDT) Received: from localhost.localdomain (hst-221-29.medicom.bg. [84.238.221.29]) by smtp.gmail.com with ESMTPSA id a9sm3372903wmj.1.2021.04.29.03.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Apr 2021 03:58:21 -0700 (PDT) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-api@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Stanimir Varbanov Subject: [PATCH 2/3] venus: Add a handling of QC8C compressed format Date: Thu, 29 Apr 2021 13:58:14 +0300 Message-Id: <20210429105815.2790770-3-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210429105815.2790770-1-stanimir.varbanov@linaro.org> References: <20210429105815.2790770-1-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds QC8C compressed pixel format in the Venus driver, and make it enumeratable from v4l2 clients. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/helpers.c | 2 ++ drivers/media/platform/qcom/venus/vdec.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c index 9b8ff76e3c43..3a0b07d237a5 100644 --- a/drivers/media/platform/qcom/venus/helpers.c +++ b/drivers/media/platform/qcom/venus/helpers.c @@ -561,6 +561,8 @@ static u32 to_hfi_raw_fmt(u32 v4l2_fmt) return HFI_COLOR_FORMAT_NV12; case V4L2_PIX_FMT_NV21: return HFI_COLOR_FORMAT_NV21; + case V4L2_PIX_FMT_QC8C: + return HFI_COLOR_FORMAT_NV12_UBWC; default: break; } diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 5e5584fc21e9..d4cc51fc019c 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -31,6 +31,10 @@ */ static const struct venus_format vdec_formats[] = { { + .pixfmt = V4L2_PIX_FMT_QC8C, + .num_planes = 1, + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, + }, { .pixfmt = V4L2_PIX_FMT_NV12, .num_planes = 1, .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, @@ -696,7 +700,13 @@ static int vdec_output_conf(struct venus_inst *inst) inst->output2_buf_size = venus_helper_get_framesz_raw(out2_fmt, width, height); - if (is_ubwc_fmt(out_fmt)) { + if (is_ubwc_fmt(out_fmt) && is_ubwc_fmt(out2_fmt)) { + inst->output2_buf_size = 0; + inst->opb_buftype = HFI_BUFFER_OUTPUT; + inst->opb_fmt = out_fmt; + inst->dpb_buftype = 0; + inst->dpb_fmt = 0; + } else if (is_ubwc_fmt(out_fmt)) { inst->opb_buftype = HFI_BUFFER_OUTPUT2; inst->opb_fmt = out2_fmt; inst->dpb_buftype = HFI_BUFFER_OUTPUT; -- 2.25.1