diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-06-06 18:59:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-06-08 09:31:16 +1000 |
| commit | a3524f1b27671eda909cde37da9caff41133b272 (patch) | |
| tree | cbad6f7fa8408ad0d26d706ae92d5adfcfcccec4 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 386f40c86d6c8d5b717ef20620af1a750d0dacb4 (diff) | |
drm/i915: fix oops on single crtc devices.
(regression fix since fbdev/kms rework).
My fb rework didn't remember about the 84/65s.
Reported-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 9ed8ecd9580..27658315984 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -278,6 +278,7 @@ typedef struct drm_i915_private { struct mem_block *agp_heap; unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds; int vblank_pipe; + int num_pipe; /* For hangcheck timer */ #define DRM_I915_HANGCHECK_PERIOD 75 /* in jiffies */ |