aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2017-06-21 09:54:53 -0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2017-07-18 10:52:42 -0400
commit7d1a2bf41f06b360724f9b2156cc8a2da816b15c (patch)
tree6e68188d63e1deee3844e0311585b23d8a74838e
parentf4c08112ad35f6a1eb7ba498a47cc58c08a175a8 (diff)
drm/sun4i: Remove useless atomic_check
The atomic_check callback is optional, and we don't implement anything in some parts of our drivers. Let's remove it. Reviewed-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r--drivers/gpu/drm/sun4i/sun4i_layer.c7
-rw-r--r--drivers/gpu/drm/sun4i/sun4i_rgb.c8
-rw-r--r--drivers/gpu/drm/sun4i/sun4i_tv.c8
3 files changed, 0 insertions, 23 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c
index 6a887ac28aae..b0c1155891b4 100644
--- a/drivers/gpu/drm/sun4i/sun4i_layer.c
+++ b/drivers/gpu/drm/sun4i/sun4i_layer.c
@@ -25,12 +25,6 @@ struct sun4i_plane_desc {
25 uint32_t nformats; 25 uint32_t nformats;
26}; 26};
27 27
28static int sun4i_backend_layer_atomic_check(struct drm_plane *plane,
29 struct drm_plane_state *state)
30{
31 return 0;
32}
33
34static void sun4i_backend_layer_atomic_disable(struct drm_plane *plane, 28static void sun4i_backend_layer_atomic_disable(struct drm_plane *plane,
35 struct drm_plane_state *old_state) 29 struct drm_plane_state *old_state)
36{ 30{
@@ -53,7 +47,6 @@ static void sun4i_backend_layer_atomic_update(struct drm_plane *plane,
53} 47}
54 48
55static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = { 49static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = {
56 .atomic_check = sun4i_backend_layer_atomic_check,
57 .atomic_disable = sun4i_backend_layer_atomic_disable, 50 .atomic_disable = sun4i_backend_layer_atomic_disable,
58 .atomic_update = sun4i_backend_layer_atomic_update, 51 .atomic_update = sun4i_backend_layer_atomic_update,
59}; 52};
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index 422b191faa77..76362c09c608 100644
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -128,13 +128,6 @@ static struct drm_connector_funcs sun4i_rgb_con_funcs = {
128 .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, 128 .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
129}; 129};
130 130
131static int sun4i_rgb_atomic_check(struct drm_encoder *encoder,
132 struct drm_crtc_state *crtc_state,
133 struct drm_connector_state *conn_state)
134{
135 return 0;
136}
137
138static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder) 131static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder)
139{ 132{
140 struct sun4i_rgb *rgb = drm_encoder_to_sun4i_rgb(encoder); 133 struct sun4i_rgb *rgb = drm_encoder_to_sun4i_rgb(encoder);
@@ -182,7 +175,6 @@ static void sun4i_rgb_encoder_mode_set(struct drm_encoder *encoder,
182} 175}
183 176
184static struct drm_encoder_helper_funcs sun4i_rgb_enc_helper_funcs = { 177static struct drm_encoder_helper_funcs sun4i_rgb_enc_helper_funcs = {
185 .atomic_check = sun4i_rgb_atomic_check,
186 .mode_set = sun4i_rgb_encoder_mode_set, 178 .mode_set = sun4i_rgb_encoder_mode_set,
187 .disable = sun4i_rgb_encoder_disable, 179 .disable = sun4i_rgb_encoder_disable,
188 .enable = sun4i_rgb_encoder_enable, 180 .enable = sun4i_rgb_encoder_enable,
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
index 338b9e5bb2a3..73bfe7b1cd78 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
@@ -341,13 +341,6 @@ static void sun4i_tv_mode_to_drm_mode(const struct tv_mode *tv_mode,
341 mode->vtotal = mode->vsync_end + tv_mode->vback_porch; 341 mode->vtotal = mode->vsync_end + tv_mode->vback_porch;
342} 342}
343 343
344static int sun4i_tv_atomic_check(struct drm_encoder *encoder,
345 struct drm_crtc_state *crtc_state,
346 struct drm_connector_state *conn_state)
347{
348 return 0;
349}
350
351static void sun4i_tv_disable(struct drm_encoder *encoder) 344static void sun4i_tv_disable(struct drm_encoder *encoder)
352{ 345{
353 struct sun4i_tv *tv = drm_encoder_to_sun4i_tv(encoder); 346 struct sun4i_tv *tv = drm_encoder_to_sun4i_tv(encoder);
@@ -489,7 +482,6 @@ static void sun4i_tv_mode_set(struct drm_encoder *encoder,
489} 482}
490 483
491static struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = { 484static struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = {
492 .atomic_check = sun4i_tv_atomic_check,
493 .disable = sun4i_tv_disable, 485 .disable = sun4i_tv_disable,
494 .enable = sun4i_tv_enable, 486 .enable = sun4i_tv_enable,
495 .mode_set = sun4i_tv_mode_set, 487 .mode_set = sun4i_tv_mode_set,