From patchwork Tue Apr 24 12:44:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 134103 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2199993lji; Tue, 24 Apr 2018 05:54:54 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+arHzsC/O9VSX9+TNAnWTbHUcOqW+7DKA7hrIaFDOUzX1JlV3Y/wZb24EO/pCJlW1WBueE X-Received: by 10.98.35.11 with SMTP id j11mr14387596pfj.177.1524574493848; Tue, 24 Apr 2018 05:54:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524574493; cv=none; d=google.com; s=arc-20160816; b=BXsbc2yJajNB8CLMUUXCSJNcSXhvPa1cNR7oC6PyhRtfu3mTR9KgkaddDepWBUE3Kr iQMfjj4VbCV/CQ5egzG7egtCZe2+ApwiKm54P5EBQv5R9pojX3mXYrJ7VHiIBKolDE+8 4lVx08SWdBKOBSH7d92CDp0X52fMbYIhACtSS04Opm0aW3CH0qTuF9cXGtGpWHF4scLs BUmww+MaDtMFMX2qaUQpmkLaY15FX9wSyQUAl0JKTbrcVBlWDcdQzWIXqlf2zzk3ety+ ivsnxMtj0PQ4pfs6WzQAWuLR0pd+UPSMjQ9TZ8oo27Gz/jCSOH62ewZtfZe6Iqn9topz tnHw== 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=UJY1ElvCAePNUPkqjsGk3ZluUk9SleoeEVToFWcXc0U=; b=YjSRCTmZihQyCbzzsS57FEIX4uyVeLd3hYk6OnhIJTtUkDewRzvoL/QSZ/8HUbhmcu 8rwRTWtfhc1uoneJ9Rs5ZPCXvxlFjhLL0R9jxB/45+6ZSWv5cCiY4c+nBxkzYYyvbNdH Ku5dt7JncgCkiTqhjE53KkU9Rh8xwgahFhGgIz1oXdmLqfHO+KwBPRKY9OtMZbma94NO HRJW0PtpsyIR7FE764b/MmxvpBISPk4mslwWDgXHw72VmSZVTwOR7wq3WcMb6TcjiZNA fceBmRVBJ5/c7ECws6uWLxk79jwyiyM+UhXSZDZNDCruzaiUMKxfeYq4qyDulXGzwKhh DLnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PL1i9Vqw; 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 x124si11859917pgb.651.2018.04.24.05.54.53; Tue, 24 Apr 2018 05:54:53 -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=PL1i9Vqw; 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 S1757801AbeDXMyu (ORCPT + 29 others); Tue, 24 Apr 2018 08:54:50 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:37416 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757813AbeDXMpP (ORCPT ); Tue, 24 Apr 2018 08:45:15 -0400 Received: by mail-wr0-f196.google.com with SMTP id c14-v6so9689134wrd.4 for ; Tue, 24 Apr 2018 05:45:14 -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=UJY1ElvCAePNUPkqjsGk3ZluUk9SleoeEVToFWcXc0U=; b=PL1i9Vqww/nxWSnJ7GKIIelU3Sb421JXQHWPaXnETRFKX/Yip4DsUZsDqVLzvGVe5c CZYO+DGbCPIzS4gSsdfKZyc0lZipXceLgPtlsYerPmlfj3UKMnbX+XbE+SWQ7Ib3spHe Jhvvtfk/dYKICDENhdvXVLeDcOcwHKA0gyZFc= 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=UJY1ElvCAePNUPkqjsGk3ZluUk9SleoeEVToFWcXc0U=; b=TZA0e9o4Q8gjKRHgg9ah8+xPhtrPY50hFb5uSG28EfL7UMS2Mmpg+79BDejS0cfmy0 hKM8lK3Xm4l5lVRoHhtv6Nx+1CRnL82x7rjuy96uNuQRH+M6Yp4v3I5Llx0c+FTr1nTk KRfLaeNwNkbL4C3Z+0M17lXBBWwVdIny4mcd3QN2wtHNvXSAty8LAo18UJxKH5ejNnhm C58ZR6D/a0vXOTX6UK8Etz+Ydz04R4Em2W7a1zfkKScI0LgvZR2nKWmRwCwlOFqdYJod kAznhLj1v2NYJJgtl6FJ2K1fxWGqkhuPT+HRCkOk/y82qF7N3njLIr6lxS+Do8f5PyQP HnUA== X-Gm-Message-State: ALQs6tA4oTJJA3fELC1IuMpJE17y477JtsFlmIigG29dkjl7wksspm9w XV72jfnvQsq5ygo5x7vhgRmh+w== X-Received: by 2002:adf:dbc6:: with SMTP id e6-v6mr21542147wrj.212.1524573913665; Tue, 24 Apr 2018 05:45:13 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id n49-v6sm22666013wrn.50.2018.04.24.05.45.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 05:45:13 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Vikash Garodia , Stanimir Varbanov Subject: [PATCH 06/28] venus: hfi: handle buffer output2 type as well Date: Tue, 24 Apr 2018 15:44:14 +0300 Message-Id: <20180424124436.26955-7-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180424124436.26955-1-stanimir.varbanov@linaro.org> References: <20180424124436.26955-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 adds handling of buffers of type OUTPUT2 which is needed to support Venus 4xx version. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/hfi.c | 3 ++- drivers/media/platform/qcom/venus/hfi_msgs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.14.1 diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c index cbc6fad05e47..a570fdad0de0 100644 --- a/drivers/media/platform/qcom/venus/hfi.c +++ b/drivers/media/platform/qcom/venus/hfi.c @@ -473,7 +473,8 @@ int hfi_session_process_buf(struct venus_inst *inst, struct hfi_frame_data *fd) if (fd->buffer_type == HFI_BUFFER_INPUT) return ops->session_etb(inst, fd); - else if (fd->buffer_type == HFI_BUFFER_OUTPUT) + else if (fd->buffer_type == HFI_BUFFER_OUTPUT || + fd->buffer_type == HFI_BUFFER_OUTPUT2) return ops->session_ftb(inst, fd); return -EINVAL; diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c index 5970e9b1716b..023802e62833 100644 --- a/drivers/media/platform/qcom/venus/hfi_msgs.c +++ b/drivers/media/platform/qcom/venus/hfi_msgs.c @@ -825,7 +825,8 @@ static void hfi_session_ftb_done(struct venus_core *core, error = HFI_ERR_SESSION_INVALID_PARAMETER; } - if (buffer_type != HFI_BUFFER_OUTPUT) + if (buffer_type != HFI_BUFFER_OUTPUT && + buffer_type != HFI_BUFFER_OUTPUT2) goto done; if (hfi_flags & HFI_BUFFERFLAG_EOS)