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

Commit 482b0e3c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Nuke drm_atomic_helper_connector_set_property 



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

The only special case is nouveau which used one function for both
pre-nv50 legacy modeset code and post-nv50 atomic world instead of 2
vtables. But amounts to exactly the same.

What is rather strange here is how few drivers set this up, I suspect
the earlier patch to handle properties in the core did end up fixing a
pile of possible issues.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.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: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: intel-gfx@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170725080122.20548-7-daniel.vetter@ffwll.ch


Acked-by: default avatarVincent Abriou <vincent.abriou@st.com>
parent e90271bc

drivers/gpu/drm/drm_atomic.c

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

 * Zero on success, error code on failure

 */

int drm_atomic_connector_set_property(struct drm_connector *connector,

static int drm_atomic_connector_set_property(struct drm_connector *connector,

		struct drm_connector_state *state, struct drm_property *property,

		uint64_t val)

{
@@ -1211,7 +1211,6 @@ int drm_atomic_connector_set_property(struct drm_connector *connector, 


	return 0;

}

EXPORT_SYMBOL(drm_atomic_connector_set_property);



static void drm_atomic_connector_print_state(struct drm_printer *p,

		const struct drm_connector_state *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_connector_set_property - helper for connector properties

 * @connector: DRM connector

 * @property: DRM property

 * @val: value of property

 *

 * Provides a default connector set_property handler using the atomic driver

 * interface.

 *

 * RETURNS:

 * Zero on success, error code on failure

 */

int

drm_atomic_helper_connector_set_property(struct drm_connector *connector,

				    struct drm_property *property,

				    uint64_t val)

{

	struct drm_atomic_state *state;

	struct drm_connector_state *connector_state;

	int ret = 0;



	state = drm_atomic_state_alloc(connector->dev);

	if (!state)

		return -ENOMEM;



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

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

retry:

	connector_state = drm_atomic_get_connector_state(state, connector);

	if (IS_ERR(connector_state)) {

		ret = PTR_ERR(connector_state);

		goto fail;

	}



	ret = drm_atomic_connector_set_property(connector, connector_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_connector_set_property);



static int page_flip_common(struct drm_atomic_state *state,

			    struct drm_crtc *crtc,

			    struct drm_framebuffer *fb,

drivers/gpu/drm/i915/intel_crt.c

+0 −1
Original line number Diff line number Diff line
@@ -807,7 +807,6 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = { 
	.late_register = intel_connector_register,

	.early_unregister = intel_connector_unregister,

	.destroy = intel_crt_destroy,

	.set_property = drm_atomic_helper_connector_set_property,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

};

drivers/gpu/drm/i915/intel_dp.c

+0 −1
Original line number Diff line number Diff line
@@ -5010,7 +5010,6 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = { 
	.dpms = drm_atomic_helper_connector_dpms,

	.force = intel_dp_force,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = drm_atomic_helper_connector_set_property,

	.atomic_get_property = intel_digital_connector_atomic_get_property,

	.atomic_set_property = intel_digital_connector_atomic_set_property,

	.late_register = intel_dp_connector_register,

drivers/gpu/drm/i915/intel_dp_mst.c

+0 −1
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ static const struct drm_connector_funcs intel_dp_mst_connector_funcs = { 
	.dpms = drm_atomic_helper_connector_dpms,

	.detect = intel_dp_mst_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = drm_atomic_helper_connector_set_property,

	.late_register = intel_connector_register,

	.early_unregister = intel_connector_unregister,

	.destroy = intel_dp_mst_connector_destroy,