Commit 28575f16 authored by Daniel Vetter's avatar Daniel Vetter

drm: Extract drm_mode_config.[hc]

And shuffle the kernel-doc structure a bit since drm_crtc.[hc] now
only contains CRTC-related functions and structures.

v2:
- rebase onto drm-misc
- don't forget to move drm_mode_config_cleanup.
- move 2 internal decls under the right heading (Chris)
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 83113df5
...@@ -15,25 +15,24 @@ be setup by initializing the following fields. ...@@ -15,25 +15,24 @@ be setup by initializing the following fields.
- struct drm_mode_config_funcs \*funcs; - struct drm_mode_config_funcs \*funcs;
Mode setting functions. Mode setting functions.
Modeset Base Object Abstraction Mode Configuration
===============================
.. kernel-doc:: include/drm/drm_mode_object.h KMS Core Structures and Functions
:internal: =================================
.. kernel-doc:: drivers/gpu/drm/drm_mode_object.c .. kernel-doc:: drivers/gpu/drm/drm_mode_config.c
:export: :export:
KMS Data Structures .. kernel-doc:: include/drm/drm_mode_config.h
===================
.. kernel-doc:: include/drm/drm_crtc.h
:internal: :internal:
KMS API Functions Modeset Base Object Abstraction
================= ===============================
.. kernel-doc:: drivers/gpu/drm/drm_crtc.c .. kernel-doc:: include/drm/drm_mode_object.h
:internal:
.. kernel-doc:: drivers/gpu/drm/drm_mode_object.c
:export: :export:
Atomic Mode Setting Function Reference Atomic Mode Setting Function Reference
...@@ -45,6 +44,15 @@ Atomic Mode Setting Function Reference ...@@ -45,6 +44,15 @@ Atomic Mode Setting Function Reference
.. kernel-doc:: include/drm/drm_atomic.h .. kernel-doc:: include/drm/drm_atomic.h
:internal: :internal:
CRTC Abstraction
================
.. kernel-doc:: drivers/gpu/drm/drm_crtc.c
:export:
.. kernel-doc:: include/drm/drm_crtc.h
:internal:
Frame Buffer Abstraction Frame Buffer Abstraction
======================== ========================
......
...@@ -16,7 +16,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ ...@@ -16,7 +16,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
drm_framebuffer.o drm_connector.o drm_blend.o \ drm_framebuffer.o drm_connector.o drm_blend.o \
drm_encoder.o drm_mode_object.o drm_property.o \ drm_encoder.o drm_mode_object.o drm_property.o \
drm_plane.o drm_color_mgmt.o drm_print.o \ drm_plane.o drm_color_mgmt.o drm_print.o \
drm_dumb_buffers.o drm_dumb_buffers.o drm_mode_config.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_COMPAT) += drm_ioc32.o
drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
......
This diff is collapsed.
...@@ -40,19 +40,26 @@ int drm_crtc_check_viewport(const struct drm_crtc *crtc, ...@@ -40,19 +40,26 @@ int drm_crtc_check_viewport(const struct drm_crtc *crtc,
int x, int y, int x, int y,
const struct drm_display_mode *mode, const struct drm_display_mode *mode,
const struct drm_framebuffer *fb); const struct drm_framebuffer *fb);
int drm_crtc_register_all(struct drm_device *dev);
void drm_fb_release(struct drm_file *file_priv); void drm_crtc_unregister_all(struct drm_device *dev);
/* IOCTLs */ /* IOCTLs */
int drm_mode_getresources(struct drm_device *dev,
void *data, struct drm_file *file_priv);
int drm_mode_getcrtc(struct drm_device *dev, int drm_mode_getcrtc(struct drm_device *dev,
void *data, struct drm_file *file_priv); void *data, struct drm_file *file_priv);
int drm_mode_setcrtc(struct drm_device *dev, int drm_mode_setcrtc(struct drm_device *dev,
void *data, struct drm_file *file_priv); void *data, struct drm_file *file_priv);
/* drm_dumb_buffers.c */
/* drm_mode_config.c */
int drm_modeset_register_all(struct drm_device *dev);
void drm_modeset_unregister_all(struct drm_device *dev);
/* IOCTLs */
int drm_mode_getresources(struct drm_device *dev,
void *data, struct drm_file *file_priv);
/* drm_dumb_buffers.c */
/* IOCTLs */ /* IOCTLs */
int drm_mode_create_dumb_ioctl(struct drm_device *dev, int drm_mode_create_dumb_ioctl(struct drm_device *dev,
void *data, struct drm_file *file_priv); void *data, struct drm_file *file_priv);
...@@ -149,6 +156,8 @@ void drm_framebuffer_free(struct kref *kref); ...@@ -149,6 +156,8 @@ void drm_framebuffer_free(struct kref *kref);
int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y, int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y,
uint32_t src_w, uint32_t src_h, uint32_t src_w, uint32_t src_h,
const struct drm_framebuffer *fb); const struct drm_framebuffer *fb);
void drm_fb_release(struct drm_file *file_priv);
/* IOCTL */ /* IOCTL */
int drm_mode_addfb(struct drm_device *dev, int drm_mode_addfb(struct drm_device *dev,
...@@ -168,9 +177,6 @@ int drm_atomic_get_property(struct drm_mode_object *obj, ...@@ -168,9 +177,6 @@ int drm_atomic_get_property(struct drm_mode_object *obj,
int drm_mode_atomic_ioctl(struct drm_device *dev, int drm_mode_atomic_ioctl(struct drm_device *dev,
void *data, struct drm_file *file_priv); void *data, struct drm_file *file_priv);
int drm_modeset_register_all(struct drm_device *dev);
void drm_modeset_unregister_all(struct drm_device *dev);
/* drm_plane.c */ /* drm_plane.c */
int drm_plane_register_all(struct drm_device *dev); int drm_plane_register_all(struct drm_device *dev);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment