← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to ubuntu/i915/i915_gem_evict.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2013-07-11 18:35:20 UTC
  • Revision ID: package-import@ubuntu.com-20130711183520-htnf1x4y5r11hndr
Tags: 3.5.0-229.42
https://launchpad.net/bugs/1199276
* Release Tracking Bug
  - LP: #1199276

[ Paolo Pisati ]

* [Config] CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu/i915/i915_gem_evict.c
38
38
                return false;
39
39
 
40
40
        list_add(&obj->exec_list, unwind);
41
 
        return drm_mm_hsw_scan_add_block(obj->gtt_space);
 
41
        return drm_mm_scan_add_block_hsw(obj->gtt_space);
42
42
}
43
43
 
44
44
int
78
78
 
79
79
        INIT_LIST_HEAD(&unwind_list);
80
80
        if (mappable)
81
 
                drm_mm_hsw_init_scan_with_range(&dev_priv->mm.gtt_space,
 
81
                drm_mm_init_scan_with_range_hsw(&dev_priv->mm.gtt_space,
82
82
                                            min_size, alignment, cache_level,
83
83
                                            0, dev_priv->mm.gtt_mappable_end);
84
84
        else
85
 
                drm_mm_hsw_init_scan(&dev_priv->mm.gtt_space,
 
85
                drm_mm_init_scan_hsw(&dev_priv->mm.gtt_space,
86
86
                                 min_size, alignment, cache_level);
87
87
 
88
88
        /* First see if there is a large enough contiguous idle region... */
107
107
                                       struct drm_i915_gem_object,
108
108
                                       exec_list);
109
109
 
110
 
                ret = drm_mm_hsw_scan_remove_block(obj->gtt_space);
 
110
                ret = drm_mm_scan_remove_block_hsw(obj->gtt_space);
111
111
                BUG_ON(ret);
112
112
 
113
113
                list_del_init(&obj->exec_list);
127
127
                obj = list_first_entry(&unwind_list,
128
128
                                       struct drm_i915_gem_object,
129
129
                                       exec_list);
130
 
                if (drm_mm_hsw_scan_remove_block(obj->gtt_space)) {
 
130
                if (drm_mm_scan_remove_block_hsw(obj->gtt_space)) {
131
131
                        list_move(&obj->exec_list, &eviction_list);
132
132
                        drm_gem_object_reference(&obj->base);
133
133
                        continue;