diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-04-21 18:26:56 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-04-21 18:26:56 -0400 |
| commit | e2bca7c76a79b68506bfc3699beb74c0d41fe230 (patch) | |
| tree | 1b0269083de5ccc61a96b615ef271098df8e1b6a /drivers/gpu/drm/i915/i915_gem.c | |
| parent | b3c7740a120c8a7775cb63b4d094466da5c01692 (diff) | |
| parent | d54a45e2533ef33678dc340298b022a289d2b3e3 (diff) | |
Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index fba37e9f775d..933e865a8929 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -1466,9 +1466,6 @@ i915_gem_object_put_pages(struct drm_gem_object *obj) | |||
| 1466 | obj_priv->dirty = 0; | 1466 | obj_priv->dirty = 0; |
| 1467 | 1467 | ||
| 1468 | for (i = 0; i < page_count; i++) { | 1468 | for (i = 0; i < page_count; i++) { |
| 1469 | if (obj_priv->pages[i] == NULL) | ||
| 1470 | break; | ||
| 1471 | |||
| 1472 | if (obj_priv->dirty) | 1469 | if (obj_priv->dirty) |
| 1473 | set_page_dirty(obj_priv->pages[i]); | 1470 | set_page_dirty(obj_priv->pages[i]); |
| 1474 | 1471 | ||
| @@ -2227,11 +2224,6 @@ i915_gem_evict_something(struct drm_device *dev, int min_size) | |||
| 2227 | seqno = i915_add_request(dev, NULL, obj->write_domain); | 2224 | seqno = i915_add_request(dev, NULL, obj->write_domain); |
| 2228 | if (seqno == 0) | 2225 | if (seqno == 0) |
| 2229 | return -ENOMEM; | 2226 | return -ENOMEM; |
| 2230 | |||
| 2231 | ret = i915_wait_request(dev, seqno); | ||
| 2232 | if (ret) | ||
| 2233 | return ret; | ||
| 2234 | |||
| 2235 | continue; | 2227 | continue; |
| 2236 | } | 2228 | } |
| 2237 | } | 2229 | } |
| @@ -2256,7 +2248,6 @@ i915_gem_object_get_pages(struct drm_gem_object *obj, | |||
| 2256 | struct address_space *mapping; | 2248 | struct address_space *mapping; |
| 2257 | struct inode *inode; | 2249 | struct inode *inode; |
| 2258 | struct page *page; | 2250 | struct page *page; |
| 2259 | int ret; | ||
| 2260 | 2251 | ||
| 2261 | if (obj_priv->pages_refcount++ != 0) | 2252 | if (obj_priv->pages_refcount++ != 0) |
| 2262 | return 0; | 2253 | return 0; |
| @@ -2279,11 +2270,9 @@ i915_gem_object_get_pages(struct drm_gem_object *obj, | |||
| 2279 | mapping_gfp_mask (mapping) | | 2270 | mapping_gfp_mask (mapping) | |
| 2280 | __GFP_COLD | | 2271 | __GFP_COLD | |
| 2281 | gfpmask); | 2272 | gfpmask); |
| 2282 | if (IS_ERR(page)) { | 2273 | if (IS_ERR(page)) |
| 2283 | ret = PTR_ERR(page); | 2274 | goto err_pages; |
| 2284 | i915_gem_object_put_pages(obj); | 2275 | |
| 2285 | return ret; | ||
| 2286 | } | ||
| 2287 | obj_priv->pages[i] = page; | 2276 | obj_priv->pages[i] = page; |
| 2288 | } | 2277 | } |
| 2289 | 2278 | ||
| @@ -2291,6 +2280,15 @@ i915_gem_object_get_pages(struct drm_gem_object *obj, | |||
| 2291 | i915_gem_object_do_bit_17_swizzle(obj); | 2280 | i915_gem_object_do_bit_17_swizzle(obj); |
| 2292 | 2281 | ||
| 2293 | return 0; | 2282 | return 0; |
| 2283 | |||
| 2284 | err_pages: | ||
| 2285 | while (i--) | ||
| 2286 | page_cache_release(obj_priv->pages[i]); | ||
| 2287 | |||
| 2288 | drm_free_large(obj_priv->pages); | ||
| 2289 | obj_priv->pages = NULL; | ||
| 2290 | obj_priv->pages_refcount--; | ||
| 2291 | return PTR_ERR(page); | ||
| 2294 | } | 2292 | } |
| 2295 | 2293 | ||
| 2296 | static void sandybridge_write_fence_reg(struct drm_i915_fence_reg *reg) | 2294 | static void sandybridge_write_fence_reg(struct drm_i915_fence_reg *reg) |
| @@ -4730,6 +4728,11 @@ i915_gem_init_ringbuffer(struct drm_device *dev) | |||
| 4730 | ring->space += ring->Size; | 4728 | ring->space += ring->Size; |
| 4731 | } | 4729 | } |
| 4732 | 4730 | ||
| 4731 | if (IS_I9XX(dev) && !IS_GEN3(dev)) { | ||
| 4732 | I915_WRITE(MI_MODE, | ||
| 4733 | (VS_TIMER_DISPATCH) << 16 | VS_TIMER_DISPATCH); | ||
| 4734 | } | ||
| 4735 | |||
| 4733 | return 0; | 4736 | return 0; |
| 4734 | } | 4737 | } |
| 4735 | 4738 | ||