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

Commit e90271bc authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarDaniel 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: default avatarArchit Taneja <architt@codeaurora.org>
Acked-by: default avatarPhilippe Cornu <philippe.cornu@st.com>
Tested-by: default avatarPhilippe Cornu <philippe.cornu@st.com>
Acked-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Acked-by: default avatarVincent Abriou <vincent.abriou@st.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent b6715570

drivers/gpu/drm/arm/malidp_planes.c

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static void malidp_plane_atomic_print_state(struct drm_printer *p, 
static const struct drm_plane_funcs malidp_de_plane_funcs = {

	.update_plane = drm_atomic_helper_update_plane,

	.disable_plane = drm_atomic_helper_disable_plane,

	.set_property = drm_atomic_helper_plane_set_property,

	.destroy = malidp_de_plane_destroy,

	.reset = malidp_plane_reset,

	.atomic_duplicate_state = malidp_duplicate_plane_state,

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+0 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,6 @@ static void atmel_hlcdc_plane_atomic_destroy_state(struct drm_plane *p, 
static const struct drm_plane_funcs layer_plane_funcs = {

	.update_plane = drm_atomic_helper_update_plane,

	.disable_plane = drm_atomic_helper_disable_plane,

	.set_property = drm_atomic_helper_plane_set_property,

	.destroy = atmel_hlcdc_plane_destroy,

	.reset = atmel_hlcdc_plane_reset,

	.atomic_duplicate_state = atmel_hlcdc_plane_atomic_duplicate_state,

drivers/gpu/drm/drm_atomic.c

+1 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ EXPORT_SYMBOL(drm_atomic_get_plane_state); 
 * RETURNS:

 * Zero on success, error code on failure

 */

int drm_atomic_plane_set_property(struct drm_plane *plane,

static int drm_atomic_plane_set_property(struct drm_plane *plane,

		struct drm_plane_state *state, struct drm_property *property,

		uint64_t val)

{
@@ -770,7 +770,6 @@ int drm_atomic_plane_set_property(struct drm_plane *plane, 


	return 0;

}

EXPORT_SYMBOL(drm_atomic_plane_set_property);



/**

 * drm_atomic_plane_get_property - get property value from plane state

drivers/gpu/drm/drm_atomic_helper.c

+0 −55
Original line number Diff line number Diff line
@@ -2953,61 +2953,6 @@ int drm_atomic_helper_resume(struct drm_device *dev, 
}

EXPORT_SYMBOL(drm_atomic_helper_resume);



/**

 * drm_atomic_helper_plane_set_property - helper for plane properties

 * @plane: DRM plane

 * @property: DRM property

 * @val: value of property

 *

 * Provides a default plane set_property handler using the atomic driver

 * interface.

 *

 * RETURNS:

 * Zero on success, error code on failure

 */

int

drm_atomic_helper_plane_set_property(struct drm_plane *plane,

				    struct drm_property *property,

				    uint64_t val)

{

	struct drm_atomic_state *state;

	struct drm_plane_state *plane_state;

	int ret = 0;



	state = drm_atomic_state_alloc(plane->dev);

	if (!state)

		return -ENOMEM;



	/* ->set_property is always called with all locks held. */

	state->acquire_ctx = plane->dev->mode_config.acquire_ctx;

retry:

	plane_state = drm_atomic_get_plane_state(state, plane);

	if (IS_ERR(plane_state)) {

		ret = PTR_ERR(plane_state);

		goto fail;

	}



	ret = drm_atomic_plane_set_property(plane, plane_state,

			property, val);

	if (ret)

		goto fail;



	ret = drm_atomic_commit(state);

fail:

	if (ret == -EDEADLK)

		goto backoff;



	drm_atomic_state_put(state);

	return ret;



backoff:

	drm_atomic_state_clear(state);

	drm_atomic_legacy_backoff(state);



	goto retry;

}

EXPORT_SYMBOL(drm_atomic_helper_plane_set_property);



/**

 * drm_atomic_helper_connector_set_property - helper for connector properties

 * @connector: DRM connector

drivers/gpu/drm/exynos/exynos_drm_plane.c

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ static struct drm_plane_funcs exynos_plane_funcs = { 
	.update_plane	= drm_atomic_helper_update_plane,

	.disable_plane	= drm_atomic_helper_disable_plane,

	.destroy	= drm_plane_cleanup,

	.set_property	= drm_atomic_helper_plane_set_property,

	.reset		= exynos_drm_plane_reset,

	.atomic_duplicate_state = exynos_drm_plane_duplicate_state,

	.atomic_destroy_state = exynos_drm_plane_destroy_state,