Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: Nuke drm_atomic_helper_plane_set_property

It's dead code, the core handles all this directly now. This also
allows us to unexport drm_atomic_plane_set_property.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Mali DP Maintainers <malidp@foss.arm.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
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>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Philippe Cornu <philippe.cornu@st.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Eric Engestrom <eric@engestrom.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: intel-gfx@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170725080122.20548-6-daniel.vetter@ffwll.ch
Reviewed-by: Archit Taneja <architt@codeaurora.org>
Acked-by: Philippe Cornu <philippe.cornu@st.com>
Tested-by: Philippe Cornu <philippe.cornu@st.com>
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Acked-by: Vincent Abriou <vincent.abriou@st.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

+1 -81
-1
drivers/gpu/drm/arm/malidp_planes.c
··· 128 128 static const struct drm_plane_funcs malidp_de_plane_funcs = { 129 129 .update_plane = drm_atomic_helper_update_plane, 130 130 .disable_plane = drm_atomic_helper_disable_plane, 131 - .set_property = drm_atomic_helper_plane_set_property, 132 131 .destroy = malidp_de_plane_destroy, 133 132 .reset = malidp_plane_reset, 134 133 .atomic_duplicate_state = malidp_duplicate_plane_state,
-1
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
··· 1052 1052 static const struct drm_plane_funcs layer_plane_funcs = { 1053 1053 .update_plane = drm_atomic_helper_update_plane, 1054 1054 .disable_plane = drm_atomic_helper_disable_plane, 1055 - .set_property = drm_atomic_helper_plane_set_property, 1056 1055 .destroy = atmel_hlcdc_plane_destroy, 1057 1056 .reset = atmel_hlcdc_plane_reset, 1058 1057 .atomic_duplicate_state = atmel_hlcdc_plane_atomic_duplicate_state,
+1 -2
drivers/gpu/drm/drm_atomic.c
··· 713 713 * RETURNS: 714 714 * Zero on success, error code on failure 715 715 */ 716 - int drm_atomic_plane_set_property(struct drm_plane *plane, 716 + static int drm_atomic_plane_set_property(struct drm_plane *plane, 717 717 struct drm_plane_state *state, struct drm_property *property, 718 718 uint64_t val) 719 719 { ··· 770 770 771 771 return 0; 772 772 } 773 - EXPORT_SYMBOL(drm_atomic_plane_set_property); 774 773 775 774 /** 776 775 * drm_atomic_plane_get_property - get property value from plane state
-55
drivers/gpu/drm/drm_atomic_helper.c
··· 2954 2954 EXPORT_SYMBOL(drm_atomic_helper_resume); 2955 2955 2956 2956 /** 2957 - * drm_atomic_helper_plane_set_property - helper for plane properties 2958 - * @plane: DRM plane 2959 - * @property: DRM property 2960 - * @val: value of property 2961 - * 2962 - * Provides a default plane set_property handler using the atomic driver 2963 - * interface. 2964 - * 2965 - * RETURNS: 2966 - * Zero on success, error code on failure 2967 - */ 2968 - int 2969 - drm_atomic_helper_plane_set_property(struct drm_plane *plane, 2970 - struct drm_property *property, 2971 - uint64_t val) 2972 - { 2973 - struct drm_atomic_state *state; 2974 - struct drm_plane_state *plane_state; 2975 - int ret = 0; 2976 - 2977 - state = drm_atomic_state_alloc(plane->dev); 2978 - if (!state) 2979 - return -ENOMEM; 2980 - 2981 - /* ->set_property is always called with all locks held. */ 2982 - state->acquire_ctx = plane->dev->mode_config.acquire_ctx; 2983 - retry: 2984 - plane_state = drm_atomic_get_plane_state(state, plane); 2985 - if (IS_ERR(plane_state)) { 2986 - ret = PTR_ERR(plane_state); 2987 - goto fail; 2988 - } 2989 - 2990 - ret = drm_atomic_plane_set_property(plane, plane_state, 2991 - property, val); 2992 - if (ret) 2993 - goto fail; 2994 - 2995 - ret = drm_atomic_commit(state); 2996 - fail: 2997 - if (ret == -EDEADLK) 2998 - goto backoff; 2999 - 3000 - drm_atomic_state_put(state); 3001 - return ret; 3002 - 3003 - backoff: 3004 - drm_atomic_state_clear(state); 3005 - drm_atomic_legacy_backoff(state); 3006 - 3007 - goto retry; 3008 - } 3009 - EXPORT_SYMBOL(drm_atomic_helper_plane_set_property); 3010 - 3011 - /** 3012 2957 * drm_atomic_helper_connector_set_property - helper for connector properties 3013 2958 * @connector: DRM connector 3014 2959 * @property: DRM property
-1
drivers/gpu/drm/exynos/exynos_drm_plane.c
··· 173 173 .update_plane = drm_atomic_helper_update_plane, 174 174 .disable_plane = drm_atomic_helper_disable_plane, 175 175 .destroy = drm_plane_cleanup, 176 - .set_property = drm_atomic_helper_plane_set_property, 177 176 .reset = exynos_drm_plane_reset, 178 177 .atomic_duplicate_state = exynos_drm_plane_duplicate_state, 179 178 .atomic_destroy_state = exynos_drm_plane_destroy_state,
-1
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
··· 150 150 static struct drm_plane_funcs hibmc_plane_funcs = { 151 151 .update_plane = drm_atomic_helper_update_plane, 152 152 .disable_plane = drm_atomic_helper_disable_plane, 153 - .set_property = drm_atomic_helper_plane_set_property, 154 153 .destroy = drm_plane_cleanup, 155 154 .reset = drm_atomic_helper_plane_reset, 156 155 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
-1
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
··· 889 889 static struct drm_plane_funcs ade_plane_funcs = { 890 890 .update_plane = drm_atomic_helper_update_plane, 891 891 .disable_plane = drm_atomic_helper_disable_plane, 892 - .set_property = drm_atomic_helper_plane_set_property, 893 892 .destroy = drm_plane_cleanup, 894 893 .reset = drm_atomic_helper_plane_reset, 895 894 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
-2
drivers/gpu/drm/i915/intel_display.c
··· 13599 13599 .update_plane = drm_atomic_helper_update_plane, 13600 13600 .disable_plane = drm_atomic_helper_disable_plane, 13601 13601 .destroy = intel_plane_destroy, 13602 - .set_property = drm_atomic_helper_plane_set_property, 13603 13602 .atomic_get_property = intel_plane_atomic_get_property, 13604 13603 .atomic_set_property = intel_plane_atomic_set_property, 13605 13604 .atomic_duplicate_state = intel_plane_duplicate_state, ··· 13733 13734 .update_plane = intel_legacy_cursor_update, 13734 13735 .disable_plane = drm_atomic_helper_disable_plane, 13735 13736 .destroy = intel_plane_destroy, 13736 - .set_property = drm_atomic_helper_plane_set_property, 13737 13737 .atomic_get_property = intel_plane_atomic_get_property, 13738 13738 .atomic_set_property = intel_plane_atomic_set_property, 13739 13739 .atomic_duplicate_state = intel_plane_duplicate_state,
-2
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
··· 246 246 .update_plane = drm_atomic_helper_update_plane, 247 247 .disable_plane = drm_atomic_helper_disable_plane, 248 248 .destroy = mdp5_plane_destroy, 249 - .set_property = drm_atomic_helper_plane_set_property, 250 249 .atomic_set_property = mdp5_plane_atomic_set_property, 251 250 .atomic_get_property = mdp5_plane_atomic_get_property, 252 251 .reset = mdp5_plane_reset, ··· 258 259 .update_plane = mdp5_update_cursor_plane_legacy, 259 260 .disable_plane = drm_atomic_helper_disable_plane, 260 261 .destroy = mdp5_plane_destroy, 261 - .set_property = drm_atomic_helper_plane_set_property, 262 262 .atomic_set_property = mdp5_plane_atomic_set_property, 263 263 .atomic_get_property = mdp5_plane_atomic_get_property, 264 264 .reset = mdp5_plane_reset,
-1
drivers/gpu/drm/nouveau/nv50_display.c
··· 1055 1055 .disable_plane = drm_atomic_helper_disable_plane, 1056 1056 .destroy = nv50_wndw_destroy, 1057 1057 .reset = nv50_wndw_reset, 1058 - .set_property = drm_atomic_helper_plane_set_property, 1059 1058 .atomic_duplicate_state = nv50_wndw_atomic_duplicate_state, 1060 1059 .atomic_destroy_state = nv50_wndw_atomic_destroy_state, 1061 1060 };
-1
drivers/gpu/drm/omapdrm/omap_plane.c
··· 235 235 .disable_plane = drm_atomic_helper_disable_plane, 236 236 .reset = omap_plane_reset, 237 237 .destroy = omap_plane_destroy, 238 - .set_property = drm_atomic_helper_plane_set_property, 239 238 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, 240 239 .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, 241 240 .atomic_set_property = omap_plane_atomic_set_property,
-1
drivers/gpu/drm/rcar-du/rcar_du_plane.c
··· 698 698 .update_plane = drm_atomic_helper_update_plane, 699 699 .disable_plane = drm_atomic_helper_disable_plane, 700 700 .reset = rcar_du_plane_reset, 701 - .set_property = drm_atomic_helper_plane_set_property, 702 701 .destroy = drm_plane_cleanup, 703 702 .atomic_duplicate_state = rcar_du_plane_atomic_duplicate_state, 704 703 .atomic_destroy_state = rcar_du_plane_atomic_destroy_state,
-1
drivers/gpu/drm/rcar-du/rcar_du_vsp.c
··· 383 383 .update_plane = drm_atomic_helper_update_plane, 384 384 .disable_plane = drm_atomic_helper_disable_plane, 385 385 .reset = rcar_du_vsp_plane_reset, 386 - .set_property = drm_atomic_helper_plane_set_property, 387 386 .destroy = drm_plane_cleanup, 388 387 .atomic_duplicate_state = rcar_du_vsp_plane_atomic_duplicate_state, 389 388 .atomic_destroy_state = rcar_du_vsp_plane_atomic_destroy_state,
-1
drivers/gpu/drm/sti/sti_cursor.c
··· 348 348 .update_plane = drm_atomic_helper_update_plane, 349 349 .disable_plane = drm_atomic_helper_disable_plane, 350 350 .destroy = sti_cursor_destroy, 351 - .set_property = drm_atomic_helper_plane_set_property, 352 351 .reset = sti_plane_reset, 353 352 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, 354 353 .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-1
drivers/gpu/drm/sti/sti_gdp.c
··· 895 895 .update_plane = drm_atomic_helper_update_plane, 896 896 .disable_plane = drm_atomic_helper_disable_plane, 897 897 .destroy = sti_gdp_destroy, 898 - .set_property = drm_atomic_helper_plane_set_property, 899 898 .reset = sti_plane_reset, 900 899 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, 901 900 .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-1
drivers/gpu/drm/sti/sti_hqvdp.c
··· 1276 1276 .update_plane = drm_atomic_helper_update_plane, 1277 1277 .disable_plane = drm_atomic_helper_disable_plane, 1278 1278 .destroy = sti_hqvdp_destroy, 1279 - .set_property = drm_atomic_helper_plane_set_property, 1280 1279 .reset = sti_plane_reset, 1281 1280 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, 1282 1281 .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-1
drivers/gpu/drm/stm/ltdc.c
··· 685 685 .update_plane = drm_atomic_helper_update_plane, 686 686 .disable_plane = drm_atomic_helper_disable_plane, 687 687 .destroy = drm_plane_cleanup, 688 - .set_property = drm_atomic_helper_plane_set_property, 689 688 .reset = drm_atomic_helper_plane_reset, 690 689 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, 691 690 .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-1
drivers/gpu/drm/tilcdc/tilcdc_plane.c
··· 28 28 .update_plane = drm_atomic_helper_update_plane, 29 29 .disable_plane = drm_atomic_helper_disable_plane, 30 30 .destroy = drm_plane_cleanup, 31 - .set_property = drm_atomic_helper_plane_set_property, 32 31 .reset = drm_atomic_helper_plane_reset, 33 32 .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, 34 33 .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-3
include/drm/drm_atomic.h
··· 315 315 struct drm_plane_state * __must_check 316 316 drm_atomic_get_plane_state(struct drm_atomic_state *state, 317 317 struct drm_plane *plane); 318 - int drm_atomic_plane_set_property(struct drm_plane *plane, 319 - struct drm_plane_state *state, struct drm_property *property, 320 - uint64_t val); 321 318 struct drm_connector_state * __must_check 322 319 drm_atomic_get_connector_state(struct drm_atomic_state *state, 323 320 struct drm_connector *connector);
-3
include/drm/drm_atomic_helper.h
··· 124 124 int drm_atomic_helper_resume(struct drm_device *dev, 125 125 struct drm_atomic_state *state); 126 126 127 - int drm_atomic_helper_plane_set_property(struct drm_plane *plane, 128 - struct drm_property *property, 129 - uint64_t val); 130 127 int drm_atomic_helper_connector_set_property(struct drm_connector *connector, 131 128 struct drm_property *property, 132 129 uint64_t val);