Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH v2] drm/i915: Use helper func to find out map type
@ 2022-12-19 11:29 Nirmoy Das
  2022-12-19 16:26 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Use helper func to find out map type (rev2) Patchwork
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Nirmoy Das @ 2022-12-19 11:29 UTC (permalink / raw)
  To: intel-gfx; +Cc: matthew.auld, andrzej.hajda, Nirmoy Das

Use i915_coherent_map_type() function to find out
map_type of the shmem obj.

v2: handle non-llc platform(Matt)

Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/i915/gt/shmem_utils.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c b/drivers/gpu/drm/i915/gt/shmem_utils.c
index 402f085f3a02..449c9ed44382 100644
--- a/drivers/gpu/drm/i915/gt/shmem_utils.c
+++ b/drivers/gpu/drm/i915/gt/shmem_utils.c
@@ -8,6 +8,7 @@
 #include <linux/pagemap.h>
 #include <linux/shmem_fs.h>
 
+#include "i915_drv.h"
 #include "gem/i915_gem_object.h"
 #include "gem/i915_gem_lmem.h"
 #include "shmem_utils.h"
@@ -32,6 +33,8 @@ struct file *shmem_create_from_data(const char *name, void *data, size_t len)
 
 struct file *shmem_create_from_object(struct drm_i915_gem_object *obj)
 {
+	struct drm_i915_private *i915 = to_i915(obj->base.dev);
+	enum i915_map_type map_type;
 	struct file *file;
 	void *ptr;
 
@@ -41,8 +44,8 @@ struct file *shmem_create_from_object(struct drm_i915_gem_object *obj)
 		return file;
 	}
 
-	ptr = i915_gem_object_pin_map_unlocked(obj, i915_gem_object_is_lmem(obj) ?
-						I915_MAP_WC : I915_MAP_WB);
+	map_type = i915_coherent_map_type(i915, obj, true);
+	ptr = i915_gem_object_pin_map_unlocked(obj, map_type);
 	if (IS_ERR(ptr))
 		return ERR_CAST(ptr);
 
-- 
2.38.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-12-20 10:33 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-19 11:29 [Intel-gfx] [PATCH v2] drm/i915: Use helper func to find out map type Nirmoy Das
2022-12-19 16:26 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Use helper func to find out map type (rev2) Patchwork
2022-12-19 16:52 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-12-19 18:04 ` [Intel-gfx] [PATCH v2] drm/i915: Use helper func to find out map type Andrzej Hajda
2022-12-20 10:33   ` Das, Nirmoy
2022-12-20  4:08 ` [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Use helper func to find out map type (rev2) Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox