diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-04-28 09:15:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-04-28 09:15:57 +1000 |
| commit | 9e5e7beb36a0a2299e24f8e7c67f7aba7a87f50c (patch) | |
| tree | 0a170b705a7c75ff71cbd24195b7f663db89e31c /drivers/gpu/drm/msm/msm_gem.c | |
| parent | 6f19e7e5ae29b3df9061f9141ac138f60b8f416d (diff) | |
| parent | 7d8d9f670513593377cd1442f987ce03a64ba55d (diff) | |
Merge branch 'msm-fixes-3.15-rc3' of git://people.freedesktop.org/~robclark/linux into drm-next
Fixes for msm for 3.15.. a memory leak fix for devices using vram
carveout instead of iommu. Plus I think finally managed to sort out /
workaround some cursor vs underflow issues. And small fbcon tweak
needed to avoid extra full-modesets at boot.
* 'msm-fixes-3.15-rc3' of git://people.freedesktop.org/~robclark/linux:
drm/msm/mdp4: cure for the cursor blues (v2)
drm/msm: default to XR24 rather than AR24
drm/msm: fix memory leak
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 3da8264d3039..bb8026daebc9 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -118,8 +118,10 @@ static void put_pages(struct drm_gem_object *obj) if (iommu_present(&platform_bus_type)) drm_gem_put_pages(obj, msm_obj->pages, true, false); - else + else { drm_mm_remove_node(msm_obj->vram_node); + drm_free_large(msm_obj->pages); + } msm_obj->pages = NULL; } |