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 43098145A03; Mon, 6 Jan 2025 15:55:13 +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=1736178913; cv=none; b=fwjl5vxCiR1uKb0TNjwCK0rn9TmUGYWcMIpdyitQoiTL9KBAtAjezBtqbeDWiYvZHnSZkSOr8WwsmlG0VE6t5wvlDp6M5IzUZkcdcnvBBwIePFkpPZhAL3320uVhoayzhZFVwomPgoTUgFfogzXMXXOM5vn5Ds0wdQRfB44gZ/s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736178913; c=relaxed/simple; bh=Vs9KCacQ0+KgZ8Zc5B8K33sFwTYEZTQ/ufQ2JPKGqgM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HvrMYz8yQZlrqqBQOZBO+yCfhmPMo+02hmeF/PPsBCLNPU1fwgV0pmdt/XaZ5XNI2wfEQLNed6tDaqPkmwD0KxeDl87wliRmtzBEzTnykAJL0VnjnPpsLq3H96RCmmpintvGsceJk8mW1XnAfTfYzmTDFtZDHUKH+UCfNd5tguQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZZ0qj6vL; 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="ZZ0qj6vL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBA33C4CED2; Mon, 6 Jan 2025 15:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736178913; bh=Vs9KCacQ0+KgZ8Zc5B8K33sFwTYEZTQ/ufQ2JPKGqgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZZ0qj6vLgyP/F+nYm6e0Wo2xcUkFrnRvj1BOhn/IAi6/m1GXwa2+RT+3DbevppT4R a92GkDfA6zdBM7jBMCE6rW73aLVvsf0mnqc+8FrQK8kgs8sehMDscPCzPIGHFH1MxR dprGxwx6euBIoSF3woRvXEYd0xdT1AilG9SaFdoY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vinay Belgaumkar , Himal Prasad Ghimiray , Rodrigo Vivi , Tvrtko Ursulin , Sasha Levin Subject: [PATCH 5.15 133/168] drm/i915/dg1: Fix power gate sequence. Date: Mon, 6 Jan 2025 16:17:21 +0100 Message-ID: <20250106151143.462610732@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250106151138.451846855@linuxfoundation.org> References: <20250106151138.451846855@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: Rodrigo Vivi [ Upstream commit 20e7c5313ffbf11c34a46395345677adbe890bee ] sub-pipe PG is not present on DG1. Setting these bits can disable other power gates and cause GPU hangs on video playbacks. VLK: 16314, 4304 Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13381 Fixes: 85a12d7eb8fe ("drm/i915/tgl: Fix Media power gate sequence.") Cc: Vinay Belgaumkar Cc: Himal Prasad Ghimiray Reviewed-by: Vinay Belgaumkar Reviewed-by: Himal Prasad Ghimiray Link: https://patchwork.freedesktop.org/patch/msgid/20241219210019.70532-1-rodrigo.vivi@intel.com Signed-off-by: Rodrigo Vivi (cherry picked from commit de7061947b4ed4be857d452c60d5fb795831d79e) Signed-off-by: Tvrtko Ursulin Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.c b/drivers/gpu/drm/i915/gt/intel_rc6.c index 799d382eea79..fbf1b0136aad 100644 --- a/drivers/gpu/drm/i915/gt/intel_rc6.c +++ b/drivers/gpu/drm/i915/gt/intel_rc6.c @@ -122,7 +122,7 @@ static void gen11_rc6_enable(struct intel_rc6 *rc6) GEN9_MEDIA_PG_ENABLE | GEN11_MEDIA_SAMPLER_PG_ENABLE; - if (GRAPHICS_VER(gt->i915) >= 12) { + if (GRAPHICS_VER(gt->i915) >= 12 && !IS_DG1(gt->i915)) { for (i = 0; i < I915_MAX_VCS; i++) if (HAS_ENGINE(gt, _VCS(i))) pg_enable |= (VDN_HCP_POWERGATE_ENABLE(i) | -- 2.39.5