diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2013-03-13 14:05:41 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-23 12:18:03 +0100 |
| commit | 7eb552aeae058a88eece91b902dd51fde45b1f41 (patch) | |
| tree | e22e782c323745aaa26fbae20490af31ceff554b /drivers/gpu/drm/i915/i915_irq.c | |
| parent | a15326a57c4d282803765b0a45c53ea4a8c2c94b (diff) | |
| download | lwn-7eb552aeae058a88eece91b902dd51fde45b1f41.tar.gz lwn-7eb552aeae058a88eece91b902dd51fde45b1f41.zip | |
drm/i915: Move num_pipes to intel info
Requested by Daniel.
v2: Fix incorrect num_pipe settings. (Chris)
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 62285ff03083..5fc178e1e515 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -254,10 +254,9 @@ static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe, struct timeval *vblank_time, unsigned flags) { - struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc; - if (pipe < 0 || pipe >= dev_priv->num_pipe) { + if (pipe < 0 || pipe >= INTEL_INFO(dev)->num_pipes) { DRM_ERROR("Invalid crtc %d\n", pipe); return -EINVAL; } |