diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-10 15:47:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-10 15:48:04 +1000 |
| commit | 115a5c2ba0aac55e1bac390f271c818c3cbfa1fb (patch) | |
| tree | bf3029a9a68e4d3dbe82553f8a88dc25072c7dc2 /drivers/gpu/drm/ttm/ttm_memory.c | |
| parent | 0b5e8db639de032bd4febbb0a5b1cd2c19bac26d (diff) | |
| parent | fb53f8621a3fab88776ae2450a1f3afc7920231b (diff) | |
Merge remote branch 'korg/drm-radeon-next' of into drm-linus
This merges some TTM overhauls to allow us to do better object placement
for certain radeon GPUs that need scanout+cursor within range of each other,
along with an API change to not return ERESTART to userspace, but to use
ERESTARTSYS properly internally and have it convert to EINTR and catch that
correctly. Also lots of radeon fixes across the board.
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_memory.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_memory.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index 8bfde5f4084..f5245c02b8f 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c @@ -323,8 +323,10 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob, * No special dma32 zone needed. */ - if (mem <= ((uint64_t) 1ULL << 32)) + if (mem <= ((uint64_t) 1ULL << 32)) { + kfree(zone); return 0; + } /* * Limit max dma32 memory to 4GB for now |