Commit 2ef97818 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: split out i915_gem_evict.h from i915_drv.h 



We already have the i915_gem_evict.c file.

v2: Fixed commit message (Tvrtko)

Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ec666853171d04daeb21a93083940df36907c343.1641561552.git.jani.nikula@intel.com
parent 23d639d7

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "i915_drv.h"

#include "i915_gem_clflush.h"

#include "i915_gem_context.h"

#include "i915_gem_evict.h"

#include "i915_gem_ioctls.h"

#include "i915_trace.h"

#include "i915_user_extensions.h"

drivers/gpu/drm/i915/gt/selftest_hangcheck.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include "gem/i915_gem_context.h"



#include "i915_gem_evict.h"

#include "intel_gt.h"

#include "intel_engine_heartbeat.h"

#include "intel_engine_pm.h"

drivers/gpu/drm/i915/i915_drv.h

+0 −11
Original line number Diff line number Diff line
@@ -1703,17 +1703,6 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id) 
	return vm;

}



/* i915_gem_evict.c */

int __must_check i915_gem_evict_something(struct i915_address_space *vm,

					  u64 min_size, u64 alignment,

					  unsigned long color,

					  u64 start, u64 end,

					  unsigned flags);

int __must_check i915_gem_evict_for_node(struct i915_address_space *vm,

					 struct drm_mm_node *node,

					 unsigned int flags);

int i915_gem_evict_vm(struct i915_address_space *vm);



/* i915_gem_internal.c */

struct drm_i915_gem_object *

i915_gem_object_create_internal(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/i915_gem_evict.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "gt/intel_gt_requests.h"



#include "i915_drv.h"

#include "i915_gem_evict.h"

#include "i915_trace.h"



I915_SELFTEST_DECLARE(static struct igt_evict_ctl {

drivers/gpu/drm/i915/i915_gem_evict.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2021 Intel Corporation

 */



#ifndef __I915_GEM_EVICT_H__

#define __I915_GEM_EVICT_H__



#include <linux/types.h>



struct drm_mm_node;

struct i915_address_space;



int __must_check i915_gem_evict_something(struct i915_address_space *vm,

					  u64 min_size, u64 alignment,

					  unsigned long color,

					  u64 start, u64 end,

					  unsigned flags);

int __must_check i915_gem_evict_for_node(struct i915_address_space *vm,

					 struct drm_mm_node *node,

					 unsigned int flags);

int i915_gem_evict_vm(struct i915_address_space *vm);



#endif /* __I915_GEM_EVICT_H__ */