From patchwork Tue Sep 3 08:40:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1979922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WyfGP60dwz1ygj for ; Tue, 3 Sep 2024 18:40:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1slP5Z-00028m-7G; Tue, 03 Sep 2024 08:40:37 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1slP5W-0001zU-Od for kernel-team@lists.ubuntu.com; Tue, 03 Sep 2024 08:40:34 +0000 Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8395E3F183 for ; Tue, 3 Sep 2024 08:40:34 +0000 (UTC) Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-53440ff1ecfso5328337e87.3 for ; Tue, 03 Sep 2024 01:40:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725352834; x=1725957634; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9bQKU86Hm2BDi5PpHvmdAadCboYXHnySN3xuZzsGPxE=; b=siPJ3/VPybdPf7C6mksxVHIwjXC+k6KmpKmRNhV5TIm93otcj5zWzwK35okIAU45RE C9yab8QeF25p19/+57dUcOv1OkN4d6wm9B66kDTcz7yGxHhXFm/yBujtRpz/9MSiSMGy /aMJHM2Y8YkCF5DcEDu5d+cxMFvGLmOtx+ybAqtThsSmI2lbTTeSWV3Ce65jX9nKT3l5 ukg/Az3fp9VuQiz1U6Xc5pGdpXa7VYOjcKocUTzbjMHzMVbeaYxLbcRz6nmHVp5jNF84 bqXNzxqtLmvZI1Fsedy+zyKuO43TeR/+36bSG8MhdIZGKbZEaRa+QK4YUuTL8Kjv/BC/ 2Hpw== X-Gm-Message-State: AOJu0YwpE19IYxXMqo4iPogaEw/kF2aZaXK1JDLne9A8TBNKZrSFK1xn WNwX/STZ/QcEKYEojyNlaMDMZGv1ODu9GveGscl0GKLn5SI98gc77Yw+0Wx97sBvcFsK1a54DA4 gzsV6J5rIMm8tHS2siSYN7FgjtPKeJKPtYr6Qwv8n86wewQSej6y1sVRm/pUll6ORKtV9IyXP2I Y+XkQGRSQctg== X-Received: by 2002:a05:6512:39d0:b0:533:44e8:5565 with SMTP id 2adb3069b0e04-53546b8d88cmr8810185e87.46.1725352833735; Tue, 03 Sep 2024 01:40:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2Ytphdff0W1IQqao2fQVThMDKooeJRlP/FrFuU1BWBsSBVyD5nMCIEAAfYPl8CebK4l6tDw== X-Received: by 2002:a05:6512:39d0:b0:533:44e8:5565 with SMTP id 2adb3069b0e04-53546b8d88cmr8810145e87.46.1725352832912; Tue, 03 Sep 2024 01:40:32 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a898919fcb4sm655957966b.132.2024.09.03.01.40.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 01:40:32 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [O][PATCH 15/21] UBUNTU: SAUCE: media: venus: core: Add SC8280XP resource struct Date: Tue, 3 Sep 2024 10:40:04 +0200 Message-ID: <20240903084010.3746280-16-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903084010.3746280-1-juerg.haefliger@canonical.com> References: <20240903084010.3746280-1-juerg.haefliger@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Konrad Dybcio Add SC8280XP configuration data and related compatible. Signed-off-by: Konrad Dybcio Reviewed-by: Bryan O'Donoghue Link: https://lore.kernel.org/r/20230731-topic-8280_venus-v1-6-8c8bbe1983a5@linaro.org [ johan: rebase on 6.9-rc1; convert vcodec_pmdomains ] Signed-off-by: Johan Hovold (cherry picked from commit 6e5c9e63424b63a57df814041709c1bdff1c690e github.com/jhovold/linux) Signed-off-by: Juerg Haefliger --- drivers/media/platform/qcom/venus/core.c | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 3d99fa9c1d21..75af4aff014c 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -989,6 +989,50 @@ static const struct venus_resources sc7280_res = { .fwname = "qcom/vpu-2.0/venus.mbn", }; +static const struct freq_tbl sc8280xp_freq_table[] = { + { 0, 239999999 }, + { 0, 338000000 }, + { 0, 366000000 }, + { 0, 444000000 }, + { 0, 533000000 }, + { 0, 560000000 }, +}; + +static const struct venus_resources sc8280xp_res = { + .freq_tbl = sc8280xp_freq_table, + .freq_tbl_size = ARRAY_SIZE(sc8280xp_freq_table), + .reg_tbl = sm8350_reg_preset, + .reg_tbl_size = ARRAY_SIZE(sm8350_reg_preset), + .bw_tbl_enc = sm8250_bw_table_enc, + .bw_tbl_enc_size = ARRAY_SIZE(sm8250_bw_table_enc), + .bw_tbl_dec = sm8250_bw_table_dec, + .bw_tbl_dec_size = ARRAY_SIZE(sm8250_bw_table_dec), + .clks = { "core", "iface" }, + .clks_num = 2, + .resets = { "core" }, + .resets_num = 1, + .vcodec0_clks = { "vcodec0_core" }, + .vcodec_clks_num = 1, + .vcodec_pmdomains = (const char *[]) { "venus", "vcodec0" }, + .vcodec_pmdomains_num = 2, + .opp_pmdomain = (const char *[]) { "mx", NULL }, + .vcodec_num = 1, + .max_load = 7833600, /* 7680x4320@60fps */ + .hfi_version = HFI_VERSION_6XX, + .vpu_version = VPU_VERSION_IRIS2, + .num_vpp_pipes = 4, + .vmem_id = VIDC_RESOURCE_NONE, + .vmem_size = 0, + .vmem_addr = 0, + .dma_mask = GENMASK(31, 29) - 1, + .cp_start = 0, + .cp_size = 0x25800000, + .cp_nonpixel_start = 0x1000000, + .cp_nonpixel_size = 0x24800000, + .fwname = "qcom/vpu-2.0/venus.mbn", +}; + + static const struct of_device_id venus_dt_match[] = { { .compatible = "qcom,msm8916-venus", .data = &msm8916_res }, { .compatible = "qcom,msm8996-venus", .data = &msm8996_res }, @@ -998,6 +1042,7 @@ static const struct of_device_id venus_dt_match[] = { { .compatible = "qcom,sdm845-venus-v2", .data = &sdm845_res_v2 }, { .compatible = "qcom,sc7180-venus", .data = &sc7180_res }, { .compatible = "qcom,sc7280-venus", .data = &sc7280_res }, + { .compatible = "qcom,sc8280xp-venus", .data = &sc8280xp_res }, { .compatible = "qcom,sm8250-venus", .data = &sm8250_res }, { .compatible = "qcom,sm8350-venus", .data = &sm8350_res }, { }