diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-08-19 04:39:29 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-19 04:58:55 -0400 |
| commit | 420382adf64c93d2fc83b764013103c6035d8617 (patch) | |
| tree | 80d58e065c6265b4aafaafeefed36b6037a61860 /drivers/gpu/drm/tegra | |
| parent | 7ad61e6b4a79c5057eeb2d6062b0021e33ddc9f6 (diff) | |
drm: Don't implement empty prepare_fb()/cleanup_fb()
The plane .prepare_fb() and .cleanup_fb() helpers are optional, there's
no need to implement empty stubs, and no need to explicitly set the
function pointers to NULL either.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[danvet: Resolved conflicts with Chris' patch.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/tegra')
| -rw-r--r-- | drivers/gpu/drm/tegra/dc.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index a02730f90861..3de7ce33d3d4 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c | |||
| @@ -480,17 +480,6 @@ static const struct drm_plane_funcs tegra_primary_plane_funcs = { | |||
| 480 | .atomic_destroy_state = tegra_plane_atomic_destroy_state, | 480 | .atomic_destroy_state = tegra_plane_atomic_destroy_state, |
| 481 | }; | 481 | }; |
| 482 | 482 | ||
| 483 | static int tegra_plane_prepare_fb(struct drm_plane *plane, | ||
| 484 | struct drm_plane_state *new_state) | ||
| 485 | { | ||
| 486 | return 0; | ||
| 487 | } | ||
| 488 | |||
| 489 | static void tegra_plane_cleanup_fb(struct drm_plane *plane, | ||
| 490 | struct drm_plane_state *old_fb) | ||
| 491 | { | ||
| 492 | } | ||
| 493 | |||
| 494 | static int tegra_plane_state_add(struct tegra_plane *plane, | 483 | static int tegra_plane_state_add(struct tegra_plane *plane, |
| 495 | struct drm_plane_state *state) | 484 | struct drm_plane_state *state) |
| 496 | { | 485 | { |
| @@ -624,8 +613,6 @@ static void tegra_plane_atomic_disable(struct drm_plane *plane, | |||
| 624 | } | 613 | } |
| 625 | 614 | ||
| 626 | static const struct drm_plane_helper_funcs tegra_primary_plane_helper_funcs = { | 615 | static const struct drm_plane_helper_funcs tegra_primary_plane_helper_funcs = { |
| 627 | .prepare_fb = tegra_plane_prepare_fb, | ||
| 628 | .cleanup_fb = tegra_plane_cleanup_fb, | ||
| 629 | .atomic_check = tegra_plane_atomic_check, | 616 | .atomic_check = tegra_plane_atomic_check, |
| 630 | .atomic_update = tegra_plane_atomic_update, | 617 | .atomic_update = tegra_plane_atomic_update, |
| 631 | .atomic_disable = tegra_plane_atomic_disable, | 618 | .atomic_disable = tegra_plane_atomic_disable, |
| @@ -796,8 +783,6 @@ static const struct drm_plane_funcs tegra_cursor_plane_funcs = { | |||
| 796 | }; | 783 | }; |
| 797 | 784 | ||
| 798 | static const struct drm_plane_helper_funcs tegra_cursor_plane_helper_funcs = { | 785 | static const struct drm_plane_helper_funcs tegra_cursor_plane_helper_funcs = { |
| 799 | .prepare_fb = tegra_plane_prepare_fb, | ||
| 800 | .cleanup_fb = tegra_plane_cleanup_fb, | ||
| 801 | .atomic_check = tegra_cursor_atomic_check, | 786 | .atomic_check = tegra_cursor_atomic_check, |
| 802 | .atomic_update = tegra_cursor_atomic_update, | 787 | .atomic_update = tegra_cursor_atomic_update, |
| 803 | .atomic_disable = tegra_cursor_atomic_disable, | 788 | .atomic_disable = tegra_cursor_atomic_disable, |
| @@ -866,8 +851,6 @@ static const uint32_t tegra_overlay_plane_formats[] = { | |||
| 866 | }; | 851 | }; |
| 867 | 852 | ||
| 868 | static const struct drm_plane_helper_funcs tegra_overlay_plane_helper_funcs = { | 853 | static const struct drm_plane_helper_funcs tegra_overlay_plane_helper_funcs = { |
| 869 | .prepare_fb = tegra_plane_prepare_fb, | ||
| 870 | .cleanup_fb = tegra_plane_cleanup_fb, | ||
| 871 | .atomic_check = tegra_plane_atomic_check, | 854 | .atomic_check = tegra_plane_atomic_check, |
| 872 | .atomic_update = tegra_plane_atomic_update, | 855 | .atomic_update = tegra_plane_atomic_update, |
| 873 | .atomic_disable = tegra_plane_atomic_disable, | 856 | .atomic_disable = tegra_plane_atomic_disable, |
