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

Merge branch 'drm-intel-fixes' into drm-intel-next 

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_gem_evict.c
parents 0f8c6d7c c6afd658

drivers/gpu/drm/i915/i915_gem.c

+2 −4
Original line number Diff line number Diff line
@@ -2291,7 +2291,7 @@ i915_gem_object_unbind(struct drm_gem_object *obj) 
static int i915_ring_idle(struct drm_device *dev,

			  struct intel_ring_buffer *ring)

{

	if (list_empty(&ring->gpu_write_list))

	if (list_empty(&ring->gpu_write_list) && list_empty(&ring->active_list))

		return 0;



	i915_gem_flush_ring(dev, NULL, ring,
@@ -2309,9 +2309,7 @@ i915_gpu_idle(struct drm_device *dev) 
	int ret;



	lists_empty = (list_empty(&dev_priv->mm.flushing_list) &&

		       list_empty(&dev_priv->render_ring.active_list) &&

		       list_empty(&dev_priv->bsd_ring.active_list) &&

		       list_empty(&dev_priv->blt_ring.active_list));

		       list_empty(&dev_priv->mm.active_list));

	if (lists_empty)

		return 0;

drivers/gpu/drm/i915/i915_gem_evict.c

+1 −3
Original line number Diff line number Diff line
@@ -179,9 +179,7 @@ i915_gem_evict_everything(struct drm_device *dev, bool purgeable_only) 


	lists_empty = (list_empty(&dev_priv->mm.inactive_list) &&

		       list_empty(&dev_priv->mm.flushing_list) &&

		       list_empty(&dev_priv->render_ring.active_list) &&

		       list_empty(&dev_priv->bsd_ring.active_list) &&

		       list_empty(&dev_priv->blt_ring.active_list));

		       list_empty(&dev_priv->mm.active_list));

	if (lists_empty)

		return -ENOSPC;

drivers/gpu/drm/i915/intel_opregion.c

+1 −1
Original line number Diff line number Diff line
@@ -512,6 +512,6 @@ int intel_opregion_setup(struct drm_device *dev) 
	return 0;



err_out:

	iounmap(opregion->header);

	iounmap(base);

	return err;

}

drivers/gpu/drm/i915/intel_overlay.c

+3 −1
Original line number Diff line number Diff line
@@ -974,7 +974,9 @@ static int check_overlay_src(struct drm_device *dev, 
{

	int uv_hscale = uv_hsubsampling(rec->flags);

	int uv_vscale = uv_vsubsampling(rec->flags);

	u32 stride_mask, depth, tmp;

	u32 stride_mask;

	int depth;

	u32 tmp;



	/* check src dimensions */

	if (IS_845G(dev) || IS_I830(dev)) {