From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77BF3C11F70 for ; Sun, 4 Jul 2021 23:05:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4068461964 for ; Sun, 4 Jul 2021 23:05:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4068461964 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E92189A8B; Sun, 4 Jul 2021 23:05:23 +0000 (UTC) Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8D54F89A8B for ; Sun, 4 Jul 2021 23:05:22 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id r26so11606351lfp.2 for ; Sun, 04 Jul 2021 16:05:22 -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:mime-version :content-transfer-encoding; bh=kGQc2sDPy1RlhcacoqvnsQtk1TCEx3OXB0l57sVHH4Q=; b=GLX1EdopSbQ4ot9cf5NvEcT0RVW1jhZK/SCwFSbQhgSqGkYh0a0SrMmHK9a+mZGqlG y/o4b6E35sLe+kkRc06k+61cfUqRe4iDqCMXefLhIZVJPT8rpMSygRK+0xwmoqgENoAn MJAFYqWw6/O+w9QbMY6D5WOvxqAftl0qS1LK3Zruk+osNqqIhGjeTBoCqPRqZKtWhkh8 Q08Lda+Ld+vcl9sLS2iJwBrsgBn75YYz5CPb8MrMzmPc80uEHFGUeeUFmgNKIg7dJ/Ft I5Qg8mRK3DnsQsKBMKhm0hgQouds3DgaCWpZwk4jGNAQ4vAOBSJ5Kwc15LiKMR9mPrUw dFtQ== 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:mime-version :content-transfer-encoding; bh=kGQc2sDPy1RlhcacoqvnsQtk1TCEx3OXB0l57sVHH4Q=; b=d/rcUKVQ6FiUt/VjgXxtC5zlvT80qNRBXTsFPQJGuYhc/sUB8tqpflVitIX5K0iTTr TrHxXDka+WVfP66YTeAP4cWXqq3WM4FkKzgx9sTIx7n/bqbjyudPJnDLQKIMwlqOp3b2 abL0Ixsrc3Lom1QizlZ46jw4ZWABqElhb1V/WTbFqmlwK+RhoNIenwgiZgYfTDuiSRj6 eZcBWh9kL2SUIydrtqVitMQ5lyIn+ZeWDPgc1TzvUwV0ZaFtgjDIBhmw4Co1U5klh6ei Dy1IszG7+3zGGo/lmzjx9WUUW3sztNXV5aTAviav/UyhedgrWH7MK2mIlyCpBHUAb0Pn GtJw== X-Gm-Message-State: AOAM533ZA8LXOTAvmRDuI7iVey1KPzbnKJXlBHnSDGDiZ7QqBf5s2ows RtBt3Ml4Rw+wiBWkQU2SrF67ZQ== X-Google-Smtp-Source: ABdhPJybpDYuNzRv2N9KUxmLO5VGHYaAHkmmewK62Od5eXqWP8hwGiE4/L8Ti4rlLpgKiiPeM3B9yw== X-Received: by 2002:a19:408e:: with SMTP id n136mr7834867lfa.412.1625439921033; Sun, 04 Jul 2021 16:05:21 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id s19sm1181859ljj.86.2021.07.04.16.05.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 16:05:20 -0700 (PDT) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH] drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs Date: Mon, 5 Jul 2021 02:05:19 +0300 Message-Id: <20210704230519.4081467-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Marek , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" dpu_hw_ctl_clear_all_blendstages() clears settings for the few first LMs instead of mixers actually used for the CTL. Change it to clear necessary data, using provided mixer ids. Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support") Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index f8a74f6cdc4c..64740ddb983e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -345,10 +345,12 @@ static void dpu_hw_ctl_clear_all_blendstages(struct dpu_hw_ctl *ctx) int i; for (i = 0; i < ctx->mixer_count; i++) { - DPU_REG_WRITE(c, CTL_LAYER(LM_0 + i), 0); - DPU_REG_WRITE(c, CTL_LAYER_EXT(LM_0 + i), 0); - DPU_REG_WRITE(c, CTL_LAYER_EXT2(LM_0 + i), 0); - DPU_REG_WRITE(c, CTL_LAYER_EXT3(LM_0 + i), 0); + enum dpu_lm mixer_id = ctx->mixer_hw_caps[i].id; + + DPU_REG_WRITE(c, CTL_LAYER(mixer_id), 0); + DPU_REG_WRITE(c, CTL_LAYER_EXT(mixer_id), 0); + DPU_REG_WRITE(c, CTL_LAYER_EXT2(mixer_id), 0); + DPU_REG_WRITE(c, CTL_LAYER_EXT3(mixer_id), 0); } DPU_REG_WRITE(c, CTL_FETCH_PIPE_ACTIVE, 0); -- 2.30.2