Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52217195 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Extract drm_connector.[hc] 



Pulls in quite a lot of connector related structures (cmdline mode,
force/status enums, display info), but I think that all makes perfect
sense.

Also had to move a few more core kms object stuff into drm_modeset.h.

And as a first cleanup remove the kerneldoc for the 2 connector IOCTL
- DRM core docs are aimed at drivers, no point documenting internal in
excruciating detail.

v2: And also pull in all the connector property code.

Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471034937-651-14-git-send-email-daniel.vetter@ffwll.ch
parent adebd6fe

Documentation/gpu/drm-kms.rst

+9 −0
Original line number Diff line number Diff line
@@ -110,6 +110,15 @@ Display Modes Function Reference 
.. kernel-doc:: drivers/gpu/drm/drm_modes.c

   :export:



Connector Display Sink Abstraction

==================================



.. kernel-doc:: include/drm/drm_connector.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_connector.c

   :export:



KMS Initialization and Cleanup

==============================

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_trace_points.o drm_global.o drm_prime.o \

		drm_rect.o drm_vma_manager.o drm_flip_work.o \

		drm_modeset_lock.o drm_atomic.o drm_bridge.o \

		drm_framebuffer.o

		drm_framebuffer.o drm_connector.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

drivers/gpu/drm/drm_connector.c

0 → 100644
+1058 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/drm_crtc.c

+11 −1099

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/drm_crtc_internal.h

+20 −6
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 




/* drm_crtc.c */

void drm_connector_ida_init(void);

void drm_connector_ida_destroy(void);

int drm_mode_object_get_reg(struct drm_device *dev,

			    struct drm_mode_object *obj,

			    uint32_t obj_type,
@@ -48,6 +46,10 @@ struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev, 
					       uint32_t id, uint32_t type);

void drm_mode_object_unregister(struct drm_device *dev,

				struct drm_mode_object *object);

int drm_mode_object_get_properties(struct drm_mode_object *obj, bool atomic,

				   uint32_t __user *prop_ptr,

				   uint64_t __user *prop_values,

				   uint32_t *arg_count_props);

bool drm_property_change_valid_get(struct drm_property *property,

				   uint64_t value,

				   struct drm_mode_object **ref);
@@ -85,8 +87,6 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, 
			  struct drm_file *file_priv);

int drm_mode_getcrtc(struct drm_device *dev,

		     void *data, struct drm_file *file_priv);

int drm_mode_getconnector(struct drm_device *dev,

			  void *data, struct drm_file *file_priv);

int drm_mode_setcrtc(struct drm_device *dev,

		     void *data, struct drm_file *file_priv);

int drm_mode_getplane(struct drm_device *dev,
@@ -105,8 +105,6 @@ int drm_mode_createblob_ioctl(struct drm_device *dev, 
			      void *data, struct drm_file *file_priv);

int drm_mode_destroyblob_ioctl(struct drm_device *dev,

			       void *data, struct drm_file *file_priv);

int drm_mode_connector_property_set_ioctl(struct drm_device *dev,

					  void *data, struct drm_file *file_priv);

int drm_mode_getencoder(struct drm_device *dev,

			void *data, struct drm_file *file_priv);

int drm_mode_gamma_get_ioctl(struct drm_device *dev,
@@ -117,6 +115,22 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, 
int drm_mode_page_flip_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);



/* drm_connector.c */

void drm_connector_ida_init(void);

void drm_connector_ida_destroy(void);

void drm_connector_unregister_all(struct drm_device *dev);

int drm_connector_register_all(struct drm_device *dev);

int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,

				    struct drm_property *property,

				    uint64_t value);

int drm_connector_create_standard_properties(struct drm_device *dev);



/* IOCTL */

int drm_mode_connector_property_set_ioctl(struct drm_device *dev,

					  void *data, struct drm_file *file_priv);

int drm_mode_getconnector(struct drm_device *dev,

			  void *data, struct drm_file *file_priv);



/* drm_framebuffer.c */

struct drm_framebuffer *

drm_internal_framebuffer_create(struct drm_device *dev,