Commit 4a02a376 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/gem: Move update_lru() 



Just code-motion.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/527841/
Link: https://lore.kernel.org/r/20230320144356.803762-8-robdclark@gmail.com
parent b43f9afb

drivers/gpu/drm/msm/msm_gem.c

+22 −24
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include "msm_gpu.h"

#include "msm_mmu.h"



static void update_lru(struct drm_gem_object *obj);



static dma_addr_t physaddr(struct drm_gem_object *obj)

{

	struct msm_gem_object *msm_obj = to_msm_bo(obj);
@@ -63,6 +61,28 @@ static void sync_for_cpu(struct msm_gem_object *msm_obj) 
	dma_unmap_sgtable(dev, msm_obj->sgt, DMA_BIDIRECTIONAL, 0);

}



static void update_lru(struct drm_gem_object *obj)

{

	struct msm_drm_private *priv = obj->dev->dev_private;

	struct msm_gem_object *msm_obj = to_msm_bo(obj);



	msm_gem_assert_locked(&msm_obj->base);



	if (!msm_obj->pages) {

		GEM_WARN_ON(msm_obj->pin_count);



		drm_gem_lru_move_tail(&priv->lru.unbacked, obj);

	} else if (msm_obj->pin_count) {

		drm_gem_lru_move_tail(&priv->lru.pinned, obj);

	} else if (msm_obj->madv == MSM_MADV_WILLNEED) {

		drm_gem_lru_move_tail(&priv->lru.willneed, obj);

	} else {

		GEM_WARN_ON(msm_obj->madv != MSM_MADV_DONTNEED);



		drm_gem_lru_move_tail(&priv->lru.dontneed, obj);

	}

}



/* allocate pages from VRAM carveout, used when no IOMMU: */

static struct page **get_pages_vram(struct drm_gem_object *obj, int npages)

{
@@ -804,28 +824,6 @@ void msm_gem_vunmap(struct drm_gem_object *obj) 
	msm_obj->vaddr = NULL;

}



static void update_lru(struct drm_gem_object *obj)

{

	struct msm_drm_private *priv = obj->dev->dev_private;

	struct msm_gem_object *msm_obj = to_msm_bo(obj);



	msm_gem_assert_locked(&msm_obj->base);



	if (!msm_obj->pages) {

		GEM_WARN_ON(msm_obj->pin_count);



		drm_gem_lru_move_tail(&priv->lru.unbacked, obj);

	} else if (msm_obj->pin_count) {

		drm_gem_lru_move_tail(&priv->lru.pinned, obj);

	} else if (msm_obj->madv == MSM_MADV_WILLNEED) {

		drm_gem_lru_move_tail(&priv->lru.willneed, obj);

	} else {

		GEM_WARN_ON(msm_obj->madv != MSM_MADV_DONTNEED);



		drm_gem_lru_move_tail(&priv->lru.dontneed, obj);

	}

}



bool msm_gem_active(struct drm_gem_object *obj)

{

	msm_gem_assert_locked(obj);