From patchwork Mon Sep 13 13:14:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509736 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp549884jao; Mon, 13 Sep 2021 06:21:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoA2z3xO1PZop0lbgRYM0EzZMJJMgHAma3M16x/emxiwhfM8VwJIjr6TDVdkZxGj93QONQ X-Received: by 2002:adf:e643:: with SMTP id b3mr12522981wrn.299.1631539310885; Mon, 13 Sep 2021 06:21:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631539310; cv=none; d=google.com; s=arc-20160816; b=LVlTiCtetLWF0Wx2ogEcLx0Cblyeg3r6ohngOe3LSMZ5o5YErbe3RUTQ7pf6u0lRLh dIGmXu3uV3kZFkY/A3qYnkirBUNrgXkCLdxJ8v45Ew0BGK16rI+GNmiNxumXJnE5CPN/ q+lOtitZkh5ry0Cab31oRgEBUtPI0RGJqmF3ALsyMxobHirVkIGjOj/NdpLfsJPIOgMZ kZkkQUg54oFdNhFgRYtc6oOvuacpRJIgttEnALFW7QRM1uHN3tOdyg9GMpPWs/MTLiRf O2jNZ7kZ1i1pvtX4meq78eEWd6hRkGxRV2+gB283NQ5m3xW6kQMrGo3TJGebEEqjj7NC x6KA== 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=XtYJ+J4aixPnGNMJWArHrymD9CjW3WJbIRJa6ICnQOs=; b=Nu5dPTNT8TLJHgsrXqyxGtHnmyRGQzaTxhlQH3nkwGWpycrSW803wXC3MmRfsL37L5 sHtj5CX5hC7GYAY3eIY48ckK02o7QNbaQH17iq7immFMxRb4zxOL4BE0JlCs54wfgLMD UnFOZP+acQSmLOdAlgl+b5CEvzkFRmNisbiArZ7xfHWThcBJZTiFmSAeK4AFYR1g2+f8 7o+H2OJa7+AUmzTvy6wTVUbSJRCfoOo29X8BDpMB/ZidktfpiaeR2zhng5QFTEVEDR3U xLR2FnfNaqxjnqjcRU/L/FoIRfi+IruGgQ/mw5Qm+Y+K+xdOII1tmJMFoEiITXOoEkhR KkGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0sjFculH; 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 1si7333946edv.359.2021.09.13.06.21.50; Mon, 13 Sep 2021 06:21:50 -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=0sjFculH; 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 S240566AbhIMNXD (ORCPT + 11 others); Mon, 13 Sep 2021 09:23:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:37510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240696AbhIMNV2 (ORCPT ); Mon, 13 Sep 2021 09:21:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0935B610A8; Mon, 13 Sep 2021 13:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631539212; bh=oAMR6sjJiAY134kjesPnp2OGnEER7a9bvYx9VfuW0SA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0sjFculH4QlepWAgKCMivxT4NCKYlMssX04F11GJXtOYr3LUwfzxuABR1ZLQl/2xz g0We6fDSiqxbOs9Q0CajWtxZ9r5mKGxSb04ZhP3tb5QnritaSmAeOKcYCNINAYMumG TRbt0r0fe+XjufPrpwtAsddDgbrmBjxdio0p1pvQ= 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 5.4 083/144] drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs Date: Mon, 13 Sep 2021 15:14:24 +0200 Message-Id: <20210913131050.738573311@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131047.974309396@linuxfoundation.org> References: <20210913131047.974309396@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 179e8d52cadb..a08ca7a47400 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -281,10 +281,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); } }