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

Commit 43968d7b authored by Daniel Vetter's avatar Daniel Vetter Committed by Sean Paul
Browse files

drm: Extract drm_plane.[hc] 



Just pure code movement, cleanup and polish will happen in later
patches.

v2: Don't forget all the ioctl! To extract those cleanly I decided to
put check_src_coords into drm_framebuffer.c (and give it a
drm_framebuffer_ prefix), since that just checks framebuffer
constraints.

v3: rebase over PAGE_FLIP_TARGET.

Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>

[seanpaul]
This patch as posted on the list was rebased on:

commit 6f00975c
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Sat Aug 20 12:22:11 2016 +0200

    drm: Reject page_flip for !DRIVER_MODESET

so as a result of moving the page_flip ioctl, this fix has
been rolled into this patch.

Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
parent ce2f2c3f

Documentation/gpu/drm-kms.rst

+12 −0
Original line number Diff line number Diff line
@@ -110,6 +110,18 @@ Note that dumb objects may not be used for gpu acceleration, as has been 
attempted on some ARM embedded platforms. Such drivers really must have

a hardware-specific ioctl to allocate suitable buffer objects.



Plane Abstraction

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



Plane Functions Reference

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



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

   :internal:



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

   :export:



Display Modes Function Reference

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

drivers/gpu/drm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 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_property.o

		drm_encoder.o drm_mode_object.o drm_property.o \

		drm_plane.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

drivers/gpu/drm/drm_crtc.c

+3 −985

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/drm_crtc_internal.h

+23 −15
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,

			       struct drm_property *property,

			       uint64_t value);

int drm_plane_check_pixel_format(const struct drm_plane *plane,

				 u32 format);

int drm_crtc_check_viewport(const struct drm_crtc *crtc,

			    int x, int y,

			    const struct drm_display_mode *mode,
@@ -56,28 +54,15 @@ int drm_mode_destroy_dumb_ioctl(struct drm_device *dev, 
/* IOCTLs */

int drm_mode_getresources(struct drm_device *dev,

			  void *data, struct drm_file *file_priv);

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_setcrtc(struct drm_device *dev,

		     void *data, struct drm_file *file_priv);

int drm_mode_getplane(struct drm_device *dev,

		      void *data, struct drm_file *file_priv);

int drm_mode_setplane(struct drm_device *dev,

		      void *data, struct drm_file *file_priv);

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);
@@ -155,6 +140,9 @@ drm_internal_framebuffer_create(struct drm_device *dev, 
				const struct drm_mode_fb_cmd2 *r,

				struct drm_file *file_priv);

void drm_framebuffer_free(struct kref *kref);

int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y,

				     uint32_t src_w, uint32_t src_h,

				     const struct drm_framebuffer *fb);



/* IOCTL */

int drm_mode_addfb(struct drm_device *dev,
@@ -180,3 +168,23 @@ void drm_modeset_unregister_all(struct drm_device *dev); 
/* drm_blend.c */

int drm_atomic_normalize_zpos(struct drm_device *dev,

			      struct drm_atomic_state *state);



/* drm_plane.c */

int drm_plane_register_all(struct drm_device *dev);

void drm_plane_unregister_all(struct drm_device *dev);

int drm_plane_check_pixel_format(const struct drm_plane *plane,

				 u32 format);



/* IOCTL */

int drm_mode_getplane_res(struct drm_device *dev, void *data,

			  struct drm_file *file_priv);

int drm_mode_getplane(struct drm_device *dev,

		      void *data, struct drm_file *file_priv);

int drm_mode_setplane(struct drm_device *dev,

		      void *data, struct drm_file *file_priv);

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_page_flip_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv);

drivers/gpu/drm/drm_framebuffer.c

+26 −0
Original line number Diff line number Diff line
@@ -62,6 +62,32 @@ 
 * &drm_framebuffer.

 */



int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y,

				     uint32_t src_w, uint32_t src_h,

				     const struct drm_framebuffer *fb)

{

	unsigned int fb_width, fb_height;



	fb_width = fb->width << 16;

	fb_height = fb->height << 16;



	/* Make sure source coordinates are inside the fb. */

	if (src_w > fb_width ||

	    src_x > fb_width - src_w ||

	    src_h > fb_height ||

	    src_y > fb_height - src_h) {

		DRM_DEBUG_KMS("Invalid source coordinates "

			      "%u.%06ux%u.%06u+%u.%06u+%u.%06u\n",

			      src_w >> 16, ((src_w & 0xffff) * 15625) >> 10,

			      src_h >> 16, ((src_h & 0xffff) * 15625) >> 10,

			      src_x >> 16, ((src_x & 0xffff) * 15625) >> 10,

			      src_y >> 16, ((src_y & 0xffff) * 15625) >> 10);

		return -ENOSPC;

	}



	return 0;

}



/**

 * drm_mode_addfb - add an FB to the graphics configuration

 * @dev: drm device for the ioctl