From patchwork Mon Feb 22 16:02:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 385782 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp1394393jap; Mon, 22 Feb 2021 08:02:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzA1LQ9B05S1j5HBdRXWr8YcqSVAWfssU1JW90D30uKkYb7PxfvAs4LrfEXLrbrRxj7PjIC X-Received: by 2002:a50:fd8a:: with SMTP id o10mr1809155edt.381.1614009756950; Mon, 22 Feb 2021 08:02:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614009756; cv=none; d=google.com; s=arc-20160816; b=A/sNr+1dkj5jDKP2RXsISUHD1OQsyp+PDhQuSkJHGA3yBgNmBgdTkMEb92iXVPIJyX w6Jwfx/dq8Cct1ZWmsK/+W1YEbrfIbrUkTihvbIjD3amRMxiGPNdzGPfvhzf13gOYEHS rg/TulaRrES2wVWTTAGz2Z1xUBBo1+zxY9BpKU2H6mxfNdl7B+fxjUNKldUgLvSHOMqa /b0Y4C2pH4x5g8BPHmPqgIntzoqMJAiOSCgM20AQICN4MPxx6xiwX1XbdfuqWwmBGKFj iJ+B7rREvOUAhDjAd51JHReMI55xI+XZ3HBEqUe8m340f4Szp4eLL0LNuxOxEJq2Tidh snPw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=9tiKYSNVVxvrJJec/EA3lPH66CJHgRPb1f0eRGNilkQ=; b=F0/GwcmwZYPkJFzRtPIvmLN12e5gg/bkA0YLPF42AIjzN0fSZC3mQrnBGajJb7zwqN szxqRLJ9QB9gY7ZgI5E0w+xIbOzsse1CXyyg3vlD/dLqokpfN2Jd56x8hHAqLRfvssiY euEm8W9Q5R/eH0Axl2Aax5Skg0ACJoNak1yk65qzT4jr+7rPHOMYXHOnY3Vq5zMuiT/Y Rv64D/q5/pQ25KCkdoTTgAF0XtuMLaI3JQtpft8v0jY2/XxJohG2BFrp0UsSvA8c8rUy mLCOUZuCo9Nj44pxvaexhoqDHpaVITLfl5KGBgzsREabrOF8A1/ZwzlOE5F2HkTF4h/X I8bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wt/Z6QMd"; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-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 z7si13128571edm.477.2021.02.22.08.02.36; Mon, 22 Feb 2021 08:02:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-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="wt/Z6QMd"; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-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 S230071AbhBVQCX (ORCPT + 16 others); Mon, 22 Feb 2021 11:02:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230207AbhBVQCS (ORCPT ); Mon, 22 Feb 2021 11:02:18 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2069C061574 for ; Mon, 22 Feb 2021 08:01:37 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id r3so7987261wro.9 for ; Mon, 22 Feb 2021 08:01:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9tiKYSNVVxvrJJec/EA3lPH66CJHgRPb1f0eRGNilkQ=; b=wt/Z6QMd2HHnKxPYMSZ7bXm3dKEnIixS61HVHe4/kPYDk+UoKWJ47qgpQOsTVoJ0SY IfzK6ky4z0K5iDi+f6x9VacVTiL2u2BdzpN3HTzCAcM/Tb/Z2mUljTy9yAWiu3/2Usc1 bCG2h+U/HUFqtI+c5OT3cV2zCSATEIRagnQHcj/bnnzNYX76ka5WiQFmjCHzCBOGFylo cwCS/BCJ+6cD78Et+DwqLum3AfZsRe3x1MDRgG8GDoVnz/CSR6+FqyNtoMG97a8vfMOW D25w0CxyKN1STNYB806nuWI7dsHWtJPT+qKemOwxTWhWjRUuOGUWxgeneZKqtzOG5Ebw sW2g== 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:mime-version :content-transfer-encoding; bh=9tiKYSNVVxvrJJec/EA3lPH66CJHgRPb1f0eRGNilkQ=; b=oF3bERPuIHJI0QsKYmPitv0vygrlZUECp+rx4DoAifwEirKdfQG7N+96uKxBXEEYG2 pgQfhWTizvDM8Epl5Txanna92Q2uU7pU9e/gj/5JkGmuu8U43YhW0p9/jR3AhGRdmM0D U/ZLyA8cx52FxSiZO/x3vCt/j3gduCujn13CsuR0bYgGIG+fCfpJIMTbXsCuXlqJ3SE0 nHUkyJnay75seJic/00UtDsVuKBkschqMU4/sebT01QycvClfX0SBjXspRCz7aUIUSS5 JffvJxMacrN3UMfCRhOgCVmTpseLZUA+2vjipxyQGQ7wRteQ5P4nYur6N/mEn3GVhz4Z ioXg== X-Gm-Message-State: AOAM532unN39bs3NwHeK7umNaHPwRrgIDimVlcTKhmoMqSzqgJ/zfPtS 1fU6hsFR692KHonpXPqcdIDasw== X-Received: by 2002:a5d:6b42:: with SMTP id x2mr21834165wrw.117.1614009696665; Mon, 22 Feb 2021 08:01:36 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c3sm7373697wrw.80.2021.02.22.08.01.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 08:01:36 -0800 (PST) From: Bryan O'Donoghue To: stanimir.varbanov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: bryan.odonoghue@linaro.org, dikshita@codeaurora.org, jonathan@marek.ca, vgarodia@codeaurora.org Subject: [PATCH 00/25] media: venus: Enable 6xx support Date: Mon, 22 Feb 2021 16:02:35 +0000 Message-Id: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This series enables support for 6xx venus encode/decode as found on the sm8250. The new silicon has different base addresses for existing functional blocks within the venus address space. We add a base address offset mechanism to handle this. The offsetting mechanism has been validated on 6xx and 4xx hardware. The sm8250 supports: - h264 - h265 - vp8 - vp9 The driver changes are contingent on yaml and dts patches already in-flight. yaml: pending https://www.spinics.net/lists/devicetree/msg406892.html dts: pending https://lore.kernel.org/linux-arm-msm/20210222132817.1807788-1-bryan.odonoghue@linaro.org/T/#t clk: applied https://kernel.googlesource.com/pub/scm/linux/kernel/git/clk/linux/+/clk-next Applies on top of https://git.linuxtv.org/svarbanov/media_tree.git / venus-for-next-v5.12-part2 Bryan O'Donoghue (11): media: venus: Update v6 buffer descriptors media: venus: core: add sm8250 DT compatible and resource data media: venus: core: Add io base variables for each block media: venus: hfi,pm,firmware: Convert to block relative addressing media: venus: core: Add differentiator IS_V6(core) media: venus: core: Add an io base for TZ wrapper regs media: venus: core: Add an io base for AON regs media: venus: core: Hook to V6 base registers when appropriate media: venus: hfi: Read WRAPPER_TZ_CPU_STATUS_V6 on 6xx media: venus: hfi, vdec: v6 Add IS_V6() to existing IS_V4() if locations media: venus: pm: Hook 6xx pm ops into 4xx pm ops Dikshita Agarwal (12): media: venus: core,pm: Vote for min clk freq during venus boot media: venus: hfi: Define block offsets for V6 hardware media: venus: hfi: Define additional 6xx registers media: venus: hfi: Add a 6xx boot logic media: venus: hfi: Add 6xx interrupt support media: venus: hfi: Add 6xx AXI halt logic media: venus: pm: Toggle 6xx wrapper power in vcodec_control media: venus: firmware: Do not toggle WRAPPER_A9SS_SW_RESET on 6xx media: venus: helpers: Add internal buffer list for v6 media: venus: helpers, hfi, vdec: Set actual plane constraints to FW media: venus: hfi: Increase plat_buf_v6 o/p buffer count. media: venus: helper: Decide work mode Stanimir Varbanov (2): media: venus: core,pm: Add handling for resets media: venus: vdec: Fix decoder cmd STOP issue drivers/media/platform/qcom/venus/core.c | 78 ++++++++ drivers/media/platform/qcom/venus/core.h | 19 ++ drivers/media/platform/qcom/venus/firmware.c | 34 ++-- drivers/media/platform/qcom/venus/helpers.c | 80 +++++++- drivers/media/platform/qcom/venus/helpers.h | 3 +- drivers/media/platform/qcom/venus/hfi_cmds.c | 15 +- .../media/platform/qcom/venus/hfi_helper.h | 9 +- .../platform/qcom/venus/hfi_plat_bufs_v6.c | 2 +- .../platform/qcom/venus/hfi_platform_v6.c | 138 +++++++------- drivers/media/platform/qcom/venus/hfi_venus.c | 177 +++++++++++++----- .../media/platform/qcom/venus/hfi_venus_io.h | 118 ++++++++---- .../media/platform/qcom/venus/pm_helpers.c | 92 ++++++++- drivers/media/platform/qcom/venus/vdec.c | 14 +- drivers/media/platform/qcom/venus/venc.c | 2 +- 14 files changed, 584 insertions(+), 197 deletions(-) -- 2.29.2