diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-21 11:45:40 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-21 11:45:40 +0200 |
| commit | d40d91876a58979374e39722399ee93e870a44c9 (patch) | |
| tree | 0f88607146771ae496439a5089d7f1d4aea6594d /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 4fa62c890cea83f28c30e1d5dc8fc86f61210280 (diff) | |
| parent | c5ab3bc07e252a32b170ab4797142ef117c367a0 (diff) | |
| download | op-kernel-dev-d40d91876a58979374e39722399ee93e870a44c9.zip op-kernel-dev-d40d91876a58979374e39722399ee93e870a44c9.tar.gz | |
Merge branch 'topic/drm-vblank-rework' into drm-intel-next-queued
Pull in the drm vblank rework from Ville and me. drm core parts acked
by Dave Airlie
Conflicts:
drivers/gpu/drm/i915/intel_display.c
Just a bit of fun around the placement of drm_vblank_on. This merge
resolution has been tested in drm-intel-nightly for a while already.
Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 787ad93..0aaa13a 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -455,8 +455,8 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev, * * Returns the previous state of underrun reporting. */ -bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, - enum pipe pipe, bool enable) +static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, + enum pipe pipe, bool enable) { struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; |
