Rev 4126 | Rev 4280 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4126 | Rev 4246 | ||
|---|---|---|---|
| Line 43... | Line 43... | ||
| 43 | 43 | ||
| 44 | int blit_tex(u32 hbitmap, int dst_x, int dst_y, |
44 | int blit_tex(u32 hbitmap, int dst_x, int dst_y, |
| Line 45... | Line 45... | ||
| 45 | int src_x, int src_y, u32 w, u32 h); |
45 | int src_x, int src_y, u32 w, u32 h); |
| 46 | 46 | ||
| - | 47 | void get_pci_info(struct pci_device *dev); |
|
| Line 47... | Line 48... | ||
| 47 | void get_pci_info(struct pci_device *dev); |
48 | int i915_getparam(struct drm_device *dev, void *data, |
| 48 | int gem_getparam(struct drm_device *dev, void *data); |
49 | struct drm_file *file_priv); |
| Line 219... | Line 220... | ||
| 219 | #define SRV_BLIT_TEXTURE 16 |
220 | #define SRV_BLIT_TEXTURE 16 |
| 220 | #define SRV_BLIT_VIDEO 17 |
221 | #define SRV_BLIT_VIDEO 17 |
| Line 221... | Line 222... | ||
| 221 | 222 | ||
| 222 | 223 | ||
| 223 | #define SRV_GET_PCI_INFO 20 |
224 | #define SRV_GET_PCI_INFO 20 |
| 224 | #define SRV_GET_PARAM 21 |
225 | #define SRV_I915_GET_PARAM 21 |
| - | 226 | #define SRV_I915_GEM_CREATE 22 |
|
| - | 227 | #define SRV_DRM_GEM_CLOSE 23 |
|
| 225 | #define SRV_I915_GEM_CREATE 22 |
228 | #define SRV_DRM_GEM_FLINK 24 |
| 226 | #define SRV_DRM_GEM_CLOSE 23 |
229 | #define SRV_DRM_GEM_OPEN 25 |
| 227 | #define SRV_I915_GEM_PIN 24 |
230 | #define SRV_I915_GEM_PIN 26 |
| 228 | #define SRV_I915_GEM_SET_CACHEING 25 |
231 | #define SRV_I915_GEM_UNPIN 27 |
| 229 | #define SRV_I915_GEM_GET_APERTURE 26 |
232 | #define SRV_I915_GEM_SET_CACHING 28 |
| 230 | #define SRV_I915_GEM_PWRITE 27 |
233 | #define SRV_I915_GEM_PWRITE 29 |
| 231 | #define SRV_I915_GEM_BUSY 28 |
234 | #define SRV_I915_GEM_BUSY 30 |
| - | 235 | #define SRV_I915_GEM_SET_DOMAIN 31 |
|
| - | 236 | #define SRV_I915_GEM_MMAP 32 |
|
| - | 237 | #define SRV_I915_GEM_SET_TILING 33 |
|
| 232 | #define SRV_I915_GEM_SET_DOMAIN 29 |
238 | #define SRV_I915_GEM_GET_TILING 34 |
| 233 | #define SRV_I915_GEM_MMAP 30 |
239 | #define SRV_I915_GEM_GET_APERTURE 35 |
| - | 240 | #define SRV_I915_GEM_MMAP_GTT 36 |
|
| 234 | #define SRV_I915_GEM_MMAP_GTT 31 |
241 | #define SRV_I915_GEM_THROTTLE 37 |
| 235 | #define SRV_I915_GEM_THROTTLE 32 |
242 | #define SRV_I915_GEM_EXECBUFFER2 38 |
| - | 243 | #define SRV_I915_GEM_WAIT 39 |
|
| 236 | #define SRV_FBINFO 33 |
244 | #define SRV_I915_GEM_CONTEXT_CREATE 40 |
| Line -... | Line 245... | ||
| - | 245 | #define SRV_I915_GEM_CONTEXT_DESTROY 41 |
|
| - | 246 | #define SRV_I915_REG_READ 42 |
|
| Line 237... | Line 247... | ||
| 237 | #define SRV_I915_GEM_EXECBUFFER2 34 |
247 | |
| 238 | #define SRV_MASK_UPDATE 35 |
248 | #define SRV_FBINFO 43 |
| 239 | 249 | #define SRV_MASK_UPDATE 44 |
|
| Line 314... | Line 324... | ||
| 314 | case SRV_GET_PCI_INFO: |
324 | case SRV_GET_PCI_INFO: |
| 315 | get_pci_info((struct pci_device *)inp); |
325 | get_pci_info((struct pci_device *)inp); |
| 316 | retval = 0; |
326 | retval = 0; |
| 317 | break; |
327 | break; |
| Line 318... | Line 328... | ||
| 318 | 328 | ||
| 319 | case SRV_GET_PARAM: |
329 | case SRV_I915_GET_PARAM: |
| 320 | retval = gem_getparam(main_device, inp); |
330 | retval = i915_getparam(main_device, inp, file); |
| Line 321... | Line 331... | ||
| 321 | break; |
331 | break; |
| 322 | 332 | ||
| 323 | case SRV_I915_GEM_CREATE: |
333 | case SRV_I915_GEM_CREATE: |
| Line 324... | Line 334... | ||
| 324 | retval = i915_gem_create_ioctl(main_device, inp, file); |
334 | retval = i915_gem_create_ioctl(main_device, inp, file); |
| 325 | break; |
335 | break; |
| 326 | 336 | ||
| Line -... | Line 337... | ||
| - | 337 | case SRV_DRM_GEM_CLOSE: |
|
| - | 338 | retval = drm_gem_close_ioctl(main_device, inp, file); |
|
| - | 339 | break; |
|
| - | 340 | ||
| - | 341 | case SRV_DRM_GEM_FLINK: |
|
| - | 342 | retval = drm_gem_flink_ioctl(main_device, inp, file); |
|
| - | 343 | break; |
|
| - | 344 | ||
| 327 | case SRV_DRM_GEM_CLOSE: |
345 | case SRV_DRM_GEM_OPEN: |
| 328 | retval = drm_gem_close_ioctl(main_device, inp, file); |
346 | retval = drm_gem_open_ioctl(main_device, inp, file); |
| 329 | break; |
347 | break; |
| Line 330... | Line 348... | ||
| 330 | 348 | ||
| 331 | case SRV_I915_GEM_PIN: |
349 | case SRV_I915_GEM_PIN: |
| 332 | retval = i915_gem_pin_ioctl(main_device, inp, file); |
350 | retval = i915_gem_pin_ioctl(main_device, inp, file); |
| Line 333... | Line 351... | ||
| 333 | break; |
351 | break; |
| 334 | 352 | ||
| 335 | case SRV_I915_GEM_SET_CACHEING: |
353 | case SRV_I915_GEM_UNPIN: |
| Line 336... | Line 354... | ||
| 336 | retval = i915_gem_set_caching_ioctl(main_device, inp, file); |
354 | retval = i915_gem_unpin_ioctl(main_device, inp, file); |
| 337 | break; |
355 | break; |
| 338 | 356 | ||
| Line 350... | Line 368... | ||
| 350 | 368 | ||
| 351 | case SRV_I915_GEM_SET_DOMAIN: |
369 | case SRV_I915_GEM_SET_DOMAIN: |
| 352 | retval = i915_gem_set_domain_ioctl(main_device, inp, file); |
370 | retval = i915_gem_set_domain_ioctl(main_device, inp, file); |
| Line 353... | Line -... | ||
| 353 | break; |
- | |
| 354 | - | ||
| 355 | case SRV_I915_GEM_THROTTLE: |
- | |
| 356 | retval = i915_gem_throttle_ioctl(main_device, inp, file); |
- | |
| 357 | break; |
371 | break; |
| 358 | 372 | ||
| 359 | case SRV_I915_GEM_MMAP: |
373 | case SRV_I915_GEM_MMAP: |
| Line -... | Line 374... | ||
| - | 374 | retval = i915_gem_mmap_ioctl(main_device, inp, file); |
|
| - | 375 | break; |
|
| - | 376 | ||
| - | 377 | case SRV_I915_GEM_SET_TILING: |
|
| - | 378 | retval = i915_gem_set_tiling(main_device, inp, file); |
|
| - | 379 | break; |
|
| - | 380 | ||
| - | 381 | case SRV_I915_GEM_GET_TILING: |
|
| - | 382 | retval = i915_gem_get_tiling(main_device, inp, file); |
|
| - | 383 | break; |
|
| - | 384 | ||
| - | 385 | case SRV_I915_GEM_GET_APERTURE: |
|
| - | 386 | // printf("SRV_I915_GEM_GET_APERTURE "); |
|
| - | 387 | retval = i915_gem_get_aperture_ioctl(main_device, inp, file); |
|
| 360 | retval = i915_gem_mmap_ioctl(main_device, inp, file); |
388 | // printf(" retval=%d\n", retval); |
| 361 | break; |
389 | break; |
| 362 | 390 | ||
| Line 363... | Line -... | ||
| 363 | case SRV_I915_GEM_MMAP_GTT: |
- | |
| 364 | retval = i915_gem_mmap_gtt_ioctl(main_device, inp, file); |
391 | case SRV_I915_GEM_MMAP_GTT: |
| 365 | break; |
392 | retval = i915_gem_mmap_gtt_ioctl(main_device, inp, file); |
| 366 | 393 | break; |
|
| Line 367... | Line 394... | ||
| 367 | 394 | ||
| - | 395 | case SRV_I915_GEM_THROTTLE: |
|
| 368 | case SRV_FBINFO: |
396 | retval = i915_gem_throttle_ioctl(main_device, inp, file); |
| 369 | retval = i915_fbinfo(inp); |
397 | break; |
| Line -... | Line 398... | ||
| - | 398 | ||
| - | 399 | case SRV_I915_GEM_EXECBUFFER2: |
|
| - | 400 | // printf("SRV_I915_GEM_EXECBUFFER2\n"); |
|
| - | 401 | retval = i915_gem_execbuffer2(main_device, inp, file); |
|
| - | 402 | break; |
|
| - | 403 | ||
| - | 404 | case SRV_I915_GEM_WAIT: |
|
| - | 405 | retval = i915_gem_wait_ioctl(main_device, inp, file); |
|
| - | 406 | break; |
|
| - | 407 | ||
| - | 408 | case SRV_I915_GEM_CONTEXT_CREATE: |
|
| - | 409 | retval = i915_gem_context_create_ioctl(main_device, inp, file); |
|
| - | 410 | break; |
|
| - | 411 | ||
| - | 412 | case SRV_I915_GEM_CONTEXT_DESTROY: |
|
| - | 413 | retval = i915_gem_context_destroy_ioctl(main_device, inp, file); |
|
| - | 414 | break; |
|
| - | 415 | ||
| - | 416 | case SRV_I915_REG_READ: |
|
| - | 417 | retval = i915_reg_read_ioctl(main_device, inp, file); |
|
| 370 | break; |
418 | break; |
| 371 | 419 | ||
| 372 | case SRV_I915_GEM_EXECBUFFER2: |
420 | case SRV_FBINFO: |
| 373 | retval = i915_gem_execbuffer2(main_device, inp, file); |
- | |
| 374 | break; |
421 | retval = i915_fbinfo(inp); |
| Line 375... | Line 422... | ||
| 375 | 422 | break; |
|
| 376 | case SRV_MASK_UPDATE: |
423 | |
| Line 519... | Line 566... | ||
| 519 | dev->func = pdev->devfn & 7; |
566 | dev->func = pdev->devfn & 7; |
| 520 | dev->vendor_id = pdev->vendor; |
567 | dev->vendor_id = pdev->vendor; |
| 521 | dev->device_id = pdev->device; |
568 | dev->device_id = pdev->device; |
| 522 | dev->revision = pdev->revision; |
569 | dev->revision = pdev->revision; |
| 523 | }; |
570 | }; |
| - | 571 | > |
|
| - | 572 | > |
|
| - | 573 | ||