[PULL] remove drm_sman and some i815 fixes

James Simmons jsimmons at infradead.org
Thu Dec 22 13:48:35 PST 2011


> Hi Dave,
> 
> I've failed to correctly fix the via hang in the reclaim buffers rework
> till now, so I'm only submitting the drm_sman removal of my drm cruft
> removal series.

Last attempt at your branch still had problem. Start I didn't have time 
track down the exact issue. I'm cloning the below branch and will test it.
Thanks for cleanup.
 
> While beating on this stuff with my i815 I've discovered a preexisting
> use-after free issue in lastclose (which is new compared to what I've
> submitted to dri-devel) and a reclaim buffers locking problem.  Also added
> these two patches.
> 
> Please pull for 3.3.
> 
> Thanks, Daniel
> 
> --
> The following changes since commit 4cf73129cbe001b41be2f8b56f763fbf3acaa4ce:
> 
>   Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next (2011-12-21 09:50:56 +0000)
> 
> are available in the git repository at:
> 
>   git://people.freedesktop.org/~danvet/drm for-airlied
> 
> Daniel Vetter (12):
>       drm/sis: track obj->drm_fd relations in the driver
>       drm/via: track obj->drm_fd relations in the driver
>       drm/sman: kill owner tracking interface functions
>       drm/sman: rip out owner tracking
>       drm/via: track user->memblock mapping with idr
>       drm/sis: track user->memblock mapping with idr
>       drm/sman: kill user_hash_tab
>       drm/via: use drm_mm instead of drm_sman
>       drm/sis: use drm_mm instead of drm_sman
>       drm: kill drm_sman
>       drm/i810: cleanup reclaim_buffers
>       drm/i810: don't acces hw regs in lastclose
> 
>  drivers/gpu/drm/Makefile        |    2 +-
>  drivers/gpu/drm/drm_sman.c      |  351 ---------------------------------------
>  drivers/gpu/drm/i810/i810_dma.c |   19 ++-
>  drivers/gpu/drm/i810/i810_drv.c |    1 -
>  drivers/gpu/drm/i810/i810_drv.h |    6 +-
>  drivers/gpu/drm/sis/sis_drv.c   |   33 ++++-
>  drivers/gpu/drm/sis/sis_drv.h   |    7 +-
>  drivers/gpu/drm/sis/sis_mm.c    |  196 +++++++++++++----------
>  drivers/gpu/drm/via/via_drv.c   |   25 +++
>  drivers/gpu/drm/via/via_drv.h   |    7 +-
>  drivers/gpu/drm/via/via_map.c   |   10 +-
>  drivers/gpu/drm/via/via_mm.c    |  132 ++++++++++-----
>  include/drm/drm_sman.h          |  176 --------------------
>  include/drm/sis_drm.h           |    4 +
>  include/drm/via_drm.h           |    4 +
>  15 files changed, 289 insertions(+), 684 deletions(-)
>  delete mode 100644 drivers/gpu/drm/drm_sman.c
>  delete mode 100644 include/drm/drm_sman.h
> -- 
> Daniel Vetter
> Mail: daniel at ffwll.ch
> Mobile: +41 (0)79 365 57 48
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
> 


More information about the dri-devel mailing list