[PATCH 4/8] drm: Nuke drm_atomic_helper_crtc_set_property
Archit Taneja
architt at codeaurora.org
Tue Jul 25 09:38:05 UTC 2017
On 07/25/2017 01:31 PM, Daniel Vetter wrote:
> It's dead code because this is now handled in the core.
Reviewed-by: Archit Taneja <architt at codeaurora.org>
>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Boris Brezillon <boris.brezillon at free-electrons.com>
> Cc: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Cc: Sean Paul <seanpaul at chromium.org>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Ben Skeggs <bskeggs at redhat.com>
> Cc: Tomi Valkeinen <tomi.valkeinen at ti.com>
> Cc: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
> Cc: Alexey Brodkin <abrodkin at synopsys.com>
> Cc: Shawn Guo <shawn.guo at linaro.org>
> Cc: Eric Engestrom <eric at engestrom.ch>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: "Ville Syrjälä" <ville.syrjala at linux.intel.com>
> Cc: Rob Clark <robdclark at gmail.com>
> Cc: Philippe Cornu <philippe.cornu at st.com>
> Cc: Masahiro Yamada <yamada.masahiro at socionext.com>
> Cc: Sushmita Susheelendra <ssusheel at codeaurora.org>
> Cc: Archit Taneja <architt at codeaurora.org>
> Cc: intel-gfx at lists.freedesktop.org
> Cc: nouveau at lists.freedesktop.org
> Cc: Philipp Zabel <p.zabel at pengutronix.de>
> Cc: Maxime Ripard <maxime.ripard at free-electrons.com>
> Cc: Thomas Hellstrom <thellstrom at vmware.com>
> ---
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 1 -
> drivers/gpu/drm/drm_atomic_helper.c | 55 -------------------------
> drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 -
> drivers/gpu/drm/i915/intel_display.c | 1 -
> drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 1 -
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 -
> drivers/gpu/drm/nouveau/nv50_display.c | 1 -
> drivers/gpu/drm/omapdrm/omap_crtc.c | 1 -
> include/drm/drm_atomic_helper.h | 3 --
> 9 files changed, 66 deletions(-)
>
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> index 4fbbeab5c5d4..d73281095fac 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> @@ -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,
> };
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 4a960c741e35..22245aa8b1aa 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -2968,61 +2968,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
> * @property: DRM property
> diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> index 706efd0c4190..961551135a39 100644
> --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> @@ -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,
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f7b128c33aa1..b4d0c5298a53 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12373,7 +12373,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,
> diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> index 3c7a9d343e05..47fa2aba1983 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
> @@ -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,
> diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> index 4322a502555a..5e3bc7224eee 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
> @@ -919,7 +919,6 @@ static const struct drm_crtc_funcs mdp5_crtc_funcs = {
> .set_config = drm_atomic_helper_set_config,
> .destroy = mdp5_crtc_destroy,
> .page_flip = drm_atomic_helper_page_flip,
> - .set_property = drm_atomic_helper_crtc_set_property,
> .reset = mdp5_crtc_reset,
> .atomic_duplicate_state = mdp5_crtc_duplicate_state,
> .atomic_destroy_state = mdp5_crtc_destroy_state,
> @@ -932,7 +931,6 @@ static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = {
> .set_config = drm_atomic_helper_set_config,
> .destroy = mdp5_crtc_destroy,
> .page_flip = drm_atomic_helper_page_flip,
> - .set_property = drm_atomic_helper_crtc_set_property,
> .reset = mdp5_crtc_reset,
> .atomic_duplicate_state = mdp5_crtc_duplicate_state,
> .atomic_destroy_state = mdp5_crtc_destroy_state,
> diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
> index 9d40b2a8be4d..aa6fc525c539 100644
> --- a/drivers/gpu/drm/nouveau/nv50_display.c
> +++ b/drivers/gpu/drm/nouveau/nv50_display.c
> @@ -2325,7 +2325,6 @@ nv50_head_func = {
> .destroy = nv50_head_destroy,
> .set_config = drm_atomic_helper_set_config,
> .page_flip = drm_atomic_helper_page_flip,
> - .set_property = drm_atomic_helper_crtc_set_property,
> .atomic_duplicate_state = nv50_head_atomic_duplicate_state,
> .atomic_destroy_state = nv50_head_atomic_destroy_state,
> };
> diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
> index efa525442e7d..33ed24e9c599 100644
> --- a/drivers/gpu/drm/omapdrm/omap_crtc.c
> +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
> @@ -550,7 +550,6 @@ static const struct drm_crtc_funcs omap_crtc_funcs = {
> .destroy = omap_crtc_destroy,
> .page_flip = drm_atomic_helper_page_flip,
> .gamma_set = drm_atomic_helper_legacy_gamma_set,
> - .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,
> .atomic_set_property = omap_crtc_atomic_set_property,
> diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
> index d6ddf5bc5fdd..e5c835d94540 100644
> --- a/include/drm/drm_atomic_helper.h
> +++ b/include/drm/drm_atomic_helper.h
> @@ -124,9 +124,6 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state,
> int drm_atomic_helper_resume(struct drm_device *dev,
> struct drm_atomic_state *state);
>
> -int drm_atomic_helper_crtc_set_property(struct drm_crtc *crtc,
> - struct drm_property *property,
> - uint64_t val);
> int drm_atomic_helper_plane_set_property(struct drm_plane *plane,
> struct drm_property *property,
> uint64_t val);
>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
More information about the dri-devel
mailing list