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

Commit 64b0e1d6 authored by Shawn Guo's avatar Shawn Guo Committed by Daniel Vetter
Browse files

drm: exynos: use vblank hooks in struct drm_crtc_funcs 



The vblank hooks in struct drm_driver are deprecated and only meant for
legacy drivers.  For modern drivers with DRIVER_MODESET flag, the hooks
in struct drm_crtc_funcs should be used instead.

As the result, exynos_drm_crtc_enable[disable]_vblank() become static
functions.  They are moved around a bit to save forward declaration
though.  Also while at it, we move one step further to kill
exynos_drm_crtc_from_pipe() completely by updating hdmi_bind() a bit.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Inki Dae <inki.dae@samsung.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1486458995-31018-9-git-send-email-shawnguo@kernel.org
parent 82308e27

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+20 −20
Original line number Diff line number Diff line
@@ -122,6 +122,24 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc) 
	kfree(exynos_crtc);

}



static int exynos_drm_crtc_enable_vblank(struct drm_crtc *crtc)

{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);



	if (exynos_crtc->ops->enable_vblank)

		return exynos_crtc->ops->enable_vblank(exynos_crtc);



	return 0;

}



static void exynos_drm_crtc_disable_vblank(struct drm_crtc *crtc)

{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);



	if (exynos_crtc->ops->disable_vblank)

		exynos_crtc->ops->disable_vblank(exynos_crtc);

}



static const struct drm_crtc_funcs exynos_crtc_funcs = {

	.set_config	= drm_atomic_helper_set_config,

	.page_flip	= drm_atomic_helper_page_flip,
@@ -129,6 +147,8 @@ static const struct drm_crtc_funcs exynos_crtc_funcs = { 
	.reset = drm_atomic_helper_crtc_reset,

	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

	.enable_vblank = exynos_drm_crtc_enable_vblank,

	.disable_vblank = exynos_drm_crtc_disable_vblank,

};



struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
@@ -168,26 +188,6 @@ struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, 
	return ERR_PTR(ret);

}



int exynos_drm_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe)

{

	struct exynos_drm_crtc *exynos_crtc = exynos_drm_crtc_from_pipe(dev,

									pipe);



	if (exynos_crtc->ops->enable_vblank)

		return exynos_crtc->ops->enable_vblank(exynos_crtc);



	return 0;

}



void exynos_drm_crtc_disable_vblank(struct drm_device *dev, unsigned int pipe)

{

	struct exynos_drm_crtc *exynos_crtc = exynos_drm_crtc_from_pipe(dev,

									pipe);



	if (exynos_crtc->ops->disable_vblank)

		exynos_crtc->ops->disable_vblank(exynos_crtc);

}



int exynos_drm_crtc_get_pipe_from_type(struct drm_device *drm_dev,

				       enum exynos_drm_output_type out_type)

{

drivers/gpu/drm/exynos/exynos_drm_crtc.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, 
					enum exynos_drm_output_type type,

					const struct exynos_drm_crtc_ops *ops,

					void *context);

int exynos_drm_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe);

void exynos_drm_crtc_disable_vblank(struct drm_device *dev, unsigned int pipe);

void exynos_drm_crtc_wait_pending_update(struct exynos_drm_crtc *exynos_crtc);

void exynos_drm_crtc_finish_update(struct exynos_drm_crtc *exynos_crtc,

				   struct exynos_drm_plane *exynos_plane);

drivers/gpu/drm/exynos/exynos_drm_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <drm/exynos_drm.h>



#include "exynos_drm_drv.h"

#include "exynos_drm_crtc.h"

#include "exynos_drm_fbdev.h"

#include "exynos_drm_fb.h"

#include "exynos_drm_gem.h"
@@ -263,8 +262,6 @@ static struct drm_driver exynos_drm_driver = { 
	.preclose		= exynos_drm_preclose,

	.lastclose		= exynos_drm_lastclose,

	.postclose		= exynos_drm_postclose,

	.enable_vblank		= exynos_drm_crtc_enable_vblank,

	.disable_vblank		= exynos_drm_crtc_disable_vblank,

	.gem_free_object_unlocked = exynos_drm_gem_free_object,

	.gem_vm_ops		= &exynos_drm_gem_vm_ops,

	.dumb_create		= exynos_drm_gem_dumb_create,

drivers/gpu/drm/exynos/exynos_drm_drv.h

+0 −8
Original line number Diff line number Diff line
@@ -222,14 +222,6 @@ struct exynos_drm_private { 
	wait_queue_head_t	wait;

};



static inline struct exynos_drm_crtc *

exynos_drm_crtc_from_pipe(struct drm_device *dev, int pipe)

{

	struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe);



	return to_exynos_crtc(crtc);

}



static inline struct device *to_dma_dev(struct drm_device *dev)

{

	struct exynos_drm_private *priv = dev->dev_private;

drivers/gpu/drm/exynos/exynos_hdmi.c

+5 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 


#include <drm/exynos_drm.h>



#include "exynos_drm_drv.h"

#include "exynos_drm_crtc.h"



#define HOTPLUG_DEBOUNCE_MS		1100
@@ -1657,6 +1656,8 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) 
	struct drm_device *drm_dev = data;

	struct hdmi_context *hdata = dev_get_drvdata(dev);

	struct drm_encoder *encoder = &hdata->encoder;

	struct exynos_drm_crtc *exynos_crtc;

	struct drm_crtc *crtc;

	int ret, pipe;



	hdata->drm_dev = drm_dev;
@@ -1668,7 +1669,9 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) 


	hdata->phy_clk.enable = hdmiphy_clk_enable;



	exynos_drm_crtc_from_pipe(drm_dev, pipe)->pipe_clk = &hdata->phy_clk;

	crtc = drm_crtc_from_index(drm_dev, pipe);

	exynos_crtc = to_exynos_crtc(crtc);

	exynos_crtc->pipe_clk = &hdata->phy_clk;



	encoder->possible_crtcs = 1 << pipe;