Rev 1404 | Rev 1986 | Go to most recent revision | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1404 | Rev 1963 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright 2008 Advanced Micro Devices, Inc. |
2 | * Copyright 2008 Advanced Micro Devices, Inc. |
3 | * Copyright 2008 Red Hat Inc. |
3 | * Copyright 2008 Red Hat Inc. |
4 | * Copyright 2009 Jerome Glisse. |
4 | * Copyright 2009 Jerome Glisse. |
5 | * |
5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a |
6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), |
7 | * copy of this software and associated documentation files (the "Software"), |
8 | * to deal in the Software without restriction, including without limitation |
8 | * to deal in the Software without restriction, including without limitation |
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
10 | * and/or sell copies of the Software, and to permit persons to whom the |
10 | * and/or sell copies of the Software, and to permit persons to whom the |
11 | * Software is furnished to do so, subject to the following conditions: |
11 | * Software is furnished to do so, subject to the following conditions: |
12 | * |
12 | * |
13 | * The above copyright notice and this permission notice shall be included in |
13 | * The above copyright notice and this permission notice shall be included in |
14 | * all copies or substantial portions of the Software. |
14 | * all copies or substantial portions of the Software. |
15 | * |
15 | * |
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
19 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR |
19 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR |
20 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, |
20 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, |
21 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
21 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
22 | * OTHER DEALINGS IN THE SOFTWARE. |
22 | * OTHER DEALINGS IN THE SOFTWARE. |
23 | * |
23 | * |
24 | * Authors: Dave Airlie |
24 | * Authors: Dave Airlie |
25 | * Alex Deucher |
25 | * Alex Deucher |
26 | * Jerome Glisse |
26 | * Jerome Glisse |
27 | */ |
27 | */ |
28 | #include "drmP.h" |
28 | #include "drmP.h" |
29 | #include "drm.h" |
29 | #include "drm.h" |
30 | #include "radeon_drm.h" |
30 | #include "radeon_drm.h" |
31 | #include "radeon.h" |
31 | #include "radeon.h" |
32 | 32 | ||
33 | int radeon_gem_object_init(struct drm_gem_object *obj) |
33 | int radeon_gem_object_init(struct drm_gem_object *obj) |
34 | { |
34 | { |
35 | /* we do nothings here */ |
35 | /* we do nothings here */ |
36 | return 0; |
36 | return 0; |
37 | } |
37 | } |
38 | 38 | ||
39 | void radeon_gem_object_free(struct drm_gem_object *gobj) |
39 | void radeon_gem_object_free(struct drm_gem_object *gobj) |
40 | { |
40 | { |
41 | struct radeon_bo *robj = gobj->driver_private; |
41 | struct radeon_bo *robj = gobj->driver_private; |
42 | 42 | ||
43 | gobj->driver_private = NULL; |
43 | gobj->driver_private = NULL; |
44 | if (robj) { |
44 | if (robj) { |
45 | radeon_bo_unref(&robj); |
45 | radeon_bo_unref(&robj); |
46 | } |
46 | } |
47 | } |
47 | } |
48 | 48 | ||
49 | int radeon_gem_object_create(struct radeon_device *rdev, int size, |
49 | int radeon_gem_object_create(struct radeon_device *rdev, int size, |
50 | int alignment, int initial_domain, |
50 | int alignment, int initial_domain, |
51 | bool discardable, bool kernel, |
51 | bool discardable, bool kernel, |
52 | struct drm_gem_object **obj) |
52 | struct drm_gem_object **obj) |
53 | { |
53 | { |
54 | struct drm_gem_object *gobj; |
54 | struct drm_gem_object *gobj; |
55 | struct radeon_bo *robj; |
55 | struct radeon_bo *robj; |
56 | int r; |
56 | int r; |
57 | 57 | ||
58 | *obj = NULL; |
58 | *obj = NULL; |
59 | gobj = drm_gem_object_alloc(rdev->ddev, size); |
59 | gobj = drm_gem_object_alloc(rdev->ddev, size); |
60 | if (!gobj) { |
60 | if (!gobj) { |
61 | return -ENOMEM; |
61 | return -ENOMEM; |
62 | } |
62 | } |
63 | /* At least align on page size */ |
63 | /* At least align on page size */ |
64 | if (alignment < PAGE_SIZE) { |
64 | if (alignment < PAGE_SIZE) { |
65 | alignment = PAGE_SIZE; |
65 | alignment = PAGE_SIZE; |
66 | } |
66 | } |
67 | r = radeon_fb_bo_create(rdev, gobj, size, kernel, initial_domain, &robj); |
67 | r = radeon_bo_create(rdev, gobj, size, alignment, kernel, initial_domain, &robj); |
68 | if (r) { |
68 | if (r) { |
69 | DRM_ERROR("Failed to allocate GEM object (%d, %d, %u)\n", |
69 | DRM_ERROR("Failed to allocate GEM object (%d, %d, %u)\n", |
70 | size, initial_domain, alignment); |
70 | size, initial_domain, alignment); |
71 | return r; |
71 | return r; |
72 | } |
72 | } |
73 | gobj->driver_private = robj; |
73 | gobj->driver_private = robj; |
74 | *obj = gobj; |
74 | *obj = gobj; |
75 | return 0; |
75 | return 0; |
76 | } |
76 | } |
77 | 77 | ||
78 | int radeon_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain, |
78 | int radeon_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain, |
79 | uint64_t *gpu_addr) |
79 | uint64_t *gpu_addr) |
80 | { |
80 | { |
81 | struct radeon_bo *robj = obj->driver_private; |
81 | struct radeon_bo *robj = obj->driver_private; |
82 | int r; |
82 | int r; |
83 | 83 | ||
84 | r = radeon_bo_reserve(robj, false); |
84 | r = radeon_bo_reserve(robj, false); |
85 | if (unlikely(r != 0)) |
85 | if (unlikely(r != 0)) |
86 | return r; |
86 | return r; |
87 | r = radeon_bo_pin(robj, pin_domain, gpu_addr); |
87 | r = radeon_bo_pin(robj, pin_domain, gpu_addr); |
88 | radeon_bo_unreserve(robj); |
88 | radeon_bo_unreserve(robj); |
89 | return r; |
89 | return r; |
90 | } |
90 | } |
91 | 91 | ||
92 | void radeon_gem_object_unpin(struct drm_gem_object *obj) |
92 | void radeon_gem_object_unpin(struct drm_gem_object *obj) |
93 | { |
93 | { |
94 | struct radeon_bo *robj = obj->driver_private; |
94 | struct radeon_bo *robj = obj->driver_private; |
95 | int r; |
95 | int r; |
96 | 96 | ||
97 | r = radeon_bo_reserve(robj, false); |
97 | r = radeon_bo_reserve(robj, false); |
98 | if (likely(r == 0)) { |
98 | if (likely(r == 0)) { |
99 | radeon_bo_unpin(robj); |
99 | radeon_bo_unpin(robj); |
100 | radeon_bo_unreserve(robj); |
100 | radeon_bo_unreserve(robj); |
101 | } |
101 | } |
102 | } |
102 | } |
103 | 103 | ||
104 | int radeon_gem_set_domain(struct drm_gem_object *gobj, |
104 | int radeon_gem_set_domain(struct drm_gem_object *gobj, |
105 | uint32_t rdomain, uint32_t wdomain) |
105 | uint32_t rdomain, uint32_t wdomain) |
106 | { |
106 | { |
107 | struct radeon_bo *robj; |
107 | struct radeon_bo *robj; |
108 | uint32_t domain; |
108 | uint32_t domain; |
109 | int r; |
109 | int r; |
110 | 110 | ||
111 | /* FIXME: reeimplement */ |
111 | /* FIXME: reeimplement */ |
112 | robj = gobj->driver_private; |
112 | robj = gobj->driver_private; |
113 | /* work out where to validate the buffer to */ |
113 | /* work out where to validate the buffer to */ |
114 | domain = wdomain; |
114 | domain = wdomain; |
115 | if (!domain) { |
115 | if (!domain) { |
116 | domain = rdomain; |
116 | domain = rdomain; |
117 | } |
117 | } |
118 | if (!domain) { |
118 | if (!domain) { |
119 | /* Do nothings */ |
119 | /* Do nothings */ |
120 | printk(KERN_WARNING "Set domain withou domain !\n"); |
120 | printk(KERN_WARNING "Set domain withou domain !\n"); |
121 | return 0; |
121 | return 0; |
122 | } |
122 | } |
123 | if (domain == RADEON_GEM_DOMAIN_CPU) { |
123 | if (domain == RADEON_GEM_DOMAIN_CPU) { |
124 | /* Asking for cpu access wait for object idle */ |
124 | /* Asking for cpu access wait for object idle */ |
125 | // r = radeon_bo_wait(robj, NULL, false); |
125 | // r = radeon_bo_wait(robj, NULL, false); |
126 | // if (r) { |
126 | // if (r) { |
127 | // printk(KERN_ERR "Failed to wait for object !\n"); |
127 | // printk(KERN_ERR "Failed to wait for object !\n"); |
128 | // return r; |
128 | // return r; |
129 | // } |
129 | // } |
130 | } |
130 | } |
131 | return 0; |
131 | return 0; |
132 | } |
132 | } |
133 | 133 | ||
134 | int radeon_gem_init(struct radeon_device *rdev) |
134 | int radeon_gem_init(struct radeon_device *rdev) |
135 | { |
135 | { |
136 | INIT_LIST_HEAD(&rdev->gem.objects); |
136 | INIT_LIST_HEAD(&rdev->gem.objects); |
137 | return 0; |
137 | return 0; |
138 | } |
138 | } |
139 | 139 | ||
140 | void radeon_gem_fini(struct radeon_device *rdev) |
140 | void radeon_gem_fini(struct radeon_device *rdev) |
141 | { |
141 | { |
142 | // radeon_object_force_delete(rdev); |
142 | // radeon_object_force_delete(rdev); |
143 | } |
143 | } |
144 | 144 | ||
145 | #if 0 |
145 | #if 0 |
146 | /* |
146 | /* |
147 | * GEM ioctls. |
147 | * GEM ioctls. |
148 | */ |
148 | */ |
149 | int radeon_gem_info_ioctl(struct drm_device *dev, void *data, |
149 | int radeon_gem_info_ioctl(struct drm_device *dev, void *data, |
150 | struct drm_file *filp) |
150 | struct drm_file *filp) |
151 | { |
151 | { |
152 | struct radeon_device *rdev = dev->dev_private; |
152 | struct radeon_device *rdev = dev->dev_private; |
153 | struct drm_radeon_gem_info *args = data; |
153 | struct drm_radeon_gem_info *args = data; |
154 | 154 | ||
155 | args->vram_size = rdev->mc.real_vram_size; |
155 | args->vram_size = rdev->mc.real_vram_size; |
156 | /* FIXME: report somethings that makes sense */ |
156 | args->vram_visible = rdev->mc.real_vram_size; |
- | 157 | if (rdev->stollen_vga_memory) |
|
- | 158 | args->vram_visible -= radeon_bo_size(rdev->stollen_vga_memory); |
|
157 | args->vram_visible = rdev->mc.real_vram_size - (4 * 1024 * 1024); |
159 | args->vram_visible -= radeon_fbdev_total_size(rdev); |
158 | args->gart_size = rdev->mc.gtt_size; |
160 | args->gart_size = rdev->mc.gtt_size - rdev->cp.ring_size - 4096 - |
- | 161 | RADEON_IB_POOL_SIZE*64*1024; |
|
159 | return 0; |
162 | return 0; |
160 | } |
163 | } |
161 | 164 | ||
162 | int radeon_gem_pread_ioctl(struct drm_device *dev, void *data, |
165 | int radeon_gem_pread_ioctl(struct drm_device *dev, void *data, |
163 | struct drm_file *filp) |
166 | struct drm_file *filp) |
164 | { |
167 | { |
165 | /* TODO: implement */ |
168 | /* TODO: implement */ |
166 | DRM_ERROR("unimplemented %s\n", __func__); |
169 | DRM_ERROR("unimplemented %s\n", __func__); |
167 | return -ENOSYS; |
170 | return -ENOSYS; |
168 | } |
171 | } |
169 | 172 | ||
170 | int radeon_gem_pwrite_ioctl(struct drm_device *dev, void *data, |
173 | int radeon_gem_pwrite_ioctl(struct drm_device *dev, void *data, |
171 | struct drm_file *filp) |
174 | struct drm_file *filp) |
172 | { |
175 | { |
173 | /* TODO: implement */ |
176 | /* TODO: implement */ |
174 | DRM_ERROR("unimplemented %s\n", __func__); |
177 | DRM_ERROR("unimplemented %s\n", __func__); |
175 | return -ENOSYS; |
178 | return -ENOSYS; |
176 | } |
179 | } |
177 | 180 | ||
178 | int radeon_gem_create_ioctl(struct drm_device *dev, void *data, |
181 | int radeon_gem_create_ioctl(struct drm_device *dev, void *data, |
179 | struct drm_file *filp) |
182 | struct drm_file *filp) |
180 | { |
183 | { |
181 | struct radeon_device *rdev = dev->dev_private; |
184 | struct radeon_device *rdev = dev->dev_private; |
182 | struct drm_radeon_gem_create *args = data; |
185 | struct drm_radeon_gem_create *args = data; |
183 | struct drm_gem_object *gobj; |
186 | struct drm_gem_object *gobj; |
184 | uint32_t handle; |
187 | uint32_t handle; |
185 | int r; |
188 | int r; |
186 | 189 | ||
187 | /* create a gem object to contain this object in */ |
190 | /* create a gem object to contain this object in */ |
188 | args->size = roundup(args->size, PAGE_SIZE); |
191 | args->size = roundup(args->size, PAGE_SIZE); |
189 | r = radeon_gem_object_create(rdev, args->size, args->alignment, |
192 | r = radeon_gem_object_create(rdev, args->size, args->alignment, |
190 | args->initial_domain, false, |
193 | args->initial_domain, false, |
191 | false, &gobj); |
194 | false, &gobj); |
192 | if (r) { |
195 | if (r) { |
193 | return r; |
196 | return r; |
194 | } |
197 | } |
195 | r = drm_gem_handle_create(filp, gobj, &handle); |
198 | r = drm_gem_handle_create(filp, gobj, &handle); |
- | 199 | /* drop reference from allocate - handle holds it now */ |
|
- | 200 | drm_gem_object_unreference_unlocked(gobj); |
|
196 | if (r) { |
201 | if (r) { |
197 | mutex_lock(&dev->struct_mutex); |
- | |
198 | drm_gem_object_unreference(gobj); |
- | |
199 | mutex_unlock(&dev->struct_mutex); |
- | |
200 | return r; |
202 | return r; |
201 | } |
203 | } |
202 | mutex_lock(&dev->struct_mutex); |
- | |
203 | drm_gem_object_handle_unreference(gobj); |
- | |
204 | mutex_unlock(&dev->struct_mutex); |
- | |
205 | args->handle = handle; |
204 | args->handle = handle; |
206 | return 0; |
205 | return 0; |
207 | } |
206 | } |
208 | 207 | ||
209 | int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data, |
208 | int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data, |
210 | struct drm_file *filp) |
209 | struct drm_file *filp) |
211 | { |
210 | { |
212 | /* transition the BO to a domain - |
211 | /* transition the BO to a domain - |
213 | * just validate the BO into a certain domain */ |
212 | * just validate the BO into a certain domain */ |
214 | struct drm_radeon_gem_set_domain *args = data; |
213 | struct drm_radeon_gem_set_domain *args = data; |
215 | struct drm_gem_object *gobj; |
214 | struct drm_gem_object *gobj; |
216 | struct radeon_bo *robj; |
215 | struct radeon_bo *robj; |
217 | int r; |
216 | int r; |
218 | 217 | ||
219 | /* for now if someone requests domain CPU - |
218 | /* for now if someone requests domain CPU - |
220 | * just make sure the buffer is finished with */ |
219 | * just make sure the buffer is finished with */ |
221 | 220 | ||
222 | /* just do a BO wait for now */ |
221 | /* just do a BO wait for now */ |
223 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
222 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
224 | if (gobj == NULL) { |
223 | if (gobj == NULL) { |
225 | return -EINVAL; |
224 | return -ENOENT; |
226 | } |
225 | } |
227 | robj = gobj->driver_private; |
226 | robj = gobj->driver_private; |
228 | 227 | ||
229 | r = radeon_gem_set_domain(gobj, args->read_domains, args->write_domain); |
228 | r = radeon_gem_set_domain(gobj, args->read_domains, args->write_domain); |
230 | - | ||
231 | mutex_lock(&dev->struct_mutex); |
229 | |
232 | drm_gem_object_unreference(gobj); |
- | |
233 | mutex_unlock(&dev->struct_mutex); |
230 | drm_gem_object_unreference_unlocked(gobj); |
234 | return r; |
231 | return r; |
235 | } |
232 | } |
236 | 233 | ||
237 | int radeon_gem_mmap_ioctl(struct drm_device *dev, void *data, |
234 | int radeon_gem_mmap_ioctl(struct drm_device *dev, void *data, |
238 | struct drm_file *filp) |
235 | struct drm_file *filp) |
239 | { |
236 | { |
240 | struct drm_radeon_gem_mmap *args = data; |
237 | struct drm_radeon_gem_mmap *args = data; |
241 | struct drm_gem_object *gobj; |
238 | struct drm_gem_object *gobj; |
242 | struct radeon_bo *robj; |
239 | struct radeon_bo *robj; |
243 | 240 | ||
244 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
241 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
245 | if (gobj == NULL) { |
242 | if (gobj == NULL) { |
246 | return -EINVAL; |
243 | return -ENOENT; |
247 | } |
244 | } |
248 | robj = gobj->driver_private; |
245 | robj = gobj->driver_private; |
249 | args->addr_ptr = radeon_bo_mmap_offset(robj); |
246 | args->addr_ptr = radeon_bo_mmap_offset(robj); |
250 | mutex_lock(&dev->struct_mutex); |
- | |
251 | drm_gem_object_unreference(gobj); |
247 | drm_gem_object_unreference_unlocked(gobj); |
252 | mutex_unlock(&dev->struct_mutex); |
- | |
253 | return 0; |
248 | return 0; |
254 | } |
249 | } |
255 | 250 | ||
256 | int radeon_gem_busy_ioctl(struct drm_device *dev, void *data, |
251 | int radeon_gem_busy_ioctl(struct drm_device *dev, void *data, |
257 | struct drm_file *filp) |
252 | struct drm_file *filp) |
258 | { |
253 | { |
259 | struct drm_radeon_gem_busy *args = data; |
254 | struct drm_radeon_gem_busy *args = data; |
260 | struct drm_gem_object *gobj; |
255 | struct drm_gem_object *gobj; |
261 | struct radeon_bo *robj; |
256 | struct radeon_bo *robj; |
262 | int r; |
257 | int r; |
263 | uint32_t cur_placement = 0; |
258 | uint32_t cur_placement = 0; |
264 | 259 | ||
265 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
260 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
266 | if (gobj == NULL) { |
261 | if (gobj == NULL) { |
267 | return -EINVAL; |
262 | return -ENOENT; |
268 | } |
263 | } |
269 | robj = gobj->driver_private; |
264 | robj = gobj->driver_private; |
270 | r = radeon_bo_wait(robj, &cur_placement, true); |
265 | r = radeon_bo_wait(robj, &cur_placement, true); |
271 | switch (cur_placement) { |
266 | switch (cur_placement) { |
272 | case TTM_PL_VRAM: |
267 | case TTM_PL_VRAM: |
273 | args->domain = RADEON_GEM_DOMAIN_VRAM; |
268 | args->domain = RADEON_GEM_DOMAIN_VRAM; |
274 | break; |
269 | break; |
275 | case TTM_PL_TT: |
270 | case TTM_PL_TT: |
276 | args->domain = RADEON_GEM_DOMAIN_GTT; |
271 | args->domain = RADEON_GEM_DOMAIN_GTT; |
277 | break; |
272 | break; |
278 | case TTM_PL_SYSTEM: |
273 | case TTM_PL_SYSTEM: |
279 | args->domain = RADEON_GEM_DOMAIN_CPU; |
274 | args->domain = RADEON_GEM_DOMAIN_CPU; |
280 | default: |
275 | default: |
281 | break; |
276 | break; |
282 | } |
277 | } |
283 | mutex_lock(&dev->struct_mutex); |
- | |
284 | drm_gem_object_unreference(gobj); |
278 | drm_gem_object_unreference_unlocked(gobj); |
285 | mutex_unlock(&dev->struct_mutex); |
- | |
286 | return r; |
279 | return r; |
287 | } |
280 | } |
288 | 281 | ||
289 | int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data, |
282 | int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data, |
290 | struct drm_file *filp) |
283 | struct drm_file *filp) |
291 | { |
284 | { |
292 | struct drm_radeon_gem_wait_idle *args = data; |
285 | struct drm_radeon_gem_wait_idle *args = data; |
293 | struct drm_gem_object *gobj; |
286 | struct drm_gem_object *gobj; |
294 | struct radeon_bo *robj; |
287 | struct radeon_bo *robj; |
295 | int r; |
288 | int r; |
296 | 289 | ||
297 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
290 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
298 | if (gobj == NULL) { |
291 | if (gobj == NULL) { |
299 | return -EINVAL; |
292 | return -ENOENT; |
300 | } |
293 | } |
301 | robj = gobj->driver_private; |
294 | robj = gobj->driver_private; |
302 | r = radeon_bo_wait(robj, NULL, false); |
295 | r = radeon_bo_wait(robj, NULL, false); |
303 | /* callback hw specific functions if any */ |
296 | /* callback hw specific functions if any */ |
304 | if (robj->rdev->asic->ioctl_wait_idle) |
297 | if (robj->rdev->asic->ioctl_wait_idle) |
305 | robj->rdev->asic->ioctl_wait_idle(robj->rdev, robj); |
298 | robj->rdev->asic->ioctl_wait_idle(robj->rdev, robj); |
306 | mutex_lock(&dev->struct_mutex); |
- | |
307 | drm_gem_object_unreference(gobj); |
299 | drm_gem_object_unreference_unlocked(gobj); |
308 | mutex_unlock(&dev->struct_mutex); |
- | |
309 | return r; |
300 | return r; |
310 | } |
301 | } |
311 | 302 | ||
312 | int radeon_gem_set_tiling_ioctl(struct drm_device *dev, void *data, |
303 | int radeon_gem_set_tiling_ioctl(struct drm_device *dev, void *data, |
313 | struct drm_file *filp) |
304 | struct drm_file *filp) |
314 | { |
305 | { |
315 | struct drm_radeon_gem_set_tiling *args = data; |
306 | struct drm_radeon_gem_set_tiling *args = data; |
316 | struct drm_gem_object *gobj; |
307 | struct drm_gem_object *gobj; |
317 | struct radeon_bo *robj; |
308 | struct radeon_bo *robj; |
318 | int r = 0; |
309 | int r = 0; |
319 | 310 | ||
320 | DRM_DEBUG("%d \n", args->handle); |
311 | DRM_DEBUG("%d \n", args->handle); |
321 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
312 | gobj = drm_gem_object_lookup(dev, filp, args->handle); |
322 | if (gobj == NULL) |
313 | if (gobj == NULL) |
323 | return -EINVAL; |
314 | return -ENOENT; |
324 | robj = gobj->driver_private; |
315 | robj = gobj->driver_private; |
325 | r = radeon_bo_set_tiling_flags(robj, args->tiling_flags, args->pitch); |
316 | r = radeon_bo_set_tiling_flags(robj, args->tiling_flags, args->pitch); |
326 | mutex_lock(&dev->struct_mutex); |
- | |
327 | drm_gem_object_unreference(gobj); |
317 | drm_gem_object_unreference_unlocked(gobj); |
328 | mutex_unlock(&dev->struct_mutex); |
- | |
329 | return r; |
318 | return r; |
330 | } |
319 | } |
331 | 320 | ||
332 | #endif> |
321 | #endif> |