1. 30 7月, 2013 1 次提交
    • M
      drm/nouveau: fix size check for cards without vm · 35095f75
      Maarten Lankhorst 提交于
      Op 24-07-13 17:55, Dan Carpenter schreef:
      > Hello Maarten Lankhorst,
      >
      > This is a semi-automatic email about new static checker warnings.
      >
      > The patch 0108bc80: "drm/nouveau: do not allow negative sizes for
      > now" from Jul 7, 2013, leads to the following Smatch complaint:
      >
      > drivers/gpu/drm/nouveau/nouveau_bo.c:222 nouveau_bo_new()
      > 	 warn: variable dereferenced before check 'drm->client.base.vm' (see line 201)
      >
      > drivers/gpu/drm/nouveau/nouveau_bo.c
      >    200		int type = ttm_bo_type_device;
      >    201		int max_size = INT_MAX & ~((1 << drm->client.base.vm->vmm->lpg_shift) - 1);
      >                                                  ^^^^^^^^^^^^^^^^^^^
      > New dereference.
      >
      >    202
      >    203		if (size <= 0 || size > max_size) {
      >    204			nv_warn(drm, "skipped size %x\n", (u32)size);
      >    205			return -EINVAL;
      >    206		}
      >    207
      >    208		if (sg)
      >    209			type = ttm_bo_type_sg;
      >    210
      >    211		nvbo = kzalloc(sizeof(struct nouveau_bo), GFP_KERNEL);
      >    212		if (!nvbo)
      >    213			return -ENOMEM;
      >    214		INIT_LIST_HEAD(&nvbo->head);
      >    215		INIT_LIST_HEAD(&nvbo->entry);
      >    216		INIT_LIST_HEAD(&nvbo->vma_list);
      >    217		nvbo->tile_mode = tile_mode;
      >    218		nvbo->tile_flags = tile_flags;
      >    219		nvbo->bo.bdev = &drm->ttm.bdev;
      >    220
      >    221		nvbo->page_shift = 12;
      >    222		if (drm->client.base.vm) {
      >                     ^^^^^^^^^^^^^^^^^^^
      > Old check.
      >
      >    223			if (!(flags & TTM_PL_FLAG_TT) && size > 256 * 1024)
      >    224				nvbo->page_shift = drm->client.base.vm->vmm->lpg_shift;
      >
      > regards,
      > dan carpenter
      
      8<-----
      Commit 0108bc80: "drm/nouveau: do not allow negative sizes for now" broke
      older nvidia gpu's that lack a vm. Add an explicit check to handle this.
      Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
      Reported-by: Nkonrad wilk <konrad.wilk@oracle.com>
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      35095f75
  2. 10 7月, 2013 4 次提交
  3. 08 7月, 2013 1 次提交
  4. 01 7月, 2013 2 次提交
  5. 11 3月, 2013 1 次提交
  6. 20 2月, 2013 1 次提交
  7. 15 2月, 2013 1 次提交
  8. 05 2月, 2013 1 次提交
  9. 20 1月, 2013 1 次提交
    • D
      drm/nouveau: try to protect nbo->pin_refcount · 0ae6d7bc
      Daniel Vetter 提交于
      ... by moving the bo_pin/bo_unpin manipulation of the pin_refcount
      under the protection of the ttm reservation lock. pin/unpin seems
      to get called from all over the place, so atm this is completely racy.
      
      After this patch there are only a few places in cleanup functions
      left which access ->pin_refcount without locking. But I'm hoping that
      those are safe and some other code invariant guarantees that this
      won't blow up.
      
      In any case, I only need to fix up pin/unpin to make ->pageflip work
      safely, so let's keep it at that.
      
      Add a comment to the header to explain the new locking rule.
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      0ae6d7bc
  10. 04 1月, 2013 1 次提交
  11. 10 12月, 2012 1 次提交
    • M
      drm/ttm: remove no_wait_reserve, v3 · 97a875cb
      Maarten Lankhorst 提交于
      All items on the lru list are always reservable, so this is a stupid
      thing to keep. Not only that, it is used in a way which would
      guarantee deadlocks if it were ever to be set to block on reserve.
      
      This is a lot of churn, but mostly because of the removal of the
      argument which can be nested arbitrarily deeply in many places.
      
      No change of code in this patch except removal of the no_wait_reserve
      argument, the previous patch removed the use of no_wait_reserve.
      
      v2:
       - Warn if -EBUSY is returned on reservation, all objects on the list
         should be reservable. Adjusted patch slightly due to conflicts.
      v3:
       - Focus on no_wait_reserve removal only.
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Reviewed-by: NThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      97a875cb
  12. 20 11月, 2012 3 次提交
  13. 16 10月, 2012 1 次提交
  14. 03 10月, 2012 9 次提交
  15. 24 5月, 2012 9 次提交
  16. 23 5月, 2012 2 次提交
  17. 22 5月, 2012 1 次提交