Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68209390 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: shrinker support 



For a first step, only purge obj->madv==DONTNEED objects.  We could be
more agressive and next try unpinning inactive objects..  but that is
only useful if you have swap.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 4fe5f65e

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ msm-y := \ 
	msm_fence.o \

	msm_gem.o \

	msm_gem_prime.o \

	msm_gem_shrinker.o \

	msm_gem_submit.o \

	msm_gpu.o \

	msm_iommu.o \

drivers/gpu/drm/msm/msm_drv.c

+5 −0
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ static int msm_drm_uninit(struct device *dev) 
		kfree(vbl_ev);

	}



	msm_gem_shrinker_cleanup(ddev);



	drm_kms_helper_poll_fini(ddev);



	drm_dev_unregister(ddev);
@@ -350,6 +352,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) 
	}



	ddev->dev_private = priv;

	priv->dev = ddev;



	ret = msm_mdss_init(ddev);

	if (ret) {
@@ -382,6 +385,8 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) 
	if (ret)

		goto fail;



	msm_gem_shrinker_init(ddev);



	switch (get_mdp_ver(pdev)) {

	case 4:

		kms = mdp4_kms_init(ddev);

drivers/gpu/drm/msm/msm_drv.h

+8 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ struct msm_vblank_ctrl { 


struct msm_drm_private {



	struct drm_device *dev;



	struct msm_kms *kms;



	/* subordinate devices, if present: */
@@ -151,6 +153,8 @@ struct msm_drm_private { 
		struct drm_mm mm;

	} vram;



	struct shrinker shrinker;



	struct msm_vblank_ctrl vblank_ctrl;

};
@@ -169,6 +173,9 @@ void msm_gem_submit_free(struct msm_gem_submit *submit); 
int msm_ioctl_gem_submit(struct drm_device *dev, void *data,

		struct drm_file *file);



void msm_gem_shrinker_init(struct drm_device *dev);

void msm_gem_shrinker_cleanup(struct drm_device *dev);



int msm_gem_mmap_obj(struct drm_gem_object *obj,

			struct vm_area_struct *vma);

int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
@@ -196,6 +203,7 @@ void msm_gem_prime_unpin(struct drm_gem_object *obj); 
void *msm_gem_vaddr_locked(struct drm_gem_object *obj);

void *msm_gem_vaddr(struct drm_gem_object *obj);

int msm_gem_madvise(struct drm_gem_object *obj, unsigned madv);

void msm_gem_purge(struct drm_gem_object *obj);

int msm_gem_sync_object(struct drm_gem_object *obj,

		struct msm_fence_context *fctx, bool exclusive);

void msm_gem_move_to_active(struct drm_gem_object *obj,

drivers/gpu/drm/msm/msm_gem.c

+32 −0
Original line number Diff line number Diff line
@@ -448,6 +448,38 @@ int msm_gem_madvise(struct drm_gem_object *obj, unsigned madv) 
	return (msm_obj->madv != __MSM_MADV_PURGED);

}



void msm_gem_purge(struct drm_gem_object *obj)

{

	struct drm_device *dev = obj->dev;

	struct msm_gem_object *msm_obj = to_msm_bo(obj);



	WARN_ON(!mutex_is_locked(&dev->struct_mutex));

	WARN_ON(!is_purgeable(msm_obj));

	WARN_ON(obj->import_attach);



	put_iova(obj);



	vunmap(msm_obj->vaddr);

	msm_obj->vaddr = NULL;



	put_pages(obj);



	msm_obj->madv = __MSM_MADV_PURGED;



	drm_vma_node_unmap(&obj->vma_node, dev->anon_inode->i_mapping);

	drm_gem_free_mmap_offset(obj);



	/* Our goal here is to return as much of the memory as

	 * is possible back to the system as we are called from OOM.

	 * To do this we must instruct the shmfs to drop all of its

	 * backing pages, *now*.

	 */

	shmem_truncate_range(file_inode(obj->filp), 0, (loff_t)-1);



	invalidate_mapping_pages(file_inode(obj->filp)->i_mapping,

			0, (loff_t)-1);

}



/* must be called before _move_to_active().. */

int msm_gem_sync_object(struct drm_gem_object *obj,

		struct msm_fence_context *fctx, bool exclusive)

drivers/gpu/drm/msm/msm_gem.h

+6 −0
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ static inline bool is_active(struct msm_gem_object *msm_obj) 
	return msm_obj->gpu != NULL;

}



static inline bool is_purgeable(struct msm_gem_object *msm_obj)

{

	return (msm_obj->madv == MSM_MADV_DONTNEED) && msm_obj->sgt &&

			!msm_obj->base.dma_buf && !msm_obj->base.import_attach;

}



#define MAX_CMDS 4



/* Created per submit-ioctl, to track bo's and cmdstream bufs, etc,