[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170924203243.149192840@linuxfoundation.org>
Date: Sun, 24 Sep 2017 22:31:51 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Olliver Schinagl <oliver@...inagl.nl>,
Chen-Yu Tsai <wens@...e.org>, Jonathan Liu <net147@...il.com>,
Maxime Ripard <maxime.ripard@...e-electrons.com>
Subject: [PATCH 4.9 06/77] drm/sun4i: Implement drm_driver lastclose to restore fbdev console
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Liu <net147@...il.com>
commit 2a596fc9d974bb040eda9ab70bf8756fcaaa6afe upstream.
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")
Tested-by: Olliver Schinagl <oliver@...inagl.nl>
Reviewed-by: Chen-Yu Tsai <wens@...e.org>
Signed-off-by: Jonathan Liu <net147@...il.com>
Signed-off-by: Maxime Ripard <maxime.ripard@...e-electrons.com>
[net147@...il.com: Backport to 4.9, minor context change]
Signed-off-by: Jonathan Liu <net147@...il.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/gpu/drm/sun4i/sun4i_drv.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -47,6 +47,13 @@ static void sun4i_drv_disable_vblank(str
sun4i_tcon_enable_vblank(tcon, false);
}
+static void sun4i_drv_lastclose(struct drm_device *dev)
+{
+ struct sun4i_drv *drv = dev->dev_private;
+
+ drm_fbdev_cma_restore_mode(drv->fbdev);
+}
+
static const struct file_operations sun4i_drv_fops = {
.owner = THIS_MODULE,
.open = drm_open,
@@ -65,6 +72,7 @@ static struct drm_driver sun4i_drv_drive
.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",
Powered by blists - more mailing lists