diff options
| author | Daniel Vetter | 2012-08-12 19:27:13 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-08-17 10:10:03 +0200 |
| commit | 5d985ac81ab15631570cad83d187565c7fcfd00a (patch) | |
| tree | bd80787e2fe3756f4f92ca312c15b2fe27f4610c /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: simplify dvo dpms interface (diff) | |
| download | kernel-qcow2-linux-5d985ac81ab15631570cad83d187565c7fcfd00a.tar.gz kernel-qcow2-linux-5d985ac81ab15631570cad83d187565c7fcfd00a.tar.xz kernel-qcow2-linux-5d985ac81ab15631570cad83d187565c7fcfd00a.zip | |
drm/i915: kill a few unused things in dev_priv
... and move a few others only used by i915_dma.c into the dri1
dungeon.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 261fe2175afb..ed3ba70923ac 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -428,12 +428,6 @@ typedef struct drm_i915_private { struct resource mch_res; - unsigned int cpp; - int back_offset; - int front_offset; - int current_page; - int page_flipping; - atomic_t irq_received; /* protects the irq masks */ @@ -451,7 +445,6 @@ typedef struct drm_i915_private { u32 hotplug_supported_mask; struct work_struct hotplug_work; - unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds; int num_pipe; int num_pch_pll; @@ -790,6 +783,12 @@ typedef struct drm_i915_private { struct { unsigned allow_batchbuffer : 1; u32 __iomem *gfx_hws_cpu_addr; + + unsigned int cpp; + int back_offset; + int front_offset; + int current_page; + int page_flipping; } dri1; /* Kernel Modesetting */ |