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

Commit 59e71ee7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Extract drm_property.[hc] 



This just contains the base property classes and all the code to
handle blobs. I think for any kind of standardized/shared properties
it's better to have separate files - this is fairly big already as-is.

v2: resurrect misplaced hunk (Daniel Stone)

Cc: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160829082757.17913-7-daniel.vetter@ffwll.ch
parent ec5e3047

Documentation/gpu/drm-kms.rst

+9 −0
Original line number Diff line number Diff line
@@ -389,6 +389,15 @@ connector and plane objects by calling the 
pointer to the target object, a pointer to the previously created

property and an initial instance value.



Property Types and Blob Property Support

----------------------------------------



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

   :internal:



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

   :export:



Blending and Z-Position properties

----------------------------------

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.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_connector.o drm_blend.o \

		drm_encoder.o drm_mode_object.o

		drm_encoder.o drm_mode_object.o drm_property.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

drivers/gpu/drm/drm_crtc.c

+0 −926

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/drm_crtc_internal.h

+18 −14
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ 
int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,

			       struct drm_property *property,

			       uint64_t value);

bool drm_property_change_valid_get(struct drm_property *property,

				   uint64_t value,

				   struct drm_mode_object **ref);

void drm_property_change_valid_put(struct drm_property *property,

				   struct drm_mode_object *ref);

int drm_plane_check_pixel_format(const struct drm_plane *plane,

				 u32 format);

int drm_crtc_check_viewport(const struct drm_crtc *crtc,
@@ -49,8 +44,6 @@ int drm_crtc_check_viewport(const struct drm_crtc *crtc, 
			    const struct drm_framebuffer *fb);



void drm_fb_release(struct drm_file *file_priv);

void drm_property_destroy_user_blobs(struct drm_device *dev,

				     struct drm_file *file_priv);



/* dumb buffer support IOCTLs */

int drm_mode_create_dumb_ioctl(struct drm_device *dev,
@@ -77,6 +70,24 @@ int drm_mode_cursor_ioctl(struct drm_device *dev, 
			  void *data, struct drm_file *file_priv);

int drm_mode_cursor2_ioctl(struct drm_device *dev,

			   void *data, struct drm_file *file_priv);

int drm_mode_gamma_get_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);

int drm_mode_gamma_set_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);



int drm_mode_page_flip_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);



/* drm_property.c */

void drm_property_destroy_user_blobs(struct drm_device *dev,

				     struct drm_file *file_priv);

bool drm_property_change_valid_get(struct drm_property *property,

				   uint64_t value,

				   struct drm_mode_object **ref);

void drm_property_change_valid_put(struct drm_property *property,

				   struct drm_mode_object *ref);



/* IOCTL */

int drm_mode_getproperty_ioctl(struct drm_device *dev,

			       void *data, struct drm_file *file_priv);

int drm_mode_getblob_ioctl(struct drm_device *dev,
@@ -85,13 +96,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_gamma_get_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);

int drm_mode_gamma_set_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);



int drm_mode_page_flip_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);



/* drm_mode_object.c */

int drm_mode_object_get_reg(struct drm_device *dev,

drivers/gpu/drm/drm_property.c

0 → 100644
+953 −0

File added.

Preview size limit exceeded, changes collapsed.