UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: s/ironlake_/intel_ for the enable_share_dpll function 

Besides the fairly useless BUG_ON the logic is completely generic
and cane be used on any platform what wants to reuse the shared
dpll support code.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-04-24 23:55:14 +02:00
parent b14b105586
commit 85b3894f79
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/intel_display.c
View File

@ -1756,21 +1756,19 @@ static void intel_prepare_shared_dpll(struct intel_crtc *crtc)
} }
/** /**
* ironlake_enable_shared_dpll - enable PCH PLL * intel_enable_shared_dpll - enable PCH PLL
* @dev_priv: i915 private structure * @dev_priv: i915 private structure
* @pipe: pipe PLL to enable * @pipe: pipe PLL to enable
* *
* The PCH PLL needs to be enabled before the PCH transcoder, since it * The PCH PLL needs to be enabled before the PCH transcoder, since it
* drives the transcoder clock. * drives the transcoder clock.
*/ */
static void ironlake_enable_shared_dpll(struct intel_crtc *crtc) static void intel_enable_shared_dpll(struct intel_crtc *crtc)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_shared_dpll *pll = intel_crtc_to_shared_dpll(crtc); struct intel_shared_dpll *pll = intel_crtc_to_shared_dpll(crtc);
/* PCH PLLs only available on ILK, SNB and IVB */
BUG_ON(INTEL_INFO(dev)->gen < 5);
if (WARN_ON(pll == NULL)) if (WARN_ON(pll == NULL))
return; return;
@ -3514,7 +3512,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
* Note that enable_shared_dpll tries to do the right thing, but * Note that enable_shared_dpll tries to do the right thing, but
* get_shared_dpll unconditionally resets the pll - we need that to have * get_shared_dpll unconditionally resets the pll - we need that to have
* the right LVDS enable sequence. */ * the right LVDS enable sequence. */
ironlake_enable_shared_dpll(intel_crtc); intel_enable_shared_dpll(intel_crtc);
/* set transcoder timing, panel must allow it */ /* set transcoder timing, panel must allow it */
assert_panel_unlocked(dev_priv, pipe); assert_panel_unlocked(dev_priv, pipe);