← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/radeon/radeon_dma.c

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-09-07 16:15:32 UTC
  • mfrom: (1.7.8)
  • Revision ID: package-import@ubuntu.com-20120907161532-3q7ynrss99mn8g3n
Tags: 9.0~git20120903.e1673d20.is.git20120821.c1114c61-0ubuntu1
https://launchpad.net/bugs/1047306
* Revert to 9.0~git20120821.c1114c61-0ubuntu2, as it's causing some issues
  on netbook configs with no UI after reboot (LP: #1047306)
* debian/patches/50-CVE-2012-2864.patch:
  add the CVE (samplers array overflow) fix to not reintroduce it
  with the revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/radeon/radeon_dma.c
302
302
        foreach_s(dma_bo, temp, &rmesa->dma.free) {
303
303
                remove_from_list(dma_bo);
304
304
                radeon_bo_unref(dma_bo->bo);
305
 
                free(dma_bo);
 
305
                FREE(dma_bo);
306
306
        }
307
307
 
308
308
        foreach_s(dma_bo, temp, &rmesa->dma.wait) {
309
309
                remove_from_list(dma_bo);
310
310
                radeon_bo_unref(dma_bo->bo);
311
 
                free(dma_bo);
 
311
                FREE(dma_bo);
312
312
        }
313
313
 
314
314
        foreach_s(dma_bo, temp, &rmesa->dma.reserved) {
315
315
                remove_from_list(dma_bo);
316
316
                radeon_bo_unref(dma_bo->bo);
317
 
                free(dma_bo);
 
317
                FREE(dma_bo);
318
318
        }
319
319
}
320
320
 
371
371
                        WARN_ONCE("Leaking dma buffer object!\n");
372
372
                        radeon_bo_unref(dma_bo->bo);
373
373
                        remove_from_list(dma_bo);
374
 
                        free(dma_bo);
 
374
                        FREE(dma_bo);
375
375
                        continue;
376
376
                }
377
377
                /* free objects that are too small to be used because of large request */
378
378
                if (dma_bo->bo->size < rmesa->dma.minimum_size) {
379
379
                   radeon_bo_unref(dma_bo->bo);
380
380
                   remove_from_list(dma_bo);
381
 
                   free(dma_bo);
 
381
                   FREE(dma_bo);
382
382
                   continue;
383
383
                }
384
384
                if (!radeon_bo_is_idle(dma_bo->bo)) {
396
396
                if (dma_bo->bo->size < rmesa->dma.minimum_size) {
397
397
                   radeon_bo_unref(dma_bo->bo);
398
398
                   remove_from_list(dma_bo);
399
 
                   free(dma_bo);
 
399
                   FREE(dma_bo);
400
400
                   continue;
401
401
                }
402
402
                remove_from_list(dma_bo);
410
410
                        break;
411
411
                remove_from_list(dma_bo);
412
412
                radeon_bo_unref(dma_bo->bo);
413
 
                free(dma_bo);
 
413
                FREE(dma_bo);
414
414
        }
415
415
 
416
416
}