| Message ID | 1432760183-4342-9-git-send-email-gustavo@padovan.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/28/2015 05:56 AM, Gustavo Padovan wrote: > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > Now that phase 1 and 2 are complete switch .set_config helper to > use the atomic one. > > v2: also remove .prepare() callback > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com> > Tested-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> > --- > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c > index fe77516..c490064 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c > @@ -50,11 +50,6 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) > drm_crtc_vblank_on(crtc); > } > > -static void exynos_drm_crtc_prepare(struct drm_crtc *crtc) > -{ > - /* drm framework doesn't check NULL. */ > -} > - > static void exynos_drm_crtc_commit(struct drm_crtc *crtc) > { > struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); > @@ -111,7 +106,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) > > static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = { > .dpms = exynos_drm_crtc_dpms, > - .prepare = exynos_drm_crtc_prepare, As i said, can remove .prepare of drm_encoder_helper_funcs also. > .commit = exynos_drm_crtc_commit, > .mode_fixup = exynos_drm_crtc_mode_fixup, > .mode_set = drm_helper_crtc_mode_set, Also, can remove .mode_set and .mode_set_base because we use drm_atomic_helper_set_config. > @@ -193,7 +187,7 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc) > } > > static struct drm_crtc_funcs exynos_crtc_funcs = { > - .set_config = drm_crtc_helper_set_config, > + .set_config = drm_atomic_helper_set_config, > .page_flip = exynos_drm_crtc_page_flip, > .destroy = exynos_drm_crtc_destroy, > .reset = drm_atomic_helper_crtc_reset, >
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index fe77516..c490064 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -50,11 +50,6 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) drm_crtc_vblank_on(crtc); } -static void exynos_drm_crtc_prepare(struct drm_crtc *crtc) -{ - /* drm framework doesn't check NULL. */ -} - static void exynos_drm_crtc_commit(struct drm_crtc *crtc) { struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); @@ -111,7 +106,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = { .dpms = exynos_drm_crtc_dpms, - .prepare = exynos_drm_crtc_prepare, .commit = exynos_drm_crtc_commit, .mode_fixup = exynos_drm_crtc_mode_fixup, .mode_set = drm_helper_crtc_mode_set, @@ -193,7 +187,7 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc) } static struct drm_crtc_funcs exynos_crtc_funcs = { - .set_config = drm_crtc_helper_set_config, + .set_config = drm_atomic_helper_set_config, .page_flip = exynos_drm_crtc_page_flip, .destroy = exynos_drm_crtc_destroy, .reset = drm_atomic_helper_crtc_reset,