From patchwork Mon Jan 16 03:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 643150 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 37769C54EBE for ; Mon, 16 Jan 2023 03:47:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231846AbjAPDrN (ORCPT ); Sun, 15 Jan 2023 22:47:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232012AbjAPDqk (ORCPT ); Sun, 15 Jan 2023 22:46:40 -0500 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEDB5E3AC for ; Sun, 15 Jan 2023 19:45:12 -0800 (PST) Received: by mail-lf1-x135.google.com with SMTP id bf43so40965850lfb.6 for ; Sun, 15 Jan 2023 19:45:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bpZugCp0iqPjSJZH6BP8uqG8YkG5mOk4bwsPsZ6EI0w=; b=x9tGvIQEZIN9acMaoW7tv3Peke+BJR0KHL+y3BiOwyTEqhA3ITpmrUM+byz9r6aLk1 vCUSlNb2FFER4Qp5kRJArM3jANFgx4t+0wisQZgIWev8HPdpe3eOvXK1qu2azGkM8ZJB Xazki5AEl4AZG7nZZJQe6vGNTDnOug2ZjnuYJIRF/kni938+oEQODIzBRaFaIvg2htpT Lg8cLR5UearQ90a6GtOWSpA9lAf3xE4zXxOktl3S+xPQ2jt+9tRCYmNBeHpteql5VHrT h3ZBvN2PBncMlmm5Phbjc2Rb9o1ZJAZGvXwqgl/OXbi0qA0tUfUmOjKMVjTwl2mLpQ34 Lejw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bpZugCp0iqPjSJZH6BP8uqG8YkG5mOk4bwsPsZ6EI0w=; b=DYObP3ZjQgTFssfejs/SHSNHipchBvATW0wZggT5Mi+dnMRHShMcZ5SAGkoNXN3CA/ gWVPzv0hJW324KzAtezX/vwwuWnxa4p9VeKmZXzT1OHSnzo/4l3G3obXlT3JPdJ7g/Pu cTRoWA0rzsBiIHaHSviP6pd9xFVgFG2BqHjFY2Y5uxBqkGJqv/ORMe++TZDUnfkr1RJc m01sqXT74sCoulgXiN6nnIy/WON+ZZSwf98R8IRy5R+w12yrdiPtvmc5R4ek5T9bHRNJ YNfsPk02H+vFkEiLBqiwpsZJ7+PqsxPCDnYmJfW5jPuP4boaMX6GchYsLp5OZjqu8oBh 35hw== X-Gm-Message-State: AFqh2kqOyo/dlVRmwxxAxtkLFNWhZkISgVZTqz4tdWicytKIUxGuQi3o FdnXNN4gYgv/d7F81cNsz0hhEZbO95VzzMkudAz+Vg== X-Google-Smtp-Source: AMrXdXuLG/9P1ouZcz3jM7pieQCq5MfUNroufXuppRXLeyNSqLrUQQRuLl3H3pz9NZwtp3B+x8z6rg== X-Received: by 2002:a05:6512:2985:b0:4a4:68b9:1a0a with SMTP id du5-20020a056512298500b004a468b91a0amr24025377lfb.50.1673840676936; Sun, 15 Jan 2023 19:44:36 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id w14-20020a05651203ce00b004cb43c9bf9asm4869494lfp.208.2023.01.15.19.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:44:36 -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] drm/msm/dpu: enable sourcesplit for sc7180/sc7280 Date: Mon, 16 Jan 2023 05:44:35 +0200 Message-Id: <20230116034435.569512-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org According to the vendor dts files, both sc7180 and sc7280 support the source split mode (using two LMs for a single output). Change these two platforms to use MIXER_SDM845_MASK, which includes DPU_MIXER_SOURCESPLIT. Rename MIXER_SC7180_MASK to MIXER_QCM2290_MASK, since this platform doesn't seem to support source split mode. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 22ad996e9014..835d6d2c4115 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -56,7 +56,7 @@ #define MIXER_SDM845_MASK \ (BIT(DPU_MIXER_SOURCESPLIT) | BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA)) -#define MIXER_SC7180_MASK \ +#define MIXER_QCM2290_MASK \ (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA)) #define PINGPONG_SDM845_MASK BIT(DPU_PINGPONG_DITHER) @@ -1464,9 +1464,9 @@ static const struct dpu_lm_sub_blks sc7180_lm_sblk = { }; static const struct dpu_lm_cfg sc7180_lm[] = { - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SC7180_MASK, + LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK, &sc7180_lm_sblk, PINGPONG_0, LM_1, DSPP_0), - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SC7180_MASK, + LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK, &sc7180_lm_sblk, PINGPONG_1, LM_0, 0), }; @@ -1499,11 +1499,11 @@ static const struct dpu_lm_cfg sm8150_lm[] = { }; static const struct dpu_lm_cfg sc7280_lm[] = { - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SC7180_MASK, + LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK, &sc7180_lm_sblk, PINGPONG_0, 0, DSPP_0), - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SC7180_MASK, + LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK, &sc7180_lm_sblk, PINGPONG_2, LM_3, 0), - LM_BLK("lm_3", LM_3, 0x47000, MIXER_SC7180_MASK, + LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK, &sc7180_lm_sblk, PINGPONG_3, LM_2, 0), }; @@ -1518,7 +1518,7 @@ static const struct dpu_lm_sub_blks qcm2290_lm_sblk = { }; static const struct dpu_lm_cfg qcm2290_lm[] = { - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SC7180_MASK, + LM_BLK("lm_0", LM_0, 0x44000, MIXER_QCM2290_MASK, &qcm2290_lm_sblk, PINGPONG_0, 0, DSPP_0), };