From patchwork Mon Sep 13 13:13:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509756 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp592709jao; Mon, 13 Sep 2021 07:09:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqY9S04tWUwxTQX4ol7966zMgL6mpd7RipbKNiw52TGnMt3IXmYcF+HI5kG5ekoqekb9Uh X-Received: by 2002:a05:6e02:1a6f:: with SMTP id w15mr8364268ilv.281.1631542164832; Mon, 13 Sep 2021 07:09:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631542164; cv=none; d=google.com; s=arc-20160816; b=JlvsIxDWhg6nDkn4Mi2hNVZBnx3t+/KewBY18/wqB8PIRZlHcrG37+JnsT+LsAXX5x yJqOMx13S3M2L6o8etG8EqGMp2Xd7jehdwC0bxeF3q8YlmBAW0Y0MXioYFwPRVLg664E McGQGApS3se1WI2FtrUBByVRoSIkMjHTURLSsRAm42p0en8x0DUqoQ4RU/Djs+LWjbVx WOsNRayou35pBiqj8xfaWvyIcUmiTyIORBRcvnfwQVZiBjefExaqZuh5p/ERJya6+lpK r/LYVwNcVvz/geTMS6EaHXPTt1XGI1vIL2AX5qOHL8M/V4ftlly4lmzBbWf7x9efBEsE x3lg== 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=4gh8cVIuNV1HbbqavseWkRv0Ww7kWxHCUBr0/F6TTwE=; b=ZO1ycv55/ODaBcum+XuZBt86LyLMhI+wv0Yx0dg8ddClzdQzmV9F5hot+04Tn0m8J6 WHyQ9l7Ysp52Lm85s3ynUBT6PQTX3nyRxAJm0FDs77U+JfzXG6mUQIhRDnZA/fiEZihh mH5ONPKtpVHjkztyW/hlTuVRvaOi5qFzFDedEB9a2WUzhsqVrPF3ubNRbNIaOlO9zeJN HYOY6guJ5pGOn5ZQfYeGuj+daiGDrDoBIs5fc4UXIT+ZrgtX4KJ5d/2irjePcXEqOwus DVGVF6X+R9IDlOjHxboBLK6VUuh9zSMpC/JQBJKNN9fgv+gNwzLgPq4rXpgsTKd6ih1E L8yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Q4AQXl0s; 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 l5si6594915ioa.54.2021.09.13.07.09.24; Mon, 13 Sep 2021 07:09:24 -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=Q4AQXl0s; 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 S244619AbhIMOK0 (ORCPT + 11 others); Mon, 13 Sep 2021 10:10:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:57882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344081AbhIMOIr (ORCPT ); Mon, 13 Sep 2021 10:08:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2EC52613D5; Mon, 13 Sep 2021 13:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540452; bh=sZs57kvddvRBJOtTFUeDBapVneoMoyyRPRCbbpMy0vQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q4AQXl0sJDTo+He1jtnMwA20Uiz8LOu6z9RMJb3Wouf8fJ/lO5BV82Ah4y/N6GovC diPw7Iw5kI7T7FkbmNNJ8G3mEomoDYFLXLHrOcDXPr0PTCZSTrurJ7HL78UunHY8FQ 2Ng3g62GTuuiTRdpULVAONt5EIEX1TDxkmhXmpGE= 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.13 167/300] drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs Date: Mon, 13 Sep 2021 15:13:48 +0200 Message-Id: <20210913131115.056008601@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@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 2d4645e01ebf..e01135b7a404 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);