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

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

drm: Nuke drm_atomic_helper_crtc_set_property 



It's dead code because this is now handled in the core.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.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: Ben Skeggs <bskeggs@redhat.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Eric Engestrom <eric@engestrom.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Philippe Cornu <philippe.cornu@st.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Sushmita Susheelendra <ssusheel@codeaurora.org>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: intel-gfx@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170725080122.20548-5-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>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
parent 144a7999

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

+0 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ static const struct drm_crtc_funcs atmel_hlcdc_crtc_funcs = { 
	.atomic_destroy_state = atmel_hlcdc_crtc_destroy_state,

	.enable_vblank = atmel_hlcdc_crtc_enable_vblank,

	.disable_vblank = atmel_hlcdc_crtc_disable_vblank,

	.set_property = drm_atomic_helper_crtc_set_property,

	.gamma_set = drm_atomic_helper_legacy_gamma_set,

};

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_crtc_set_property - helper for crtc properties

 * @crtc: DRM crtc

 * @property: DRM property

 * @val: value of property

 *

 * Provides a default crtc set_property handler using the atomic driver

 * interface.

 *

 * RETURNS:

 * Zero on success, error code on failure

 */

int

drm_atomic_helper_crtc_set_property(struct drm_crtc *crtc,

				    struct drm_property *property,

				    uint64_t val)

{

	struct drm_atomic_state *state;

	struct drm_crtc_state *crtc_state;

	int ret = 0;



	state = drm_atomic_state_alloc(crtc->dev);

	if (!state)

		return -ENOMEM;



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

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

retry:

	crtc_state = drm_atomic_get_crtc_state(state, crtc);

	if (IS_ERR(crtc_state)) {

		ret = PTR_ERR(crtc_state);

		goto fail;

	}



	ret = drm_atomic_crtc_set_property(crtc, crtc_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_crtc_set_property);



/**

 * drm_atomic_helper_plane_set_property - helper for plane properties

 * @plane: DRM plane

drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c

+0 −1
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { 
	.set_config	= drm_atomic_helper_set_config,

	.page_flip	= drm_atomic_helper_page_flip,

	.reset		= drm_atomic_helper_crtc_reset,

	.set_property = drm_atomic_helper_crtc_set_property,

	.atomic_duplicate_state	= drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state	= drm_atomic_helper_crtc_destroy_state,

	.enable_vblank	= ade_crtc_enable_vblank,

drivers/gpu/drm/i915/intel_display.c

+0 −1
Original line number Diff line number Diff line
@@ -13323,7 +13323,6 @@ static int intel_atomic_commit(struct drm_device *dev, 
static const struct drm_crtc_funcs intel_crtc_funcs = {

	.gamma_set = drm_atomic_helper_legacy_gamma_set,

	.set_config = drm_atomic_helper_set_config,

	.set_property = drm_atomic_helper_crtc_set_property,

	.destroy = intel_crtc_destroy,

	.page_flip = drm_atomic_helper_page_flip,

	.atomic_duplicate_state = intel_crtc_duplicate_state,

drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c

+0 −1
Original line number Diff line number Diff line
@@ -484,7 +484,6 @@ static const struct drm_crtc_funcs mdp4_crtc_funcs = { 
	.set_config = drm_atomic_helper_set_config,

	.destroy = mdp4_crtc_destroy,

	.page_flip = drm_atomic_helper_page_flip,

	.set_property = drm_atomic_helper_crtc_set_property,

	.cursor_set = mdp4_crtc_cursor_set,

	.cursor_move = mdp4_crtc_cursor_move,

	.reset = drm_atomic_helper_crtc_reset,