From patchwork Mon Sep 20 16:40:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 514345 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2280936jao; Mon, 20 Sep 2021 10:38:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9xs2Cmpo5Bwoa0Ao84cibj5YcFpVLSMV3FlW0Z4NrSo5T1HENIV+yy5I4+lLvvncQxU5f X-Received: by 2002:a05:6e02:1a67:: with SMTP id w7mr18033034ilv.24.1632159519549; Mon, 20 Sep 2021 10:38:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632159519; cv=none; d=google.com; s=arc-20160816; b=g1ItiLuGhw9vAg3idJUFGXbHHwzk4o/9Qg1DwRDT0ybiEQKZVf9jtFlv0kYr3fk2Jw Sj+rIzlzCQGvdNpCccBMm3qkwwy7q85q66Q7+QjcJHLCdyM44gJD976K201QnRdDPluK lC+ADAyPDg8eQ6MxR13HBn0EuhHbyVhbdjpeXuIy+5ggu7r+p/uJdJJJ4oPckbE9nT4u HVHB17PI2MC3Fg2xH6hDmRFwPsK0ixy+cR3ns6rSDQ4AS5qd2MZ+mKU2WInDEYf/Q4Ru gvSQAXZ41EbqPW1z2YZvjbqESwq03qAxMnqEWWkr3qIb5LBKc5C2NtWQCj8y11oxLkqy tl7Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iBZUTkfVehrhruvZD9/hTYPGEmrGFpE69+Bsg8ZOTaY=; b=InVIQW6sh4vpZXS9HAx477SKwM4h/dIEl1GWRSTxjVzqNC9VEUa4jr2QUCiAhLo8YF 0HM2yoy3/bFT7U0FBpOw3MRuAC55pVUl017dAjcppy3wZIf1eGk0How3DWEAaDVmNV8E 1ttSioZhI2fsMSIkZ9DjueItxv/9sKgR8z2c4iLSzchfIXb7DRM6w1unXsM6EccrBIBM yCR9zZRyXG4NcbtEMlUj+wraUpc8KetUHiQTjeQOdjmpfqpXuyMTHv5uUy+zhaEZytRk 7gnB8HJS3aB4eZHkvk2XpdvSuGdlE3lOz3EriKG7sagjs2OWXPo6l1CDsVNgAtb0WLDy Pasw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YZf6Rzea; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i185si13671545iof.61.2021.09.20.10.38.38; Mon, 20 Sep 2021 10:38:39 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=YZf6Rzea; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348030AbhITRkA (ORCPT + 11 others); Mon, 20 Sep 2021 13:40:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:42622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352094AbhITRhs (ORCPT ); Mon, 20 Sep 2021 13:37:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1457161B31; Mon, 20 Sep 2021 17:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157624; bh=4HeXLVWGu15t8OzVzGD9ee3B3H4cMlCbN/2q9IrAUqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZf6RzeaPBNI3KGwlPuP3TicoXb8bUCOnyR5meuocOnyqbtS3WDDBJEWWGX24BNOk gWb9k6pQ2x1N+AiOG5NF8IEHkdU/9mgCI6fIDmZP2thgRvEa8T4bGAcKS9yyk7Owub k8O/ExV9/zR2X0b6VZGR0bZBjYM220MGw80h0O0M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Baryshkov , Rob Clark , Sasha Levin Subject: [PATCH 4.19 077/293] drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs Date: Mon, 20 Sep 2021 18:40:39 +0200 Message-Id: <20210920163935.900630287@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163933.258815435@linuxfoundation.org> References: <20210920163933.258815435@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Baryshkov [ Upstream commit a41cdb693595ae1904dd793fc15d6954f4295e27 ] 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 Link: https://lore.kernel.org/r/20210704230519.4081467-1-dmitry.baryshkov@linaro.org Signed-off-by: Dmitry Baryshkov Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.30.2 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 79bafea66354..a40ea5c68572 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -296,10 +296,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); } }