diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-25 22:02:03 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-10 22:13:31 +0200 |
| commit | df8ad70ca34f9bdf7e070d1a430bbdcac6acee12 (patch) | |
| tree | 6297999ad809760fdde59de8f77362763a1f008d /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | 716c2e55100ff5588bd2bbca14951ef11624cba2 (diff) | |
drm/i915: Only touch WRPLL hw state in enable/disable hooks
To be able to do this we need to separately keep track of how many
crtcs need a given WRPLL and how many actually actively use it. The
common shared dpll framework already has all this, including massive
state readout and cross checking. Which allows us to do this switch in
a fairly small patch.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 60e67a11791b..b2267249c1c0 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -386,16 +386,6 @@ intel_ddi_get_crtc_encoder(struct drm_crtc *crtc) return ret; } -void intel_ddi_put_crtc_pll(struct drm_crtc *crtc) -{ - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - - if (intel_crtc_to_shared_dpll(intel_crtc)) - intel_disable_shared_dpll(intel_crtc); - - intel_put_shared_dpll(intel_crtc); -} - #define LC_FREQ 2700 #define LC_FREQ_2K (LC_FREQ * 2000) @@ -716,7 +706,7 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc) int type = intel_encoder->type; int clock = intel_crtc->config.port_clock; - intel_ddi_put_crtc_pll(crtc); + intel_put_shared_dpll(intel_crtc); if (type == INTEL_OUTPUT_HDMI) { struct intel_shared_dpll *pll; |