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

Commit 2dafb1e0 authored by Chris Wilson's avatar Chris Wilson Committed by Eric Anholt
Browse files

drm/i915: Propagate error from i915_gem_object_flush_gpu_write_domain() 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 96b099fd

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -982,7 +982,7 @@ void i915_gem_free_all_phys_object(struct drm_device *dev); 
int i915_gem_object_get_pages(struct drm_gem_object *obj, gfp_t gfpmask);

int i915_gem_object_get_pages(struct drm_gem_object *obj, gfp_t gfpmask);

void i915_gem_object_put_pages(struct drm_gem_object *obj);

void i915_gem_object_put_pages(struct drm_gem_object *obj);

void i915_gem_release(struct drm_device * dev, struct drm_file *file_priv);

void i915_gem_release(struct drm_device * dev, struct drm_file *file_priv);

void i915_gem_object_flush_write_domain(struct drm_gem_object *obj);

int i915_gem_object_flush_write_domain(struct drm_gem_object *obj);





void i915_gem_shrinker_init(void);

void i915_gem_shrinker_init(void);

void i915_gem_shrinker_exit(void);

void i915_gem_shrinker_exit(void);

drivers/gpu/drm/i915/i915_gem.c

+31 −12
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <linux/swap.h>

#include <linux/swap.h>

#include <linux/pci.h>

#include <linux/pci.h>





static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj);

static int i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj);

static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj);

static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj);

static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj);

static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj);

static int i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj,

static int i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj,
@@ -2583,7 +2583,10 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj) 
	if (!IS_I965G(dev)) {

	if (!IS_I965G(dev)) {

		int ret;

		int ret;





		i915_gem_object_flush_gpu_write_domain(obj);

		ret = i915_gem_object_flush_gpu_write_domain(obj);

		if (ret != 0)

			return ret;



		ret = i915_gem_object_wait_rendering(obj);

		ret = i915_gem_object_wait_rendering(obj);

		if (ret != 0)

		if (ret != 0)

			return ret;

			return ret;
@@ -2731,7 +2734,7 @@ i915_gem_clflush_object(struct drm_gem_object *obj) 
}

}





/** Flushes any GPU write domain for the object if it's dirty. */

/** Flushes any GPU write domain for the object if it's dirty. */

static void

static int

i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj)

i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj)

{

{

	struct drm_device *dev = obj->dev;

	struct drm_device *dev = obj->dev;
@@ -2739,17 +2742,18 @@ i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) 
	struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);

	struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);





	if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0)

	if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0)

		return;

		return 0;





	/* Queue the GPU write cache flushing we need. */

	/* Queue the GPU write cache flushing we need. */

	old_write_domain = obj->write_domain;

	old_write_domain = obj->write_domain;

	i915_gem_flush(dev, 0, obj->write_domain);

	i915_gem_flush(dev, 0, obj->write_domain);

	(void) i915_add_request(dev, NULL, obj->write_domain, obj_priv->ring);

	if (i915_add_request(dev, NULL, obj->write_domain, obj_priv->ring) == 0)

	BUG_ON(obj->write_domain);

		return -ENOMEM;





	trace_i915_gem_object_change_domain(obj,

	trace_i915_gem_object_change_domain(obj,

					    obj->read_domains,

					    obj->read_domains,

					    old_write_domain);

					    old_write_domain);

	return 0;

}

}





/** Flushes the GTT write domain for the object if it's dirty. */

/** Flushes the GTT write domain for the object if it's dirty. */
@@ -2793,9 +2797,11 @@ i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj) 
					    old_write_domain);

					    old_write_domain);

}

}





void

int

i915_gem_object_flush_write_domain(struct drm_gem_object *obj)

i915_gem_object_flush_write_domain(struct drm_gem_object *obj)

{

{

	int ret = 0;



	switch (obj->write_domain) {

	switch (obj->write_domain) {

	case I915_GEM_DOMAIN_GTT:

	case I915_GEM_DOMAIN_GTT:

		i915_gem_object_flush_gtt_write_domain(obj);

		i915_gem_object_flush_gtt_write_domain(obj);
@@ -2804,9 +2810,11 @@ i915_gem_object_flush_write_domain(struct drm_gem_object *obj) 
		i915_gem_object_flush_cpu_write_domain(obj);

		i915_gem_object_flush_cpu_write_domain(obj);

		break;

		break;

	default:

	default:

		i915_gem_object_flush_gpu_write_domain(obj);

		ret = i915_gem_object_flush_gpu_write_domain(obj);

		break;

		break;

	}

	}



	return ret;

}

}





/**

/**
@@ -2826,7 +2834,10 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write) 
	if (obj_priv->gtt_space == NULL)

	if (obj_priv->gtt_space == NULL)

		return -EINVAL;

		return -EINVAL;





	i915_gem_object_flush_gpu_write_domain(obj);

	ret = i915_gem_object_flush_gpu_write_domain(obj);

	if (ret != 0)

		return ret;



	/* Wait on any GPU rendering and flushing to occur. */

	/* Wait on any GPU rendering and flushing to occur. */

	ret = i915_gem_object_wait_rendering(obj);

	ret = i915_gem_object_wait_rendering(obj);

	if (ret != 0)

	if (ret != 0)
@@ -2876,7 +2887,9 @@ i915_gem_object_set_to_display_plane(struct drm_gem_object *obj) 
	if (obj_priv->gtt_space == NULL)

	if (obj_priv->gtt_space == NULL)

		return -EINVAL;

		return -EINVAL;





	i915_gem_object_flush_gpu_write_domain(obj);

	ret = i915_gem_object_flush_gpu_write_domain(obj);

	if (ret)

		return ret;





	/* Wait on any GPU rendering and flushing to occur. */

	/* Wait on any GPU rendering and flushing to occur. */

	if (obj_priv->active) {

	if (obj_priv->active) {
@@ -2924,7 +2937,10 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write) 
	uint32_t old_write_domain, old_read_domains;

	uint32_t old_write_domain, old_read_domains;

	int ret;

	int ret;





	i915_gem_object_flush_gpu_write_domain(obj);

	ret = i915_gem_object_flush_gpu_write_domain(obj);

	if (ret)

		return ret;



	/* Wait on any GPU rendering and flushing to occur. */

	/* Wait on any GPU rendering and flushing to occur. */

	ret = i915_gem_object_wait_rendering(obj);

	ret = i915_gem_object_wait_rendering(obj);

	if (ret != 0)

	if (ret != 0)
@@ -3214,7 +3230,10 @@ i915_gem_object_set_cpu_read_domain_range(struct drm_gem_object *obj, 
	if (offset == 0 && size == obj->size)

	if (offset == 0 && size == obj->size)

		return i915_gem_object_set_to_cpu_domain(obj, 0);

		return i915_gem_object_set_to_cpu_domain(obj, 0);





	i915_gem_object_flush_gpu_write_domain(obj);

	ret = i915_gem_object_flush_gpu_write_domain(obj);

	if (ret)

		return ret;



	/* Wait on any GPU rendering and flushing to occur. */

	/* Wait on any GPU rendering and flushing to occur. */

	ret = i915_gem_object_wait_rendering(obj);

	ret = i915_gem_object_wait_rendering(obj);

	if (ret != 0)

	if (ret != 0)

drivers/gpu/drm/i915/intel_display.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -4905,7 +4905,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, 
	drm_gem_object_reference(obj);

	drm_gem_object_reference(obj);





	crtc->fb = fb;

	crtc->fb = fb;

	i915_gem_object_flush_write_domain(obj);

	ret = i915_gem_object_flush_write_domain(obj);

	if (ret)

		goto cleanup_objs;





	ret = drm_vblank_get(dev, intel_crtc->pipe);

	ret = drm_vblank_get(dev, intel_crtc->pipe);

	if (ret)

	if (ret)