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 39FF278F32; Tue, 27 May 2025 17:01:59 +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=1748365319; cv=none; b=EyiMy0Cue3hKl3g2sr6euyeVSrDk71KMFyWszYEi9RPYGfvSmELSIBC6zK6KrxB1/pYIT7wwAJ69PF82yQUUARwxorCghKeFQdoBmmZ4SYb5c62qhEXzNjW6GEdEalNdPEtWW1w7jcqLt2H2Qvyk613DbkHzUrWa/ak9ffFPHDA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365319; c=relaxed/simple; bh=6UhD6hZMoxuBN7m7cBaJdbkGapOf8YDMmhQ6pOPABvo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iYaktTGAh8P3lLgWFtHUxIUd+GnZqvbd6FKf2b2SgkHLVQdxZ7o6jU32I4mp6n1ociE4jKUsSxjHAlh1ULUu/oWj+VEzXdyWtJp0SGUhlNFrwnwipSD4OtaUmTAeARwI96hxpqoAiRbPdGIlQQInlOUuB3eFhmxJ1/P5co9DIP8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=V21Xc2Nz; 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="V21Xc2Nz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9D0BC4CEE9; Tue, 27 May 2025 17:01:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365319; bh=6UhD6hZMoxuBN7m7cBaJdbkGapOf8YDMmhQ6pOPABvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V21Xc2Nze9sigw+IsTGMJRxVEM4/3K7LFDFXAq6WWZlHLy0oQTG5w6q96kFhmzCr7 XdXOszxtHhLQbhsOXtl4A22UMxPzxuk9fCGDhXQX4fUUOX2w+0OC9e38knNfFd+BlU CuT1PIDuj7V8z2TrLT2brYFSDDECiP/M2Y15L0qc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dillon Varone , Leo Zeng , Roman Li , Daniel Wheeler , Alex Deucher , Sasha Levin Subject: [PATCH 6.12 337/626] Revert "drm/amd/display: Request HW cursor on DCN3.2 with SubVP" Date: Tue, 27 May 2025 18:23:50 +0200 Message-ID: <20250527162458.714111468@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ 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