1. 28 Dec, 2011 6 commits
  2. 22 Dec, 2011 5 commits
    • Dave Airlie's avatar
      drm: add missing exports for i810 driver. · 5c2a5ce6
      Dave Airlie authored
      Brown paper bag of danvet.
      Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
    • Dave Airlie's avatar
      Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm into drm-core-next · 5c72765e
      Dave Airlie authored
      * 'for-airlied' of git://people.freedesktop.org/~danvet/drm:
        drm/i810: don't acces hw regs in lastclose
        drm/i810: cleanup reclaim_buffers
        drm: kill drm_sman
        drm/sis: use drm_mm instead of drm_sman
        drm/via: use drm_mm instead of drm_sman
        drm/sman: kill user_hash_tab
        drm/sis: track user->memblock mapping with idr
        drm/via: track user->memblock mapping with idr
        drm/sman: rip out owner tracking
        drm/sman: kill owner tracking interface functions
        drm/via: track obj->drm_fd relations in the driver
        drm/sis: track obj->drm_fd relations in the driver
    • Daniel Vetter's avatar
      drm/i810: don't acces hw regs in lastclose · 40c34d04
      Daniel Vetter authored
      i810 uses a userspace provided mmio map using the drm core map
      infrastructure. By the time we reach lastclose, this is all gone
      and our mmio_map pointer points at freed memory. Depending upon
      luck that still works, most often it just oopses.
      Aside: drm maps aren't refcounted, so userspace can essentially oops
      the kernel any time it wants to. Who cares.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    • Daniel Vetter's avatar
      drm/i810: cleanup reclaim_buffers · 87499ffd
      Daniel Vetter authored
      My dear old i815 always hits the deadlocked on reclaim_buffers
      warning. Switch over to the idlelock duct-tape on hope that
      works better. I've fired up my i815 and now closing glxgears doesn't
      take 5 seconds anymore. \o/
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    • Dave Airlie's avatar
      Merge branch 'drm-nouveau-next' of... · 5d56fe5f
      Dave Airlie authored
      Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next
      * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (102 commits)
        drm/nouveau/ttm: fix crash as a result of a recent ttm change
        drm/nouveau: Fix notifier blocks over the 4GB mark.
        drm/nouveau: Fix pushbufs over the 4GB mark.
        drm/nvc0/pm: initial engine reclocking
        drm/nouveau: move hpd enable/disable to common code
        drm/nv40/disp: implement support for hotplug irq
        drm/nouveau/gpio: reimplement as nouveau_gpio.c, fixing a number of issues
        drm/nouveau: just pass gpio line to pwm_*, not entire gpio struct
        drm/nouveau/hwsq: remove some magic, give proper opcode names
        drm/nv50/pm: introduce hwsq-based memory reclocking
        drm/nv04/disp: handle dual-link spwg panels without needing quirks
        drm/nouveau/dp: remove broken display depth function, use the improved one
        drm/nouveau/mxm: implement ROM shadow method
        drm/nouveau/mxm: implement _DSM shadow method
        drm/nouveau/mxm: implement wmi shadow method
        drm/nouveau/mxm: initial implementation of dcb sanitisation
        drm/nouveau/disp: parse connector info directly in nouveau_connector.c
        drm/nouveau/i2c: handle bit-banging ourselves
        drm/nouveau/i2c: fix debug message
        drm/nouveau/i2c: tidy up bit-bang helpers, also fixing nv50 setsda bug
  3. 21 Dec, 2011 29 commits