From patchwork Fri Apr 2 10:06:42 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: 414344 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1285231jai; Fri, 2 Apr 2021 03:07:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymalJ7wqOcJj0njKxtYUoq9RWRnaTuKGQ1Ou/CobG5AKla0pZAWzeFh1qpXAGJc1jta/Cb X-Received: by 2002:a05:6638:3a8:: with SMTP id z8mr12158843jap.111.1617358079495; Fri, 02 Apr 2021 03:07:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617358079; cv=none; d=google.com; s=arc-20160816; b=fFO9bXOemQg3GN5ZRJMRB+YyRQcFlw2DS1qUyYTmv2jP7U+zQDzGnW4VflZc9YVTqj NGsvr8Zsx8cjvNjM+ioxe1E0n9gSW5N6GNuUR0+ya4lHlEwGwblLkUT/OtQTFxjs2cAE ocbsyqg494w3qQqUmIsP9flyJ1/S5itvJIq4J/0WlbTyf5tFOAkFtHCx5hPwM9RA3A4j 5/Q3AsCYwz55mN7zsuXvdKTkwqwInn+EHpDO/NCZXPsGHjkcVx0HhsYFrwXKtyUOlAfa 1favd4DMhBgSmgab6ikwDd/onoqzBS858zJhZ5pZ5ZjSQqntH159kI8Zq2zbN+SQGS05 OGqA== 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=sqmzV4pfroiyXv7Okp+NwIqGaoKA31AvZjPcny2idug=; b=AlWQEiKYEpYRPJ1lyenoHm2o7YQvtHGnZnHUXH4my4cCzJLWK6jNVS5Q6qGVRZxgxI n9w2Gg6sMSFGTERlAVmeFOc8tu0Je6lIMGeZaNaA9wzr6Vd0gTUyRtAcsZlPU3f8znyj ry1M1MnUvhBwEIP8RtouC7PlpA2I5+6+TpjBaav+HUkmmAtkz8WAunj6ERYCNTeUe8VH VZxLNtzTGI48krLwmJGmrB5oiiJ016vZe+5tjhYOTnFf/TP5wNsxw6eat3pHbWV5SUS8 OtDmUvaDDjEBsPTBEXODZSETe2TNwYA6AyRNj0Omk/y7MxaUEHZmNtV0W3Rm9zQXK0ex ej8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a1rbYVvs; 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 g2si6942838ile.30.2021.04.02.03.07.59; Fri, 02 Apr 2021 03:07:59 -0700 (PDT) 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=a1rbYVvs; 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 S235076AbhDBKFo (ORCPT + 17 others); Fri, 2 Apr 2021 06:05:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234975AbhDBKFi (ORCPT ); Fri, 2 Apr 2021 06:05:38 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5154C0613E6 for ; Fri, 2 Apr 2021 03:05:37 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id b9so4302910wrt.8 for ; Fri, 02 Apr 2021 03:05:37 -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=sqmzV4pfroiyXv7Okp+NwIqGaoKA31AvZjPcny2idug=; b=a1rbYVvsr4kkCLsIMttVKIs27enfxZtgtCHerxFRah3TqGm5M+0p+s7VqS11dTF3jr XqX5K9Coy0t+sYRWGOtSWu1pMbjUZoUjxn7y5WlUd8MxhHv8fr/gE8CATt5jv3p3w7KO PjB888lM5POJ3/xQeuBi7xAxOPoImaswhfyJF5xKrM4+KbWfDehwJpdJlJx7qDbqwq6E txCcODVnCKBorbeDOd52iN0f664mYluYuPbtiHrQVhXVlppmMghSmYpz0nkigQyVY8zQ gZl1me+SfueMuIgG0r55jQUJiRRJC4SC8xHp7lb4bj9xhCpNksjUJZxWC0taKtm1SSfV 5+Ww== 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=sqmzV4pfroiyXv7Okp+NwIqGaoKA31AvZjPcny2idug=; b=ePQkKaEZYqdLOUdlXD11JTPzRs741BbGiVtsOtA6ZP/rtwP9qIQoV/ohXOOyb3f2qq XqbGFdHTd7zMbDuih47kPILqT+Dg0aIa4v+jvNiiptNtUqUoDSZsrSUbmjzlict+MzJ1 7+lCZuSOLXjJL333FI0uY36qm10BzUnnWMQhpIgQZtxaCdUuDFhdb2yMxhP20GXIhny3 z2FxunXI7oKFwuc3K9Igbw+Z0hrs+ahY10dBDp8zjwtdSvvZ5JYwaVmajL3NeBUN8JUX 8O/12Dy+RXIXWSpkvw8eB4eVWvaLtUq6puVrzeLc7hakBMngrbrslzD2LIJkfmoGT8WG DGHw== X-Gm-Message-State: AOAM5319h5It7tG3QHG/zBr1y/X14yUQF1/s1KlJDsTPExCzI4nHrCBy dDCwxKpcsE31oQ1+PMov/0IU2Q== X-Received: by 2002:a05:6000:1281:: with SMTP id f1mr14577666wrx.243.1617357936357; Fri, 02 Apr 2021 03:05:36 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id v18sm15466618wrf.41.2021.04.02.03.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 03:05:35 -0700 (PDT) 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 v3 19/25] media: venus: pm: Toggle 6xx wrapper power in vcodec_control Date: Fri, 2 Apr 2021 11:06:42 +0100 Message-Id: <20210402100648.1815854-20-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210402100648.1815854-1-bryan.odonoghue@linaro.org> References: <20210402100648.1815854-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Dikshita Agarwal When in vcodec_control_v4() on the 4xx path we select between one of two vcodec cores to toggle power control bits. In 6xx there is only one core which offsets the relevant control registers to a slightly different address. This patch accounts for the address offset for 6xx silicon. Signed-off-by: Dikshita Agarwal Co-developed-by: Bryan O'Donoghue Signed-off-by: Bryan O'Donoghue Acked-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/pm_helpers.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.30.1 diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c index a91dc24de2a4..dfe3ee84eeb6 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -414,7 +414,10 @@ static int vcodec_control_v4(struct venus_core *core, u32 coreid, bool enable) u32 val; int ret; - if (coreid == VIDC_CORE_ID_1) { + if (IS_V6(core)) { + ctrl = core->wrapper_base + WRAPPER_CORE_POWER_CONTROL_V6; + stat = core->wrapper_base + WRAPPER_CORE_POWER_STATUS_V6; + } else if (coreid == VIDC_CORE_ID_1) { ctrl = core->wrapper_base + WRAPPER_VCODEC0_MMCC_POWER_CONTROL; stat = core->wrapper_base + WRAPPER_VCODEC0_MMCC_POWER_STATUS; } else {