Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/sun4i: Implement drm_driver lastclose to restore fbdev" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Aug 27, 2017

Subsystems (5)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 2a596fc9d974bb040eda9ab70bf8756fcaaa6afe Mon Sep 17 00:00:00 2001

From: Jonathan Liu <[email protected]>
Date: Mon, 10 Jul 2017 16:55:04 +1000
Subject: [PATCH] drm/sun4i: Implement drm_driver lastclose to restore fbdev
console

The drm_driver lastclose callback is called when the last userspace DRM client has closed. Call drm_fbdev_cma_restore_mode to restore the fbdev console otherwise the fbdev console will stop working.

Fixes 9026e0d122ac ("drm: Add Allwinner A10 Display Engine support")
drivers/gpu/drm/sun4i/sun4i_drv.c +8 -0
index abc7d8fe06b4..a45a627283a1 100644
@@ -25,12 +25,20 @@
 #include "sun4i_framebuffer.h"
 #include "sun4i_tcon.h"
 
+static void sun4i_drv_lastclose(struct drm_device *dev)
+{
+	struct sun4i_drv *drv = dev->dev_private;
+
+	drm_fbdev_cma_restore_mode(drv->fbdev);
+}
+
 DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops);
 
 static struct drm_driver sun4i_drv_driver = {
 	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC,
 
 	/* Generic Operations */
+	.lastclose		= sun4i_drv_lastclose,
 	.fops			= &sun4i_drv_fops,
 	.name			= "sun4i-drm",
 	.desc			= "Allwinner sun4i Display Engine",