mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
drm/i915: Enable DVO between mode_set and dpms hooks
To more closely match the IEGD ns2501 driver behaviour, call the mode_set hook while the DVO port is still disabled, then enable the DVO port, and finally call the dpms hook. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Tested-by: Thomas Richter <richter@rus.uni-stuttgart.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
316e0157a9
commit
c9c054c203
1 changed files with 3 additions and 2 deletions
|
@ -185,12 +185,13 @@ static void intel_enable_dvo(struct intel_encoder *encoder)
|
||||||
u32 dvo_reg = intel_dvo->dev.dvo_reg;
|
u32 dvo_reg = intel_dvo->dev.dvo_reg;
|
||||||
u32 temp = I915_READ(dvo_reg);
|
u32 temp = I915_READ(dvo_reg);
|
||||||
|
|
||||||
I915_WRITE(dvo_reg, temp | DVO_ENABLE);
|
|
||||||
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.requested_mode,
|
&crtc->config.requested_mode,
|
||||||
&crtc->config.adjusted_mode);
|
&crtc->config.adjusted_mode);
|
||||||
|
|
||||||
|
I915_WRITE(dvo_reg, temp | DVO_ENABLE);
|
||||||
|
I915_READ(dvo_reg);
|
||||||
|
|
||||||
intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true);
|
intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue