|
@@ -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 drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
|
|
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;
|
|
i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg;
|
|
u32 temp = I915_READ(dvo_reg);
|
|
u32 temp = I915_READ(dvo_reg);
|
|
|
|
|
|
intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev,
|
|
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_WRITE(dvo_reg, temp | DVO_ENABLE);
|
|
I915_READ(dvo_reg);
|
|
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 intel_crtc_state *pipe_config,
|
|
struct drm_connector_state *conn_state)
|
|
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);
|
|
struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
|
|
int pipe = crtc->pipe;
|
|
int pipe = crtc->pipe;
|
|
u32 dvo_val;
|
|
u32 dvo_val;
|