Hi all, So I got a bit bored over the w/e and decided to take my broadsword and dwell a bit in the dri1 dragon dungeon. The big battle I've lost is against the cliprects stuff, we can't rip that out because dri1 userspace using gem depends upon that. DRI1 userspace using gem ... Otherwise my journey was pretty effective, all the dri1 dragons are now lined up in i915_dma.c, most of the useful stuff moved out of there. Left for Chris to give new cosy homes are - stolen mem handling - and gem init. Maybe we can also move some of the driver load and unload stuff to i915_drv.c, but that didn't look like a real improvement. Mostly because i915_drv.c is a rather mixed bag of various things. Review, flames and some help in sword-sharpening highly weclome. Cheers, Daniel Daniel Vetter (22): drm/i915: properly check for MODESET for kms driver ioctls drm/i915: disallow gem ums init ioctl for kms drm/i915: rip out GEM drm feature checks drm/i915: rip out dev_priv->has_gem drm/i915: check for kms in dri1 ioctls drm/i915: move dri1 vblank stubs to i915_dma.c drm/i915: create dev_priv->dri1 dragon dungeon^W^W sub-struct drm/i915 disallow physical batchbuffers for KMS drm/i915: rip out dev_priv->tex_lru_log_granularity drm/i915: remove LP_RING&friends from modeset code drm/i915: kill intel_clear_scanline_wait drm/i915: rip out dri1 breadcrumb updates from gen5+ irq handlers drm/i915: move dri1 irq ioctl code to i915_dma.c drm/i915: extract dri1 breadcrumb update from irq handler drm/i915: move LP_RING&friends to i915_dma.c drm/i915: disallow clip rects on gen5+ drm/i915: move the ips code to intel_pm.c drm/i915: move rps/emon function declarations drm/i915: kill pointless clearing of dev_priv->hws_map drm/i915: rework legacy GFX HWS handling drm/i915: fixup __iomem mixups in ringbuffer.c drm/i915: move pnv|ilk_gem_mem_freq to intel_pm.c drivers/gpu/drm/i915/i915_dma.c | 846 ++++++++-------------------- drivers/gpu/drm/i915/i915_drv.h | 49 +-- drivers/gpu/drm/i915/i915_gem.c | 22 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 5 + drivers/gpu/drm/i915/i915_irq.c | 182 +------ drivers/gpu/drm/i915/intel_display.c | 103 ++-- drivers/gpu/drm/i915/intel_drv.h | 12 +- drivers/gpu/drm/i915/intel_overlay.c | 70 ++-- drivers/gpu/drm/i915/intel_pm.c | 618 ++++++++++++++++++++- drivers/gpu/drm/i915/intel_ringbuffer.c | 59 +-- drivers/gpu/drm/i915/intel_ringbuffer.h | 8 +- drivers/gpu/drm/i915/intel_sprite.c | 10 +- 12 files changed, 977 insertions(+), 1007 deletions(-) -- 1.7.7.6