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

Commit ae9a911b authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Convert intel_dvo to use atomic state 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470755054-32699-10-git-send-email-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 225cc348

drivers/gpu/drm/i915/intel_dvo.c

+5 −7
Original line number Diff line number Diff line
@@ -194,13 +194,12 @@ static void intel_enable_dvo(struct intel_encoder *encoder, 
{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_dvo *intel_dvo = enc_to_dvo(encoder);

	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);

	i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg;

	u32 temp = I915_READ(dvo_reg);



	intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev,

					 &crtc->config->base.mode,

					 &crtc->config->base.adjusted_mode);

					 &pipe_config->base.mode,

					 &pipe_config->base.adjusted_mode);



	I915_WRITE(dvo_reg, temp | DVO_ENABLE);

	I915_READ(dvo_reg);
@@ -262,10 +261,9 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder, 
				 struct intel_crtc_state *pipe_config,

				 struct drm_connector_state *conn_state)

{

	struct drm_device *dev = encoder->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);

	const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);

	const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;

	struct intel_dvo *intel_dvo = enc_to_dvo(encoder);

	int pipe = crtc->pipe;

	u32 dvo_val;