From patchwork Thu May 4 08:00:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 679123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 828A5C7EE21 for ; Thu, 4 May 2023 08:01:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbjEDIBa (ORCPT ); Thu, 4 May 2023 04:01:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbjEDIB3 (ORCPT ); Thu, 4 May 2023 04:01:29 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1C6335A2 for ; Thu, 4 May 2023 01:01:27 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2ac80fe9facso1095361fa.3 for ; Thu, 04 May 2023 01:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683187286; x=1685779286; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:from:to:cc:subject:date:message-id:reply-to; bh=UKfCQ7oGwGPPqXZQ3aJ0ZDJ1Cq02ffMWgWKavhP3FMk=; b=OCbpz2/JL1GKJRn1a0KJVijPSjPYlLyMDv8bEl5Ox0lliaW3pnTjLN4TyPnmJ0m7P/ UoTMo3Nlc0Ks9VwxZ0Jm8l5dJOcO7x80W0UAN3yn2RmETo41GqV6YDtlzakWGV6R+U2L lzUQMwJ7P9koytIoJWukoBvR8+eF1Mg/yEfUxApYsuC2R8zQ0/to46epQc+DXobk+ohp soJtyJ+1VzFkcvnPZ4zeH2FYF12rnsbmmXKwMCHi5kVPfERJh70GRM5N3upZ6qU7j55k pkfQ+lOZejmm+lxNQvTpIivH8hHGo85XFpFqDssoZAxJGpjhTQfD/jbA+DwLvO4aJQ3o Yr/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683187286; x=1685779286; h=cc:to:content-transfer-encoding:mime-version:message-id:date :subject:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UKfCQ7oGwGPPqXZQ3aJ0ZDJ1Cq02ffMWgWKavhP3FMk=; b=Lp+ZbrbhW30Vlnf73WpXAEi1TF28vX8bjkis/RK+RnTe4oWgu23IQWH5SrlVTP8aGe 9k9KL300uCZt4eV0h3sqE/sPhe04dHIVSVl7K9Nve0VrpN0ID1G9HIPUk3yU6fZo16xw 6uuoNy10id9dulMuqIJWhT57i4PZdMl/p+BjeR9KlNhcfje1GVVIJciGHDeLcOFBIBOM 3fdBr+0C5Ydb57s5clrNCqFeBbTBW0Lkh0D0G5L0sQSJJwlSTI0P987kqYYq/yV19i6w GsCaTR+O6Rfr7iBGLTsQedm/7FPk0h6YtWd8r5slO0ok9G8seGLTcPNYeBraX4s9fd+R Nx0A== X-Gm-Message-State: AC+VfDxcAUMxYUcQZnq/NT2h/lQtP9cmTthpjxNtytEvbiAlz9RyjmNh j3hY6zqsZT9jRMQ2ooYNVdRxlg== X-Google-Smtp-Source: ACHHUZ7am1RRkZ8Sc7m+l2FmARoz8//M3blPO+LwbYWvDuPgp0QcQozPU0DQCGq7Ct2XY8F3WtGDIw== X-Received: by 2002:a2e:8242:0:b0:2a8:d146:12cd with SMTP id j2-20020a2e8242000000b002a8d14612cdmr708401ljh.17.1683187285974; Thu, 04 May 2023 01:01:25 -0700 (PDT) Received: from [192.168.1.101] (abyl248.neoplus.adsl.tpnet.pl. [83.9.31.248]) by smtp.gmail.com with ESMTPSA id n26-20020ac2491a000000b004edc512515fsm917165lfi.47.2023.05.04.01.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 01:01:25 -0700 (PDT) From: Konrad Dybcio Subject: [PATCH v2 00/18] Venus QoL / maintainability fixes Date: Thu, 04 May 2023 10:00:56 +0200 Message-Id: <20230228-topic-venus-v2-0-d95d14949c79@linaro.org> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIADlmU2QC/22NQQ6CMBBFr0Jm7ZhSFEZW3sOwKHWESUhLWmg0h LtbWbt8L/n/bRA5CEdoiw0CJ4niXQZ9KsCOxg2M8swMWulKaU24+FksJnZrxEaxqXrb1DUR5EV vImMfjLNj3rh1mrKcA7/kfSQeXeZR4uLD5yim8mf/n6cSFV7JaktU0YVv90mcCf7swwDdvu9fX jO8IbwAAAA= To: Stanimir Varbanov , Vikash Garodia , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Dikshita Agarwal , Bryan O'Donoghue , Mansur Alisha Shaik , Jonathan Marek , Hans Verkuil , Dikshita Agarwal Cc: Mauro Carvalho Chehab , Stanimir Varbanov , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Marijn Suijten , Konrad Dybcio , Vikash Garodia , stable@vger.kernel.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1683187284; l=3947; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=g8caXHzolWKJFFUH0lTGkLSyyvJcODU6gNhXgru7KZw=; b=RSVmsgJ0YO3P5dGd36GiY9k/kLomJabqfxZTeBEzwhNlP+IniWLWwfZ+VPb0xn1U8j/0asU1q Bor1BqUPEffBC3Koiz0GgzR0alRK167TZ3qyh0LhP09bRGkE2PbV7md X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org v1 -> v2: - Move "Write to VIDC_CTRL_INIT after unmasking interrupts" up and add a Fixes tag & Cc stable - Reword the comment in "Correct IS_V6() checks" - Move up "media: venus: Remap bufreq fields on HFI6XX", add Fixes and Cc stable - Use better English in "Use newly-introduced hfi_buffer_requirements accessors" commit message - Mention "Restrict writing SCIACMDARG3 to Venus V1/V2" doesn't seem to regress SM8250 in the commit message - Pick up tags (note: I capitalized the R in Dikshita's 'reviewed-by' and removed one occurrence of random '**' to make sure review tools like b4 don't go crazy) - Handle AR50_LITE in "Assign registers based on VPU version" - Drop /* VPUn */ comments, they're invalid as explained by Vikash - Take a different approach to the sys_idle problem in patch 1 v1: https://lore.kernel.org/r/20230228-topic-venus-v1-0-58c2c88384e9@linaro.org Currently upstream assumes all (well, almost all - see 7280 or CrOS specific checks) Venus implementations using the same version of the Hardware Firmware Interface can be treated the same way. This is however not the case. This series tries to introduce the groundwork to start differentiating them based on the VPU (Video Processing Unit) hardware type, fixes a couple of issues that were an effect of that generalized assumption and lays the foundation for supporting 8150 (IRIS1) and SM6115/QCM2290 (AR50 Lite), which will hopefully come soon. Tested on 8250, but pretty please test it on your boards too! Signed-off-by: Konrad Dybcio Reviewed-by: Vikash Garodia Reviewed-by: Vikash Garodia Reviewed-by: Vikash Garodia --- Konrad Dybcio (18): media: venus: hfi_venus: Only consider sys_idle_indicator on V1 media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts media: venus: Remap bufreq fields on HFI6XX media: venus: Introduce VPU version distinction media: venus: Add vpu_version to most SoCs media: venus: firmware: Leave a clue for homegrown porters media: venus: hfi_venus: Sanitize venus_boot_core() per-VPU-version media: venus: core: Assign registers based on VPU version media: venus: hfi_venus: Fix version checks in venus_halt_axi() media: venus: hfi_venus: Fix version checks in venus_isr() media: venus: hfi_venus: Fix version check in venus_cpu_and_video_core_idle() media: venus: hfi_venus: Fix version check in venus_cpu_idle_and_pc_ready() media: venus: firmware: Correct IS_V6() checks media: venus: hfi_platform: Check vpu_version instead of device compatible media: venus: vdec: Fix version check in vdec_set_work_route() media: venus: Introduce accessors for remapped hfi_buffer_reqs members media: venus: Use newly-introduced hfi_buffer_requirements accessors media: venus: hfi_venus: Restrict writing SCIACMDARG3 to Venus V1/V2 drivers/media/platform/qcom/venus/core.c | 11 ++-- drivers/media/platform/qcom/venus/core.h | 15 ++++++ drivers/media/platform/qcom/venus/firmware.c | 19 +++++-- drivers/media/platform/qcom/venus/helpers.c | 7 +-- drivers/media/platform/qcom/venus/hfi_helper.h | 61 +++++++++++++++++++--- drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +- .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 22 ++++---- drivers/media/platform/qcom/venus/hfi_platform.c | 2 +- drivers/media/platform/qcom/venus/hfi_venus.c | 45 ++++++++-------- drivers/media/platform/qcom/venus/vdec.c | 10 ++-- drivers/media/platform/qcom/venus/vdec_ctrls.c | 2 +- drivers/media/platform/qcom/venus/venc.c | 4 +- drivers/media/platform/qcom/venus/venc_ctrls.c | 2 +- 13 files changed, 138 insertions(+), 64 deletions(-) --- base-commit: 92e815cf07ed24ee1c51b122f24ffcf2964b4b13 change-id: 20230228-topic-venus-70ea3bc76688 Best regards,