Commit 630d30a4 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Convert intel_sdvo connector properties to atomic. 



SDVO was the last connector that's still using the legacy paths
for properties, and this is with a reason!

This connector implements a lot of properties dynamically,
and some of them shared with the digital connector state,
so sdvo_connector_state subclasses intel_digital_connector_state.

set_property had a lot of validation, but this is handled in the
drm core, so most of the validation can die off. The properties
are written right before enabling the connector, since there is no
good way to update the properties without crtc.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170501133804.8116-13-maarten.lankhorst@linux.intel.com
parent b32962f8

drivers/gpu/drm/i915/intel_atomic.c

+0 −40
Original line number Diff line number Diff line
@@ -35,46 +35,6 @@ 
#include <drm/drm_plane_helper.h>

#include "intel_drv.h"



/**

 * intel_connector_atomic_get_property - fetch legacy connector property value

 * @connector: connector to fetch property for

 * @state: state containing the property value

 * @property: property to look up

 * @val: pointer to write property value into

 *

 * The DRM core does not store shadow copies of properties for

 * atomic-capable drivers.  This entrypoint is used to fetch

 * the current value of a driver-specific connector property.

 *

 * This is a intermediary solution until all connectors are

 * converted to support full atomic properties.

 */

int intel_connector_atomic_get_property(struct drm_connector *connector,

					const struct drm_connector_state *state,

					struct drm_property *property,

					uint64_t *val)

{

	int i;



	/*

	 * TODO: We only have atomic modeset for planes at the moment, so the

	 * crtc/connector code isn't quite ready yet.  Until it's ready,

	 * continue to look up all property values in the DRM's shadow copy

	 * in obj->properties->values[].

	 *

	 * When the crtc/connector state work matures, this function should

	 * be updated to read the values out of the state structure instead.

	 */

	for (i = 0; i < connector->base.properties->count; i++) {

		if (connector->base.properties->properties[i] == property) {

			*val = connector->base.properties->values[i];

			return 0;

		}

	}



	return -EINVAL;

}



/**

 * intel_digital_connector_atomic_get_property - hook for connector->atomic_get_property.

 * @connector: Connector to get the property for.

drivers/gpu/drm/i915/intel_display.c

+0 −37
Original line number Diff line number Diff line
@@ -13262,43 +13262,6 @@ static int intel_atomic_commit(struct drm_device *dev, 
	return 0;

}



void intel_crtc_restore_mode(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_atomic_state *state;

	struct drm_crtc_state *crtc_state;

	int ret;



	state = drm_atomic_state_alloc(dev);

	if (!state) {

		DRM_DEBUG_KMS("[CRTC:%d:%s] crtc restore failed, out of memory",

			      crtc->base.id, crtc->name);

		return;

	}



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



retry:

	crtc_state = drm_atomic_get_crtc_state(state, crtc);

	ret = PTR_ERR_OR_ZERO(crtc_state);

	if (!ret) {

		if (!crtc_state->active)

			goto out;



		crtc_state->mode_changed = true;

		ret = drm_atomic_commit(state);

	}



	if (ret == -EDEADLK) {

		drm_atomic_state_clear(state);

		drm_modeset_backoff(state->acquire_ctx);

		goto retry;

	}



out:

	drm_atomic_state_put(state);

}



static const struct drm_crtc_funcs intel_crtc_funcs = {

	.gamma_set = drm_atomic_helper_legacy_gamma_set,

	.set_config = drm_atomic_helper_set_config,

drivers/gpu/drm/i915/intel_drv.h

+0 −6
Original line number Diff line number Diff line
@@ -1349,7 +1349,6 @@ unsigned int intel_rotation_info_size(const struct intel_rotation_info *rot_info 
bool intel_has_pending_fb_unpin(struct drm_i915_private *dev_priv);

void intel_mark_busy(struct drm_i915_private *dev_priv);

void intel_mark_idle(struct drm_i915_private *dev_priv);

void intel_crtc_restore_mode(struct drm_crtc *crtc);

int intel_display_suspend(struct drm_device *dev);

void intel_pps_unlock_regs_wa(struct drm_i915_private *dev_priv);

void intel_encoder_destroy(struct drm_encoder *encoder);
@@ -1911,11 +1910,6 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work 
void intel_tv_init(struct drm_i915_private *dev_priv);



/* intel_atomic.c */

int intel_connector_atomic_get_property(struct drm_connector *connector,

					const struct drm_connector_state *state,

					struct drm_property *property,

					uint64_t *val);



int intel_digital_connector_atomic_get_property(struct drm_connector *connector,

						const struct drm_connector_state *state,

						struct drm_property *property,

drivers/gpu/drm/i915/intel_sdvo.c

+280 −238

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE