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 C3E662C1E35; Mon, 5 May 2025 22:50:10 +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=1746485410; cv=none; b=u6MopSUE/78Hv0Y/9xzhn1RZ2YXSFBm5ux9QV7NpR21pSZsKi3kF7aHEqy0zyzOpaMYUmSnJqNLn7wtu6szeRk2QQpdKBAtxDkv9MiLfRbHaZb7N8eJgqBGktN6I+nHUefxpdfZe5S6anNQ9rD+fPUkoah/IjbnTGhGJlme2EbY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485410; c=relaxed/simple; bh=LrDTYJPPikt2CZU7xFsXv7FLYT+5gZ9WRCubtv94W7g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RBIythj6f8DEdjWj/L8o/e/GOmDs7E7yv4fCaTpoES6hB06Mo7wAGqf83HvqvEPM2yZlmCDbw/VrGRD8YXMhgfaQNnjmXRoX4Rr/TpVySjSpuTf7ASbn0Cqld07Xy9Q2/cHid96Vzvdj9DusWDOYv1XUOQCAT1qAn+FfUsy4mxk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pbeXP0Lh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pbeXP0Lh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75D6DC4CEE4; Mon, 5 May 2025 22:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485410; bh=LrDTYJPPikt2CZU7xFsXv7FLYT+5gZ9WRCubtv94W7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pbeXP0LhqNa/Ths8V33RA7pBXelUCeQt3l89zE9hlmG06IWwdld17W5in1WojB1qe qV8meR6oLTgcoZxoi2bjyovc3oAcvHrJYQeqjI9h/K0lcWrpcgYBdQJWbaXtHU/Ldf 5+yMSjTdyKs0GFHq8Dwl0BQSalwNf8cfOEH2axOCSvk7BFrgS5jPWPczbPXc/MMbSS /T0Y9zI4H5z7+Q2WEGDe7CJOeSYIfVYY1yNs23R8N9KFZQcRRRchOty7gCkEykZL4s dzS8wbsshZeuMHpTUO7OVAtGZ4TkzZzjQl9vnf1pQE/ezEm8aA+9Xd9Uqvpnm1ka+r h83oR+Wj10R/w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Leo Zeng , Dillon Varone , Roman Li , Daniel Wheeler , Alex Deucher , Sasha Levin , austin.zheng@amd.com, jun.lei@amd.com, harry.wentland@amd.com, sunpeng.li@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, alex.hung@amd.com, Aric.Cyr@amd.com, alvin.lee2@amd.com, siqueira@igalia.com, wenjing.liu@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.12 304/486] Revert "drm/amd/display: Request HW cursor on DCN3.2 with SubVP" Date: Mon, 5 May 2025 18:36:20 -0400 Message-Id: <20250505223922.2682012-304-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.26 Content-Transfer-Encoding: 8bit From: Leo Zeng [ Upstream commit 8ae6dfc0b61b170cf13832d4cfe2a0c744e621a7 ] This reverts commit 13437c91606c9232c747475e202fe3827cd53264. Reason to revert: idle power regression found in testing. Reviewed-by: Dillon Varone Signed-off-by: Leo Zeng Signed-off-by: Roman Li Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c index 56dda686e2992..6f490d8d7038c 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c @@ -626,7 +626,6 @@ static bool dcn32_assign_subvp_pipe(struct dc *dc, * - Not TMZ surface */ if (pipe->plane_state && !pipe->top_pipe && !pipe->prev_odm_pipe && !dcn32_is_center_timing(pipe) && - !pipe->stream->hw_cursor_req && !(pipe->stream->timing.pix_clk_100hz / 10000 > DCN3_2_MAX_SUBVP_PIXEL_RATE_MHZ) && (!dcn32_is_psr_capable(pipe) || (context->stream_count == 1 && dc->caps.dmub_caps.subvp_psr)) && dc_state_get_pipe_subvp_type(context, pipe) == SUBVP_NONE && -- 2.39.5