On Mon, Mar 01, 2010 at 07:34:39PM +0100, Maarten Maathuis wrote: > - A few comments existed here and there that referred to a bo->mutex. > > Signed-off-by: Maarten Maathuis <[email protected]>
Reviewed-by: Jerome Glisse <[email protected]> > --- > drivers/gpu/drm/ttm/ttm_bo.c | 6 +----- > drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- > include/drm/ttm/ttm_bo_api.h | 3 +-- > include/drm/ttm/ttm_bo_driver.h | 1 + > 4 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 2920f9a..f5333d9 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -46,7 +46,6 @@ > #include <linux/file.h> > #include <linux/module.h> > > -#define TTM_ASSERT_LOCKED(param) > #define TTM_DEBUG(fmt, arg...) > #define TTM_BO_HASH_ORDER 13 > > @@ -306,9 +305,6 @@ void ttm_bo_unreserve(struct ttm_buffer_object *bo) > } > EXPORT_SYMBOL(ttm_bo_unreserve); > > -/* > - * Call bo->mutex locked. > - */ > static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc) > { > struct ttm_bo_device *bdev = bo->bdev; > @@ -316,7 +312,7 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, > bool zero_alloc) > int ret = 0; > uint32_t page_flags = 0; > > - TTM_ASSERT_LOCKED(&bo->mutex); > + BUG_ON(!atomic_read(&bo->reserved)); > bo->ttm = NULL; > > if (bdev->need_dma32) > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c > index 668dbe8..41b0c1e 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > @@ -146,7 +146,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, > struct vm_fault *vmf) > * since the mmap_sem is only held in read mode. However, we > * modify only the caching bits of vma->vm_page_prot and > * consider those bits protected by > - * the bo->mutex, as we should be the only writers. > + * bo->reserved, as we should be the only writers. > * There shouldn't really be any readers of these bits except > * within vm_insert_mixed()? fork? > * > diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h > index 81eb9f4..c1093ae 100644 > --- a/include/drm/ttm/ttm_bo_api.h > +++ b/include/drm/ttm/ttm_bo_api.h > @@ -35,7 +35,6 @@ > #include <linux/kref.h> > #include <linux/list.h> > #include <linux/wait.h> > -#include <linux/mutex.h> > #include <linux/mm.h> > #include <linux/rbtree.h> > #include <linux/bitmap.h> > @@ -298,7 +297,7 @@ ttm_bo_reference(struct ttm_buffer_object *bo) > * @interruptible: Use interruptible wait. > * @no_wait: Return immediately if buffer is busy. > * > - * This function must be called with the bo::mutex held, and makes > + * This function must be called with bo->reserved held, and makes > * sure any previous rendering to the buffer is completed. > * Note: It might be necessary to block validations before the > * wait by reserving the buffer. > diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h > index ff7664e..d3fc5f8 100644 > --- a/include/drm/ttm/ttm_bo_driver.h > +++ b/include/drm/ttm/ttm_bo_driver.h > @@ -37,6 +37,7 @@ > #include "linux/workqueue.h" > #include "linux/fs.h" > #include "linux/spinlock.h" > +#include <linux/mutex.h> > > struct ttm_backend; > > -- > 1.7.0 > > > ------------------------------------------------------------------------------ > Download Intel® Parallel Studio Eval > Try the new software tools for yourself. Speed compiling, find bugs > proactively, and fine-tune applications for parallel performance. > See why Intel Parallel Studio got high marks during beta. > http://p.sf.net/sfu/intel-sw-dev > -- > _______________________________________________ > Dri-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/dri-devel > ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev -- _______________________________________________ Dri-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dri-devel
