Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f5ae490 authored by Russell King's avatar Russell King
Browse files

DRM: Armada: implement lastclose() for fbhelper 



Call drm_fb_helper_restore_fbdev_mode() upon last close so that in the
event of the X server crashing, we have some kind of mode restored.

Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 796c8e1c

drivers/gpu/drm/armada/armada_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void armada_drm_queue_unref_work(struct drm_device *, 
extern const struct drm_mode_config_funcs armada_drm_mode_config_funcs;



int armada_fbdev_init(struct drm_device *);

void armada_fbdev_lastclose(struct drm_device *);

void armada_fbdev_fini(struct drm_device *);



int armada_overlay_plane_create(struct drm_device *, unsigned long);

drivers/gpu/drm/armada/armada_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -321,6 +321,11 @@ static struct drm_ioctl_desc armada_ioctls[] = { 
		DRM_UNLOCKED),

};



static void armada_drm_lastclose(struct drm_device *dev)

{

	armada_fbdev_lastclose(dev);

}



static const struct file_operations armada_drm_fops = {

	.owner			= THIS_MODULE,

	.llseek			= no_llseek,
@@ -337,7 +342,7 @@ static struct drm_driver armada_drm_driver = { 
	.open			= NULL,

	.preclose		= NULL,

	.postclose		= NULL,

	.lastclose		= NULL,

	.lastclose		= armada_drm_lastclose,

	.unload			= armada_drm_unload,

	.get_vblank_counter	= drm_vblank_count,

	.enable_vblank		= armada_drm_enable_vblank,

drivers/gpu/drm/armada/armada_fbdev.c

+10 −0
Original line number Diff line number Diff line
@@ -177,6 +177,16 @@ int armada_fbdev_init(struct drm_device *dev) 
	return ret;

}



void armada_fbdev_lastclose(struct drm_device *dev)

{

	struct armada_private *priv = dev->dev_private;



	drm_modeset_lock_all(dev);

	if (priv->fbdev)

		drm_fb_helper_restore_fbdev_mode(priv->fbdev);

	drm_modeset_unlock_all(dev);

}



void armada_fbdev_fini(struct drm_device *dev)

{

	struct armada_private *priv = dev->dev_private;