lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_gem_evict.c
This commit is contained in:
Chris Wilson
2010-11-01 13:42:29 +00:00
parent 0f8c6d7ca9 c6afd65807
commit f2a630bfec
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/i915_gem.c
View File

@@ -2291,7 +2291,7 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
static int i915_ring_idle(struct drm_device *dev, static int i915_ring_idle(struct drm_device *dev,
struct intel_ring_buffer *ring) 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; return 0;
i915_gem_flush_ring(dev, NULL, ring, i915_gem_flush_ring(dev, NULL, ring,
@@ -2309,9 +2309,7 @@ i915_gpu_idle(struct drm_device *dev)
int ret; int ret;
lists_empty = (list_empty(&dev_priv->mm.flushing_list) && lists_empty = (list_empty(&dev_priv->mm.flushing_list) &&
list_empty(&dev_priv->render_ring.active_list) && list_empty(&dev_priv->mm.active_list));
list_empty(&dev_priv->bsd_ring.active_list) &&
list_empty(&dev_priv->blt_ring.active_list));
if (lists_empty) if (lists_empty)
return 0; return 0;

4
drivers/gpu/drm/i915/i915_gem_evict.c
View File

@@ -179,9 +179,7 @@ i915_gem_evict_everything(struct drm_device *dev, bool purgeable_only)
lists_empty = (list_empty(&dev_priv->mm.inactive_list) && lists_empty = (list_empty(&dev_priv->mm.inactive_list) &&
list_empty(&dev_priv->mm.flushing_list) && list_empty(&dev_priv->mm.flushing_list) &&
list_empty(&dev_priv->render_ring.active_list) && list_empty(&dev_priv->mm.active_list));
list_empty(&dev_priv->bsd_ring.active_list) &&
list_empty(&dev_priv->blt_ring.active_list));
if (lists_empty) if (lists_empty)
return -ENOSPC; return -ENOSPC;

2
drivers/gpu/drm/i915/intel_opregion.c
View File

@@ -512,6 +512,6 @@ int intel_opregion_setup(struct drm_device *dev)
return 0; return 0;
err_out: err_out:
iounmap(opregion->header); iounmap(base);
return err; return err;
} }

4
drivers/gpu/drm/i915/intel_overlay.c
View File

@@ -974,7 +974,9 @@ static int check_overlay_src(struct drm_device *dev,
{ {
int uv_hscale = uv_hsubsampling(rec->flags); int uv_hscale = uv_hsubsampling(rec->flags);
int uv_vscale = uv_vsubsampling(rec->flags); int uv_vscale = uv_vsubsampling(rec->flags);
u32 stride_mask, depth, tmp; u32 stride_mask;
int depth;
u32 tmp;
/* check src dimensions */ /* check src dimensions */
if (IS_845G(dev) || IS_I830(dev)) { if (IS_845G(dev) || IS_I830(dev)) {