From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EC06384; Thu, 13 Jun 2024 12:41:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718282469; cv=none; b=Fr0zRtdfIb867fGxw4nixdOsUEAAsUx280oKETHTAS7PnTR83XREWJK4Zje7QjItnkngn34+BtNwO/rT9g08dD95WIVAXenepckEDJl0gjMgri5y455tk/gMWG8sfmWKkYNdumAnivPUXAkx0DuOy/6k9jXeoubmpFvvlQEZwBI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718282469; c=relaxed/simple; bh=3/yal2EHHqY39k9mrKJmZ8SOTjEVmyuUxmIh0oxFpZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=geFkznYln30LDX+hTgjiS0BLpUNUaM+afvovGch2V3mOV7rYMZzQYhU9dedyQTcOIIfsCEGqY8Yfze3Uz8yvv69MUZiM8sGV4Z/T0//A1u1MOz9DmktaTyXZHn+9bE/hmB8laA139gPhmkP2QwLl6wqrBR5PCgFvPLhq7RTV1W4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BqEKkTdf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BqEKkTdf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CEF5C2BBFC; Thu, 13 Jun 2024 12:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718282468; bh=3/yal2EHHqY39k9mrKJmZ8SOTjEVmyuUxmIh0oxFpZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BqEKkTdfHflZ7hV7L7sFCYafYD+1uUrFkrBe6zXktBDshTnZUVd/n3+tGl4xeGyON L8FXMkAlET1P9t+0ED6+e/Rt0NGg2z1QNsVfoCDCVJwJVQZQ/okPrnjQqBDW7sMrK3 pTJz3nAhCd6ZMLU1x0qeo0wC9hSMQvbdSL6RxQxI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marijn Suijten , Dmitry Baryshkov , Sasha Levin Subject: [PATCH 5.15 257/402] drm/msm/dpu: Always flush the slave INTF on the CTL Date: Thu, 13 Jun 2024 13:33:34 +0200 Message-ID: <20240613113312.171445540@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113302.116811394@linuxfoundation.org> References: <20240613113302.116811394@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marijn Suijten [ Upstream commit 2b938c3ab0a69ec6ea587bbf6fc2aec3db4a8736 ] As we can clearly see in a downstream kernel [1], flushing the slave INTF is skipped /only if/ the PPSPLIT topology is active. However, when DPU was originally submitted to mainline PPSPLIT was no longer part of it (seems to have been ripped out before submission), but this clause was incorrectly ported from the original SDE driver. Given that there is no support for PPSPLIT (currently), flushing the slave INTF should /never/ be skipped (as the `if (ppsplit && !master) goto skip;` clause downstream never becomes true). [1]: https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers/-/blob/display-kernel.lnx.5.4.r1-rel/msm/sde/sde_encoder_phys_cmd.c?ref_type=heads#L1131-1139 Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support") Signed-off-by: Marijn Suijten Reviewed-by: Dmitry Baryshkov Patchwork: https://patchwork.freedesktop.org/patch/589901/ Link: https://lore.kernel.org/r/20240417-drm-msm-initial-dualpipe-dsc-fixes-v1-3-78ae3ee9a697@somainline.org Signed-off-by: Dmitry Baryshkov Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c index aa01698d6b256..a05276f0d6982 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c @@ -441,9 +441,6 @@ static void dpu_encoder_phys_cmd_enable_helper( _dpu_encoder_phys_cmd_pingpong_config(phys_enc); - if (!dpu_encoder_phys_cmd_is_master(phys_enc)) - return; - ctl = phys_enc->hw_ctl; ctl->ops.update_pending_flush_intf(ctl, phys_enc->intf_idx); } -- 2.43.0