From patchwork Wed Jun 27 15:27:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 140355 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1033710ljj; Wed, 27 Jun 2018 08:36:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIhmWEcuFzMpLmiJiPM8rZJt7s7G6CiHN6025W2qXJ/tt5cEvQeNb+cE84triIk1LlpvMLf X-Received: by 2002:a17:902:280b:: with SMTP id e11-v6mr6588678plb.298.1530113760296; Wed, 27 Jun 2018 08:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530113760; cv=none; d=google.com; s=arc-20160816; b=EMmgSbGm7HSPaL3LnSBgNHq6PsR+DgtFC3hiS5sw4pSNMOd6FN4RypN3fq8CWvlZSr zMN0Uf265JR0L7rsh2Z/nPMLv4ruAySKz69cpRwwpYVpirZSOpJuDKmZ1adT2OeE+6ep RK1fWMr+6KbZ12XCJOGH2pcBeuA0MBKwifMV30C7yYZRRj3/Ai7rLztMhqu/bBjLfykS knfOywK0adWpgGsFMpPUMb1XGlIJxAGRtOEKeDqRmmtcrmFR+kz8rAHbEfDG1pjGg92H O+xueDXq+cf5seknyCb0USVvJZPQVAjZ4kOgzwi+m9TYMs4FyoQefMVg/8ZTf20KCJvp YJtA== 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=2Rjs/riZGr/2boEAWhRGcdDD/iS7glDtXPe+puCnQcc=; b=BpUc3fXPUUGsFDx/yGg0bWcYEWKqeBUnXS9kZWbTnGKKNH5oBgalx1VVyXg3dB8p7p LHvtXHgTmgfnEU1t28LyTM46vRiLmkIQYpqXXd9XG+NFM6exDJ/c7OhRvGgoHpgrpg6p zoVrqjIhDZWga7EVK3VYYGlPwIjdAZMfntKtvI83qi0LVQYc2uTB8k8UeqgOWh6AvYdB 48Ixp+ZOvAMWrbE5r6+7wygwY8kInQqMKAkqac3ZQDgJqaV7RPZpYl1TBbLj83hSPv53 vfTmqmxCtc02PjW/dtQCb6pt6ePNw+Oqgf7E5nwPRpTp22OsP5hfaW/lYlheIxCNwEQK TPLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hCuv2CtK; 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 139-v6si3643674pgc.87.2018.06.27.08.35.59; Wed, 27 Jun 2018 08:36:00 -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=hCuv2CtK; 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 S1754848AbeF0Pf6 (ORCPT + 31 others); Wed, 27 Jun 2018 11:35:58 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:54762 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934816AbeF0P2D (ORCPT ); Wed, 27 Jun 2018 11:28:03 -0400 Received: by mail-wm0-f65.google.com with SMTP id i139-v6so6278019wmf.4 for ; Wed, 27 Jun 2018 08:28:03 -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=2Rjs/riZGr/2boEAWhRGcdDD/iS7glDtXPe+puCnQcc=; b=hCuv2CtK71qx8GGpe4YRlSobtrXClSJc4/fLMU7sVHLikFcXbDQpBf0su5Bl7Q662h vNv7fOt5ecYFpYfPWyS2KVIBwtpALoALFltCkZqGzkBAV4GF8cOD+p5yIBcpi0djjR1G 1YC6BRPPHD7KOBP/tTauo3h+GNbka1S6/AiZA= 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=2Rjs/riZGr/2boEAWhRGcdDD/iS7glDtXPe+puCnQcc=; b=jkFSVJ9LoDdxCFXnVAO1wCv+H99CD5pXz+4nsVFjLK1P2kKOqxRZe1TjRWOIwHqkqf URQ1ryt3fVUvSHQzjBD+BL8VE24HJYQaqcwp3K0FY2ke0lEEkHTRgDjZK9ZqPPtNSfqa nCCqOKC+qN2G6uek4XLrecpYFxre6bVeDJ/QogcEHgHVfOyI2Q2f1dxzeneIc8JkOu+4 O0CK+fsL85Iab2wm6ZuNHABZcoo44yIqtAm8MwpctFyLv5GVTEbJwSl3ghK5zyIEfISh 0TU0sGouOcpuNKXXO4Z6BD9ruVij+CGVh4EEvVGHvGJ8SOLRBH6ArVoCjbU5vKRuzT2l /c7Q== X-Gm-Message-State: APt69E2+H3qdL9E86fNaOPEzOgA8S+SHKX9bSkRegX6sbSZ6q3AdhGkK TDrTUb1j7TstJ177DCWvL8JfqQ== X-Received: by 2002:a1c:b1d7:: with SMTP id a206-v6mr5512528wmf.61.1530113282349; Wed, 27 Jun 2018 08:28:02 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id o203-v6sm2916075wmd.30.2018.06.27.08.28.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 08:28:01 -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 , Tomasz Figa , Stanimir Varbanov Subject: [PATCH v4 04/27] venus: hfi_cmds: add set_properties for 4xx version Date: Wed, 27 Jun 2018 18:27:02 +0300 Message-Id: <20180627152725.9783-5-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180627152725.9783-1-stanimir.varbanov@linaro.org> References: <20180627152725.9783-1-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adds set_properties method to handle newer 4xx properties and fall-back to 3xx for the rest. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/hfi_cmds.c | 62 +++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c index 1cfeb7743041..e8389d8d8c48 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -1166,6 +1166,63 @@ pkt_session_set_property_3xx(struct hfi_session_set_property_pkt *pkt, return ret; } +static int +pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt, + void *cookie, u32 ptype, void *pdata) +{ + void *prop_data; + + if (!pkt || !cookie || !pdata) + return -EINVAL; + + prop_data = &pkt->data[1]; + + pkt->shdr.hdr.size = sizeof(*pkt); + pkt->shdr.hdr.pkt_type = HFI_CMD_SESSION_SET_PROPERTY; + pkt->shdr.session_id = hash32_ptr(cookie); + pkt->num_properties = 1; + pkt->data[0] = ptype; + + /* + * Any session set property which is different in 3XX packetization + * should be added as a new case below. All unchanged session set + * properties will be handled in the default case. + */ + switch (ptype) { + case HFI_PROPERTY_PARAM_BUFFER_COUNT_ACTUAL: { + struct hfi_buffer_count_actual *in = pdata; + struct hfi_buffer_count_actual_4xx *count = prop_data; + + count->count_actual = in->count_actual; + count->type = in->type; + count->count_min_host = in->count_actual; + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*count); + break; + } + case HFI_PROPERTY_PARAM_WORK_MODE: { + struct hfi_video_work_mode *in = pdata, *wm = prop_data; + + wm->video_work_mode = in->video_work_mode; + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*wm); + break; + } + case HFI_PROPERTY_CONFIG_VIDEOCORES_USAGE: { + struct hfi_videocores_usage_type *in = pdata, *cu = prop_data; + + cu->video_core_enable_mask = in->video_core_enable_mask; + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*cu); + break; + } + case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE: + /* not implemented on Venus 4xx */ + break; + default: + return pkt_session_set_property_3xx(pkt, cookie, ptype, pdata); + } + + return 0; +} + int pkt_session_get_property(struct hfi_session_get_property_pkt *pkt, void *cookie, u32 ptype) { @@ -1181,7 +1238,10 @@ int pkt_session_set_property(struct hfi_session_set_property_pkt *pkt, if (hfi_ver == HFI_VERSION_1XX) return pkt_session_set_property_1x(pkt, cookie, ptype, pdata); - return pkt_session_set_property_3xx(pkt, cookie, ptype, pdata); + if (hfi_ver == HFI_VERSION_3XX) + return pkt_session_set_property_3xx(pkt, cookie, ptype, pdata); + + return pkt_session_set_property_4xx(pkt, cookie, ptype, pdata); } void pkt_set_version(enum hfi_version version)