Skip to content

Commit

Permalink
drm/i915: Split shared dpll setup out of __intel_set_mode()
Browse files Browse the repository at this point in the history
This simplifies __intel_set_mode() a little.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Ander Conselvan de Oliveira authored and Daniel Vetter committed Jan 30, 2015
1 parent 0785950 commit ed6739e
Showing 1 changed file with 33 additions and 17 deletions.
50 changes: 33 additions & 17 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -11021,6 +11021,36 @@ intel_modeset_compute_config(struct drm_crtc *crtc,
return pipe_config;
}

static int __intel_set_mode_setup_plls(struct drm_device *dev,
unsigned modeset_pipes,
unsigned disable_pipes)
{
struct drm_i915_private *dev_priv = to_i915(dev);
unsigned clear_pipes = modeset_pipes | disable_pipes;
struct intel_crtc *intel_crtc;
int ret = 0;

if (!dev_priv->display.crtc_compute_clock)
return 0;

ret = intel_shared_dpll_start_config(dev_priv, clear_pipes);
if (ret)
goto done;

for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) {
struct intel_crtc_state *state = intel_crtc->new_config;
ret = dev_priv->display.crtc_compute_clock(intel_crtc,
state);
if (ret) {
intel_shared_dpll_abort_config(dev_priv);
goto done;
}
}

done:
return ret;
}

static int __intel_set_mode(struct drm_crtc *crtc,
struct drm_display_mode *mode,
int x, int y, struct drm_framebuffer *fb,
Expand Down Expand Up @@ -11058,23 +11088,9 @@ static int __intel_set_mode(struct drm_crtc *crtc,
prepare_pipes &= ~disable_pipes;
}

if (dev_priv->display.crtc_compute_clock) {
unsigned clear_pipes = modeset_pipes | disable_pipes;

ret = intel_shared_dpll_start_config(dev_priv, clear_pipes);
if (ret)
goto done;

for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) {
struct intel_crtc_state *state = intel_crtc->new_config;
ret = dev_priv->display.crtc_compute_clock(intel_crtc,
state);
if (ret) {
intel_shared_dpll_abort_config(dev_priv);
goto done;
}
}
}
ret = __intel_set_mode_setup_plls(dev, modeset_pipes, disable_pipes);
if (ret)
goto done;

for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc)
intel_crtc_disable(&intel_crtc->base);
Expand Down

0 comments on commit ed6739e

Please sign in to comment.