Commit d09aa852 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline 



The inline function has no place in i915_drv.h. Move it away, un-inline,
and untangle some header dependencies while at it.

Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220914163514.1837467-1-jani.nikula@intel.com
parent 45810b4c

drivers/gpu/drm/i915/display/intel_dpt.c

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


#include "gem/i915_gem_domain.h"

#include "gem/i915_gem_internal.h"

#include "gem/i915_gem_lmem.h"

#include "gt/gen8_ppgtt.h"



#include "i915_drv.h"

drivers/gpu/drm/i915/gem/i915_gem_object.h

+4 −0
Original line number Diff line number Diff line
@@ -482,6 +482,10 @@ void *__must_check i915_gem_object_pin_map(struct drm_i915_gem_object *obj, 
void *__must_check i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj,

						    enum i915_map_type type);



enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,

					  struct drm_i915_gem_object *obj,

					  bool always_coherent);



void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,

				 unsigned long offset,

				 unsigned long size);

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

+12 −0
Original line number Diff line number Diff line
@@ -466,6 +466,18 @@ void *i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj, 
	return ret;

}



enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,

					  struct drm_i915_gem_object *obj,

					  bool always_coherent)

{

	if (i915_gem_object_is_lmem(obj))

		return I915_MAP_WC;

	if (HAS_LLC(i915) || always_coherent)

		return I915_MAP_WB;

	else

		return I915_MAP_WC;

}



void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,

				 unsigned long offset,

				 unsigned long size)

drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/prime_numbers.h>



#include "gem/i915_gem_internal.h"

#include "gem/i915_gem_lmem.h"

#include "gem/i915_gem_region.h"

#include "gem/i915_gem_ttm.h"

#include "gem/i915_gem_ttm_move.h"

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

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/mei_aux.h>

#include "i915_drv.h"

#include "i915_reg.h"

#include "gem/i915_gem_lmem.h"

#include "gem/i915_gem_region.h"

#include "gt/intel_gsc.h"

#include "gt/intel_gt.h"