From: Greg Kroah-Hartman Date: Wed, 7 Aug 2024 14:58:00 +0000 (+0200) Subject: drop drm ast patch from 6.6 X-Git-Tag: v6.1.104~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c15527a0a8eab9cab509f12332ef4b4d9cebeb0;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm ast patch from 6.6 broke the build --- diff --git a/queue-6.6/drm-ast-astdp-wake-up-during-connector-status-detection.patch b/queue-6.6/drm-ast-astdp-wake-up-during-connector-status-detection.patch deleted file mode 100644 index ff3fb0c5f57..00000000000 --- a/queue-6.6/drm-ast-astdp-wake-up-during-connector-status-detection.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 0ce91928ec62d189b5c51816e325f02587b53118 Mon Sep 17 00:00:00 2001 -From: Thomas Zimmermann -Date: Wed, 17 Jul 2024 16:24:16 +0200 -Subject: drm/ast: astdp: Wake up during connector status detection - -From: Thomas Zimmermann - -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 -Cc: Thomas Zimmermann -Cc: Dave Airlie -Cc: dri-devel@lists.freedesktop.org -Cc: # v6.6+ -Signed-off-by: Thomas Zimmermann -Reviewed-by: Jocelyn Falempe -Link: https://patchwork.freedesktop.org/patch/msgid/20240717143319.104012-2-tzimmermann@suse.de -Signed-off-by: Greg Kroah-Hartman ---- - 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 - */ - -+#include - #include - #include - -@@ -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 = { diff --git a/queue-6.6/drm-ast-fix-black-screen-after-resume.patch b/queue-6.6/drm-ast-fix-black-screen-after-resume.patch deleted file mode 100644 index 9a60a1a0d43..00000000000 --- a/queue-6.6/drm-ast-fix-black-screen-after-resume.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 12c35c5582acb0fd8f7713ffa75f450766022ff1 Mon Sep 17 00:00:00 2001 -From: Jammy Huang -Date: Thu, 18 Jul 2024 11:03:52 +0800 -Subject: drm/ast: Fix black screen after resume - -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 -@@ -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); diff --git a/queue-6.6/series b/queue-6.6/series index 3376b2ceff8..f1d86c00782 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -104,8 +104,6 @@ alsa-seq-ump-optimize-conversions-from-sysex-to-ump.patch revert-alsa-firewire-lib-obsolete-workqueue-for-period-update.patch revert-alsa-firewire-lib-operate-for-period-elapse-event-in-process-context.patch drm-vmwgfx-fix-a-deadlock-in-dma-buf-fence-polling.patch -drm-ast-astdp-wake-up-during-connector-status-detection.patch -drm-ast-fix-black-screen-after-resume.patch drm-virtio-fix-type-of-dma-fence-context-variable.patch drm-i915-fix-possible-int-overflow-in-skl_ddi_calculate_wrpll.patch net-usb-sr9700-fix-uninitialized-variable-use-in-sr_mdio_read.patch