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

Commit fb4e1486 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/selftests: Markup __iomem for igt_gem_coherency

parent b099a445
Loading
Loading
Loading
Loading
+8 −8
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ static int cpu_set(struct drm_i915_gem_object *obj,
{
{
	unsigned int needs_clflush;
	unsigned int needs_clflush;
	struct page *page;
	struct page *page;
	typeof(v) *map;
	u32 *map;
	int err;
	int err;


	err = i915_gem_obj_prepare_shmem_write(obj, &needs_clflush);
	err = i915_gem_obj_prepare_shmem_write(obj, &needs_clflush);
@@ -59,7 +59,7 @@ static int cpu_get(struct drm_i915_gem_object *obj,
{
{
	unsigned int needs_clflush;
	unsigned int needs_clflush;
	struct page *page;
	struct page *page;
	typeof(v) map;
	u32 *map;
	int err;
	int err;


	err = i915_gem_obj_prepare_shmem_read(obj, &needs_clflush);
	err = i915_gem_obj_prepare_shmem_read(obj, &needs_clflush);
@@ -82,7 +82,7 @@ static int gtt_set(struct drm_i915_gem_object *obj,
		   u32 v)
		   u32 v)
{
{
	struct i915_vma *vma;
	struct i915_vma *vma;
	typeof(v) *map;
	u32 __iomem *map;
	int err;
	int err;


	err = i915_gem_object_set_to_gtt_domain(obj, true);
	err = i915_gem_object_set_to_gtt_domain(obj, true);
@@ -98,7 +98,7 @@ static int gtt_set(struct drm_i915_gem_object *obj,
	if (IS_ERR(map))
	if (IS_ERR(map))
		return PTR_ERR(map);
		return PTR_ERR(map);


	map[offset / sizeof(*map)] = v;
	iowrite32(v, &map[offset / sizeof(*map)]);
	i915_vma_unpin_iomap(vma);
	i915_vma_unpin_iomap(vma);


	return 0;
	return 0;
@@ -109,7 +109,7 @@ static int gtt_get(struct drm_i915_gem_object *obj,
		   u32 *v)
		   u32 *v)
{
{
	struct i915_vma *vma;
	struct i915_vma *vma;
	typeof(v) map;
	u32 __iomem *map;
	int err;
	int err;


	err = i915_gem_object_set_to_gtt_domain(obj, false);
	err = i915_gem_object_set_to_gtt_domain(obj, false);
@@ -125,7 +125,7 @@ static int gtt_get(struct drm_i915_gem_object *obj,
	if (IS_ERR(map))
	if (IS_ERR(map))
		return PTR_ERR(map);
		return PTR_ERR(map);


	*v = map[offset / sizeof(*map)];
	*v = ioread32(&map[offset / sizeof(*map)]);
	i915_vma_unpin_iomap(vma);
	i915_vma_unpin_iomap(vma);


	return 0;
	return 0;
@@ -135,7 +135,7 @@ static int wc_set(struct drm_i915_gem_object *obj,
		  unsigned long offset,
		  unsigned long offset,
		  u32 v)
		  u32 v)
{
{
	typeof(v) *map;
	u32 *map;
	int err;
	int err;


	err = i915_gem_object_set_to_wc_domain(obj, true);
	err = i915_gem_object_set_to_wc_domain(obj, true);
@@ -156,7 +156,7 @@ static int wc_get(struct drm_i915_gem_object *obj,
		  unsigned long offset,
		  unsigned long offset,
		  u32 *v)
		  u32 *v)
{
{
	typeof(v) map;
	u32 *map;
	int err;
	int err;


	err = i915_gem_object_set_to_wc_domain(obj, false);
	err = i915_gem_object_set_to_wc_domain(obj, false);