diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 06:12:32 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-09-10 03:40:11 -0400 |
commit | cc5ea5947a52b98cd9a03d4011a5a12b4e5a99c4 (patch) | |
tree | 11a83a3663b99b96437e11d4bffd1ce240cfceb5 /include/drm/drmP.h | |
parent | cc33db0a6108d41b94eba0d84b0627cc52585109 (diff) |
drm: move AGP definitions harder
Move drm_agp_head to drm_agpsupport.h and drm_agp_mem into drm_legacy.h.
Unfortunately, drivers still heavily access drm_agp_head so we cannot
move it to drm_legacy.h. However, at least it's no longer visible in
drmP.h now (it's directly included from it, though).
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r-- | include/drm/drmP.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0bf66f907f25..7a3c73c5375d 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -80,6 +80,7 @@ struct module; | |||
80 | 80 | ||
81 | struct drm_file; | 81 | struct drm_file; |
82 | struct drm_device; | 82 | struct drm_device; |
83 | struct drm_agp_head; | ||
83 | 84 | ||
84 | struct device_node; | 85 | struct device_node; |
85 | struct videomode; | 86 | struct videomode; |
@@ -440,35 +441,6 @@ struct drm_device_dma { | |||
440 | }; | 441 | }; |
441 | 442 | ||
442 | /** | 443 | /** |
443 | * AGP memory entry. Stored as a doubly linked list. | ||
444 | */ | ||
445 | struct drm_agp_mem { | ||
446 | unsigned long handle; /**< handle */ | ||
447 | struct agp_memory *memory; | ||
448 | unsigned long bound; /**< address */ | ||
449 | int pages; | ||
450 | struct list_head head; | ||
451 | }; | ||
452 | |||
453 | /** | ||
454 | * AGP data. | ||
455 | * | ||
456 | * \sa drm_agp_init() and drm_device::agp. | ||
457 | */ | ||
458 | struct drm_agp_head { | ||
459 | struct agp_kern_info agp_info; /**< AGP device information */ | ||
460 | struct list_head memory; | ||
461 | unsigned long mode; /**< AGP mode */ | ||
462 | struct agp_bridge_data *bridge; | ||
463 | int enabled; /**< whether the AGP bus as been enabled */ | ||
464 | int acquired; /**< whether the AGP device has been acquired */ | ||
465 | unsigned long base; | ||
466 | int agp_mtrr; | ||
467 | int cant_use_aperture; | ||
468 | unsigned long page_mask; | ||
469 | }; | ||
470 | |||
471 | /** | ||
472 | * Scatter-gather memory. | 444 | * Scatter-gather memory. |
473 | */ | 445 | */ |
474 | struct drm_sg_mem { | 446 | struct drm_sg_mem { |