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")
Cc: [email protected]
Signed-off-by: Jonathan Liu <[email protected]>
Reviewed-by: Chen-Yu Tsai <[email protected]>
---
Changes for v3:
- Add 'Fixes:' tag
- Add CC to stable
- Add 'Reviewed-by: Chen-Yu Tsai <[email protected]>'
Changes for v2:
- Rename sun4i_drm_lastclose to sun4i_drv_lastclose
drivers/gpu/drm/sun4i/sun4i_drv.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index abc7d8fe06b4..a45a627283a1 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -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",
--
2.13.2
Hey Jonathan,
since I reported this to you on IRC, it's only fair that you can have my:
Tested-by: Olliver Schinagl <[email protected]>
For those interessted, I've tested it on an Olimex OLinuXino Lime2 with
their 4.3 LCD.
Olliver
On 10-07-17 08:55, Jonathan Liu wrote:
> 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")
> Cc: [email protected]
> Signed-off-by: Jonathan Liu <[email protected]>
> Reviewed-by: Chen-Yu Tsai <[email protected]>
> ---
> Changes for v3:
> - Add 'Fixes:' tag
> - Add CC to stable
> - Add 'Reviewed-by: Chen-Yu Tsai <[email protected]>'
>
> Changes for v2:
> - Rename sun4i_drm_lastclose to sun4i_drv_lastclose
>
> drivers/gpu/drm/sun4i/sun4i_drv.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
> index abc7d8fe06b4..a45a627283a1 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_drv.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
> @@ -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",
>
On Mon, Jul 10, 2017 at 04:55:04PM +1000, Jonathan Liu wrote:
> 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")
> Cc: [email protected]
> Signed-off-by: Jonathan Liu <[email protected]>
> Reviewed-by: Chen-Yu Tsai <[email protected]>
Queued for 4.14, thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
On Wed, Jul 12, 2017 at 3:21 AM, Maxime Ripard
<[email protected]> wrote:
> On Mon, Jul 10, 2017 at 04:55:04PM +1000, Jonathan Liu wrote:
>> 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")
>> Cc: [email protected]
>> Signed-off-by: Jonathan Liu <[email protected]>
>> Reviewed-by: Chen-Yu Tsai <[email protected]>
>
> Queued for 4.14, thanks!
May we have this sooner? Like 4.13? :)
ChenYu
On Wed, Jul 12, 2017 at 10:40:16AM +0800, Chen-Yu Tsai wrote:
> On Wed, Jul 12, 2017 at 3:21 AM, Maxime Ripard
> <[email protected]> wrote:
> > On Mon, Jul 10, 2017 at 04:55:04PM +1000, Jonathan Liu wrote:
> >> 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")
> >> Cc: [email protected]
> >> Signed-off-by: Jonathan Liu <[email protected]>
> >> Reviewed-by: Chen-Yu Tsai <[email protected]>
> >
> > Queued for 4.14, thanks!
>
> May we have this sooner? Like 4.13? :)
Yes, of course :)
I queued it for 4.13.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com