From patchwork Sat Feb 11 23:12:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 652729 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 5EDD1C636CC for ; Sat, 11 Feb 2023 23:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229477AbjBKXNM (ORCPT ); Sat, 11 Feb 2023 18:13:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjBKXNL (ORCPT ); Sat, 11 Feb 2023 18:13:11 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93C5E126F7 for ; Sat, 11 Feb 2023 15:13:10 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id dr8so23872682ejc.12 for ; Sat, 11 Feb 2023 15:13:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U1IpVFQllNnmxH9bVf/0phfBgT76t1Ev0s5bNBdEqIA=; b=KSrLTVCHmr2C9Jh0XMLL9wD/ZA1rEuYcSy8G1MmjTI7JlM4NOwFIe2nZlUVTuhncc8 YjqLRWC8xLodw5SdQDKg2GbvbXo6VQWAmz2U9J0hbiPVvX/Vx9O7hjUmqFlyKR9wq7fy WtjR+Ixr6esVOTSiWBj1+DO+9eUtAM0YJPyLQWjS4kYIYLGOBb9F1/TxIT0YrCMP3Zbq 8q0TyC5AZY2miE8kc2fHxcM5IRhAcTUnqhT5Ws3M0+FPN2AVUegdm7wQi65YXXG8/4hv 0v29KMcKWDZWK1X67zGK9KlNJ4AYOwkqG5KSk2FbGfU5PBWFBsb9bAIh07rHCrmzpt7r fRMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U1IpVFQllNnmxH9bVf/0phfBgT76t1Ev0s5bNBdEqIA=; b=3Bo5ox+Kw1ngVEhFU/VfpJuQ4JsOUGlzvahdrWqAIrP4y/lSUdzmtWiZCqXsSTiGfo Av2kptsHOOaoeU9hFtXpDODoErKWTja4IgcRjSP44kIRZSn5b+z3rhrAT54Ph7t7uy3X rRpfOUpxUEpJmDhBc5UhxAy+eDowvYMRdOhYi3lRdytmsI+dabs7NrxYsa3Cg1wcIv4s iz4g/GPuYb8OkVFJfE/kYuERRk0uDwh6rey8OeMzhabQWI+2FXrd0EJrlsupCbMRkV1C UrPvBnW3Qy4Bx+aNF/J5pT5sb7hLIYF/BlUpzXNiczI78+atswHjXGVLy/dS4wyawosk 50OQ== X-Gm-Message-State: AO0yUKVnxQHtIDjREzY+3A3OV98izyJHn3MaMADwz3cCLwSHB7XOA+C9 KFtwJXO4nKS59uhb4HZ6zfnT5g== X-Google-Smtp-Source: AK7set+GZIhF15cn+A7I0w/qaEN410sfJjsqKydJSbrh5X4/R1rNfAEsenShZO8CdYPNEZ1VFCFKug== X-Received: by 2002:a17:907:160e:b0:8aa:c035:a651 with SMTP id hb14-20020a170907160e00b008aac035a651mr17278188ejc.37.1676157189154; Sat, 11 Feb 2023 15:13:09 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id k20-20020a1709061c1400b00871390a3b74sm4517149ejg.177.2023.02.11.15.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 15:13:08 -0800 (PST) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Cc: Stephen Boyd , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v2 06/50] drm/msm/dpu: correct sm8550 scaler Date: Sun, 12 Feb 2023 01:12:15 +0200 Message-Id: <20230211231259.1308718-7-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211231259.1308718-1-dmitry.baryshkov@linaro.org> References: <20230211231259.1308718-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org QSEED4 is a newer variant of QSEED3LITE, which should be used on sm8550. Fix the DPU caps structure and used feature masks. Fixes: efcd0107727c ("drm/msm/dpu: add support for SM8550") Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c index 192fff9238f9..c4e45c472685 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -458,7 +458,7 @@ static const struct dpu_caps sm8450_dpu_caps = { static const struct dpu_caps sm8550_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0xb, - .qseed_type = DPU_SSPP_SCALER_QSEED3LITE, + .qseed_type = DPU_SSPP_SCALER_QSEED4, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_40, .has_src_split = true, @@ -1301,13 +1301,13 @@ static const struct dpu_sspp_cfg sm8450_sspp[] = { }; static const struct dpu_sspp_sub_blks sm8550_vig_sblk_0 = - _VIG_SBLK("0", 7, DPU_SSPP_SCALER_QSEED3LITE); + _VIG_SBLK("0", 7, DPU_SSPP_SCALER_QSEED4); static const struct dpu_sspp_sub_blks sm8550_vig_sblk_1 = - _VIG_SBLK("1", 8, DPU_SSPP_SCALER_QSEED3LITE); + _VIG_SBLK("1", 8, DPU_SSPP_SCALER_QSEED4); static const struct dpu_sspp_sub_blks sm8550_vig_sblk_2 = - _VIG_SBLK("2", 9, DPU_SSPP_SCALER_QSEED3LITE); + _VIG_SBLK("2", 9, DPU_SSPP_SCALER_QSEED4); static const struct dpu_sspp_sub_blks sm8550_vig_sblk_3 = - _VIG_SBLK("3", 10, DPU_SSPP_SCALER_QSEED3LITE); + _VIG_SBLK("3", 10, DPU_SSPP_SCALER_QSEED4); static const struct dpu_sspp_sub_blks sm8550_dma_sblk_4 = _DMA_SBLK("12", 5); static const struct dpu_sspp_sub_blks sm8550_dma_sblk_5 = _DMA_SBLK("13", 6);