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 A4F818289E; Wed, 7 Aug 2024 15:05: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=1723043113; cv=none; b=u1/z3zOV39sTmRHPkaY4cvEDJJ4MVQKf6je3o9J221nuJxTsn9iOGVSny+pgaq0Shry+gkdFLa8cGxvu2Hd8EnRpA6MfLQEH/C9a5X+gjvGuBXGrpwE+zrlAYQd6ljbdbvL9NDRzYsfA/zwnQfjcKVRoUISfPZpqbPZr/V2zV6A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723043113; c=relaxed/simple; bh=QTE33PFHVpBvJ9sQy/voY3iMwTiKCECkn0humdTieGE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oeAhfGYGaqfCnzLoxyLfHv1dhPYyrY+zvDj/rFoBaylzoFAKRSGCvvMWtlD+rMS+3hplKzgVZsvh3IF1CT+9rQmXXLQkCtX18Mw9U7Ce7r0MGm6XjhoCXKDLSV6aFglG4xZiRPstF9UFRX+/lgwSo+bZ/M8CJ3lopWfdmFGdJTQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nxu7k2Sz; 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="nxu7k2Sz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 353F5C32781; Wed, 7 Aug 2024 15:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723043113; bh=QTE33PFHVpBvJ9sQy/voY3iMwTiKCECkn0humdTieGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nxu7k2SzfFyTRTojNTGEZJhDN67pez+CRjM03JPfFkabIRwKogXjfneFnun44fIIA foVuIN7gc+ydkC6cn2JcH2+PllaLZZzSERHrFj4TIq/6OK25XU/zkRxQDkP+xeCWg+ gkUsuY9+ap85C+2RMvCitIVVAHIidT+OyNTfl7lg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cary Garrett , Thomas Zimmermann , Jocelyn Falempe , Dave Airlie , dri-devel@lists.freedesktop.org, Jammy Huang Subject: [PATCH 6.10 094/123] drm/ast: Fix black screen after resume Date: Wed, 7 Aug 2024 17:00:13 +0200 Message-ID: <20240807150023.869690975@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240807150020.790615758@linuxfoundation.org> References: <20240807150020.790615758@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 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jammy Huang commit 12c35c5582acb0fd8f7713ffa75f450766022ff1 upstream. Suspend will disable pcie device. Thus, resume should do full hw initialization again. Add some APIs to ast_drm_thaw() before ast_post_gpu() to fix the issue. v2: - fix function-call arguments Fixes: 5b71707dd13c ("drm/ast: Enable and unlock device access early during init") Reported-by: Cary Garrett Closes: https://lore.kernel.org/dri-devel/8ce1e1cc351153a890b65e62fed93b54ccd43f6a.camel@gmail.com/ Cc: Thomas Zimmermann Cc: Jocelyn Falempe Cc: Dave Airlie Cc: dri-devel@lists.freedesktop.org Cc: # v6.6+ Signed-off-by: Jammy Huang Reviewed-by: Thomas Zimmermann Signed-off-by: Thomas Zimmermann Link: https://patchwork.freedesktop.org/patch/msgid/20240718030352.654155-1-jammy_huang@aspeedtech.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ast/ast_drv.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c @@ -391,6 +391,11 @@ static int ast_drm_freeze(struct drm_dev static int ast_drm_thaw(struct drm_device *dev) { + struct ast_device *ast = to_ast_device(dev); + + ast_enable_vga(ast->ioregs); + ast_open_key(ast->ioregs); + ast_enable_mmio(dev->dev, ast->ioregs); ast_post_gpu(dev); return drm_mode_config_helper_resume(dev);