+++ /dev/null
-From 0ce91928ec62d189b5c51816e325f02587b53118 Mon Sep 17 00:00:00 2001
-From: Thomas Zimmermann <tzimmermann@suse.de>
-Date: Wed, 17 Jul 2024 16:24:16 +0200
-Subject: drm/ast: astdp: Wake up during connector status detection
-
-From: Thomas Zimmermann <tzimmermann@suse.de>
-
-commit 0ce91928ec62d189b5c51816e325f02587b53118 upstream.
-
-Power up the ASTDP connector for connection status detection if the
-connector is not active. Keep it powered if a display is attached.
-
-This fixes a bug where the connector does not come back after
-disconnecting the display. The encoder's atomic_disable turns off
-power on the physical connector. Further HPD reads will fail,
-thus preventing the driver from detecting re-connected displays.
-
-For connectors that are actively used, only test the HPD flag without
-touching power.
-
-Fixes: f81bb0ac7872 ("drm/ast: report connection status on Display Port.")
-Cc: Jocelyn Falempe <jfalempe@redhat.com>
-Cc: Thomas Zimmermann <tzimmermann@suse.de>
-Cc: Dave Airlie <airlied@redhat.com>
-Cc: dri-devel@lists.freedesktop.org
-Cc: <stable@vger.kernel.org> # v6.6+
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20240717143319.104012-2-tzimmermann@suse.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/ast/ast_dp.c | 7 +++++++
- drivers/gpu/drm/ast/ast_drv.h | 1 +
- drivers/gpu/drm/ast/ast_mode.c | 29 +++++++++++++++++++++++++++--
- 3 files changed, 35 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/ast/ast_dp.c
-+++ b/drivers/gpu/drm/ast/ast_dp.c
-@@ -158,7 +158,14 @@ void ast_dp_launch(struct drm_device *de
- ASTDP_HOST_EDID_READ_DONE);
- }
-
-+bool ast_dp_power_is_on(struct ast_device *ast)
-+{
-+ u8 vgacre3;
-+
-+ vgacre3 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xe3);
-
-+ return !(vgacre3 & AST_DP_PHY_SLEEP);
-+}
-
- void ast_dp_power_on_off(struct drm_device *dev, bool on)
- {
---- a/drivers/gpu/drm/ast/ast_drv.h
-+++ b/drivers/gpu/drm/ast/ast_drv.h
-@@ -537,6 +537,7 @@ struct ast_i2c_chan *ast_i2c_create(stru
- bool ast_astdp_is_connected(struct ast_device *ast);
- int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata);
- void ast_dp_launch(struct drm_device *dev);
-+bool ast_dp_power_is_on(struct ast_device *ast);
- void ast_dp_power_on_off(struct drm_device *dev, bool no);
- void ast_dp_set_on_off(struct drm_device *dev, bool no);
- void ast_dp_set_mode(struct drm_crtc *crtc, struct ast_vbios_mode_info *vbios_mode);
---- a/drivers/gpu/drm/ast/ast_mode.c
-+++ b/drivers/gpu/drm/ast/ast_mode.c
-@@ -28,6 +28,7 @@
- * Authors: Dave Airlie <airlied@redhat.com>
- */
-
-+#include <linux/delay.h>
- #include <linux/export.h>
- #include <linux/pci.h>
-
-@@ -1696,11 +1697,35 @@ static int ast_astdp_connector_helper_de
- struct drm_modeset_acquire_ctx *ctx,
- bool force)
- {
-+ struct drm_device *dev = connector->dev;
- struct ast_device *ast = to_ast_device(connector->dev);
-+ enum drm_connector_status status = connector_status_disconnected;
-+ struct drm_connector_state *connector_state = connector->state;
-+ bool is_active = false;
-+
-+ mutex_lock(&ast->modeset_lock);
-+
-+ if (connector_state && connector_state->crtc) {
-+ struct drm_crtc_state *crtc_state = connector_state->crtc->state;
-+
-+ if (crtc_state && crtc_state->active)
-+ is_active = true;
-+ }
-+
-+ if (!is_active && !ast_dp_power_is_on(ast)) {
-+ ast_dp_power_on_off(dev, true);
-+ msleep(50);
-+ }
-
- if (ast_astdp_is_connected(ast))
-- return connector_status_connected;
-- return connector_status_disconnected;
-+ status = connector_status_connected;
-+
-+ if (!is_active && status == connector_status_disconnected)
-+ ast_dp_power_on_off(dev, false);
-+
-+ mutex_unlock(&ast->modeset_lock);
-+
-+ return status;
- }
-
- static const struct drm_connector_helper_funcs ast_astdp_connector_helper_funcs = {
+++ /dev/null
-From 12c35c5582acb0fd8f7713ffa75f450766022ff1 Mon Sep 17 00:00:00 2001
-From: Jammy Huang <jammy_huang@aspeedtech.com>
-Date: Thu, 18 Jul 2024 11:03:52 +0800
-Subject: drm/ast: Fix black screen after resume
-
-From: Jammy Huang <jammy_huang@aspeedtech.com>
-
-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 <cogarre@gmail.com>
-Closes: https://lore.kernel.org/dri-devel/8ce1e1cc351153a890b65e62fed93b54ccd43f6a.camel@gmail.com/
-Cc: Thomas Zimmermann <tzimmermann@suse.de>
-Cc: Jocelyn Falempe <jfalempe@redhat.com>
-Cc: Dave Airlie <airlied@redhat.com>
-Cc: dri-devel@lists.freedesktop.org
-Cc: <stable@vger.kernel.org> # v6.6+
-Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
-Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
-Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-Link: https://patchwork.freedesktop.org/patch/msgid/20240718030352.654155-1-jammy_huang@aspeedtech.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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
-@@ -138,6 +138,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);
projects / thirdparty / kernel / stable-queue.git / commitdiff
