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

Commit d2936153 authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/exynos: Use drm_fb_helper_lastclose() and _poll_changed() 



This driver can use drm_fb_helper_lastclose() as its .lastclose callback.
It can also use drm_fb_helper_output_poll_changed() as its
.output_poll_changed callback.

Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarInki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171205182504.41923-5-noralf@tronnes.org
parent df139288

drivers/gpu/drm/exynos/exynos_drm_drv.c

+2 −6
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_helper.h>



#include <linux/component.h>
@@ -89,11 +90,6 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) 
	file->driver_priv = NULL;

}



static void exynos_drm_lastclose(struct drm_device *dev)

{

	exynos_drm_fbdev_restore_mode(dev);

}



static const struct vm_operations_struct exynos_drm_gem_vm_ops = {

	.fault = exynos_drm_gem_fault,

	.open = drm_gem_vm_open,
@@ -140,7 +136,7 @@ static struct drm_driver exynos_drm_driver = { 
	.driver_features	= DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME

				  | DRIVER_ATOMIC | DRIVER_RENDER,

	.open			= exynos_drm_open,

	.lastclose		= exynos_drm_lastclose,

	.lastclose		= drm_fb_helper_lastclose,

	.postclose		= exynos_drm_postclose,

	.gem_free_object_unlocked = exynos_drm_gem_free_object,

	.gem_vm_ops		= &exynos_drm_gem_vm_ops,

drivers/gpu/drm/exynos/exynos_drm_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static struct drm_mode_config_helper_funcs exynos_drm_mode_config_helpers = { 


static const struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {

	.fb_create = exynos_user_fb_create,

	.output_poll_changed = exynos_drm_output_poll_changed,

	.output_poll_changed = drm_fb_helper_output_poll_changed,

	.atomic_check = exynos_atomic_check,

	.atomic_commit = drm_atomic_helper_commit,

};

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

+0 −18
Original line number Diff line number Diff line
@@ -270,24 +270,6 @@ void exynos_drm_fbdev_fini(struct drm_device *dev) 
	private->fb_helper = NULL;

}



void exynos_drm_fbdev_restore_mode(struct drm_device *dev)

{

	struct exynos_drm_private *private = dev->dev_private;



	if (!private || !private->fb_helper)

		return;



	drm_fb_helper_restore_fbdev_mode_unlocked(private->fb_helper);

}



void exynos_drm_output_poll_changed(struct drm_device *dev)

{

	struct exynos_drm_private *private = dev->dev_private;

	struct drm_fb_helper *fb_helper = private->fb_helper;



	drm_fb_helper_hotplug_event(fb_helper);

}



void exynos_drm_fbdev_suspend(struct drm_device *dev)

{

	struct exynos_drm_private *private = dev->dev_private;

drivers/gpu/drm/exynos/exynos_drm_fbdev.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


int exynos_drm_fbdev_init(struct drm_device *dev);

void exynos_drm_fbdev_fini(struct drm_device *dev);

void exynos_drm_fbdev_restore_mode(struct drm_device *dev);

void exynos_drm_output_poll_changed(struct drm_device *dev);

void exynos_drm_fbdev_suspend(struct drm_device *drm);

void exynos_drm_fbdev_resume(struct drm_device *drm);