From patchwork Mon Sep 13 13:14:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509747 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp568515jao; Mon, 13 Sep 2021 06:42:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmmK+VAAxsQ+OqWxylFHxBBQf9c66tF4/BgrxbasTtwW68ZKlcyzd2nmDdGcXhmBSkYrlD X-Received: by 2002:a50:c90a:: with SMTP id o10mr971791edh.361.1631540572922; Mon, 13 Sep 2021 06:42:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631540572; cv=none; d=google.com; s=arc-20160816; b=1IcJW9/g4Wa080RHj/fLB2rfOrfc2Ipla9Q2hf+aH/ghm9mFTx47fWZZypugbivZ9P VY1b8fj+8P7lEs/NnhXVdkT79DlvhOTI7EULYIKVq6j4niBbLcDW/nvJneMfqNYwyQwa PPU509qWMVUpAyGm7KT+5m7Lr21o7DuOZ1ydIcbFLxLxe5AFStaWughR+t7VEko0MgSR X4yWe66Gy/3hcW4nrPSEEOlWFrUfXOFSqSiPyNG233oY+5SHmyDspDpJoWrudiY/Zfey kJtlVhO4XI0hbMpO1zv//1a3r3l++gaLkTKOeoHElTGNSAQoggFxvppUiaSxKFLI2Fnq Rbng== 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=m63xDE/iAp/2gbJkhSwIRSWqUqBnDPPKmtvNrjMCC8w=; b=gNxh6oyO1ngPlcfTfgao0raC7L1GDpemAnU12F4L++wo8IdfXbRB32tC3Qdq25oH4C sian7hQeODySTvG6aIr+UQOYTW/rnFbVlStYAUoYJOBKP9YxXzSpmz9ypOcN0sxodo2r NJTTvZZ4w/0HodCp9lTis8K8xOgSsJy2w3aruh0O5g76yYPewQ4svREY7a929FUEtdV6 qwCEEiEWwrEUDFBEtO6q5TVhG6l+0lVaDwqVBhzEI9UDladMNWFWaRejfpLnOkJY1qgf tHK0Kv43hhAg9oLrNZbICIcdoJM6TG5TJP6w8H+XUrRI7S/sHTqSnpr6ffw5tI5dgO3Y j2aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=W3+P0QH3; 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 ia17si2658668ejc.261.2021.09.13.06.42.51; Mon, 13 Sep 2021 06:42:52 -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=W3+P0QH3; 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 S241581AbhIMNoE (ORCPT + 11 others); Mon, 13 Sep 2021 09:44:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:46524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242650AbhIMNmB (ORCPT ); Mon, 13 Sep 2021 09:42:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6909B61354; Mon, 13 Sep 2021 13:29:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631539792; bh=n1fzEh8BglQyvMQT+P5Pol8uCH4i0Nhg/xP7DY9oYuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W3+P0QH3liXIgXHxCjsTPpORiZ9SCanefXfSi2GzcsbfySOZJvbwxDQtYZ5tyQX2T BOs45eZyl8ZZC1bpV+d/Kgtyk2Tf5Ha3HdeaDrk/kKn+MckvCWAdPw7csnksZSUDsI 7VGgemjfBQ/vXDMDigxwQUUPA7lQrCfD1XSEeFIA= 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.10 135/236] drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs Date: Mon, 13 Sep 2021 15:14:00 +0200 Message-Id: <20210913131104.957159343@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131100.316353015@linuxfoundation.org> References: <20210913131100.316353015@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 758c355b4fd8..f8c7100a8acb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -340,10 +340,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); } }