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

Commit d30827ce authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm: Make ioctls available for in-kernel clients 



Make ioctl wrappers for functions that will be used by the in-kernel API.
The following functions are touched:
- drm_mode_create_dumb_ioctl()
- drm_mode_destroy_dumb_ioctl()
- drm_mode_addfb()
- drm_mode_rmfb()

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180618141739.48151-4-noralf@tronnes.org
parent 7eeaeb90

drivers/gpu/drm/drm_crtc_internal.h

+15 −4
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ int drm_mode_getresources(struct drm_device *dev, 




/* drm_dumb_buffers.c */

int drm_mode_create_dumb(struct drm_device *dev,

			 struct drm_mode_create_dumb *args,

			 struct drm_file *file_priv);

int drm_mode_destroy_dumb(struct drm_device *dev, u32 handle,

			  struct drm_file *file_priv);



/* IOCTLs */

int drm_mode_create_dumb_ioctl(struct drm_device *dev,

			       void *data, struct drm_file *file_priv);
@@ -166,13 +172,18 @@ int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y, 
				     const struct drm_framebuffer *fb);

void drm_fb_release(struct drm_file *file_priv);



int drm_mode_addfb(struct drm_device *dev, struct drm_mode_fb_cmd *or,

		   struct drm_file *file_priv);

int drm_mode_rmfb(struct drm_device *dev, u32 fb_id,

		  struct drm_file *file_priv);





/* IOCTL */

int drm_mode_addfb(struct drm_device *dev,

int drm_mode_addfb_ioctl(struct drm_device *dev,

			 void *data, struct drm_file *file_priv);

int drm_mode_addfb2(struct drm_device *dev,

		    void *data, struct drm_file *file_priv);

int drm_mode_rmfb(struct drm_device *dev,

int drm_mode_rmfb_ioctl(struct drm_device *dev,

			void *data, struct drm_file *file_priv);

int drm_mode_getfb(struct drm_device *dev,

		   void *data, struct drm_file *file_priv);

drivers/gpu/drm/drm_dumb_buffers.c

+20 −9
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ 
 * a hardware-specific ioctl to allocate suitable buffer objects.

 */



int drm_mode_create_dumb_ioctl(struct drm_device *dev,

			       void *data, struct drm_file *file_priv)

int drm_mode_create_dumb(struct drm_device *dev,

			 struct drm_mode_create_dumb *args,

			 struct drm_file *file_priv)

{

	struct drm_mode_create_dumb *args = data;

	u32 cpp, stride, size;



	if (!dev->driver->dumb_create)
@@ -91,6 +91,12 @@ int drm_mode_create_dumb_ioctl(struct drm_device *dev, 
	return dev->driver->dumb_create(file_priv, dev, args);

}



int drm_mode_create_dumb_ioctl(struct drm_device *dev,

			       void *data, struct drm_file *file_priv)

{

	return drm_mode_create_dumb(dev, data, file_priv);

}



/**

 * drm_mode_mmap_dumb_ioctl - create an mmap offset for a dumb backing storage buffer

 * @dev: DRM device
@@ -122,17 +128,22 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, 
					       &args->offset);

}



int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,

				void *data, struct drm_file *file_priv)

int drm_mode_destroy_dumb(struct drm_device *dev, u32 handle,

			  struct drm_file *file_priv)

{

	struct drm_mode_destroy_dumb *args = data;



	if (!dev->driver->dumb_create)

		return -ENOSYS;



	if (dev->driver->dumb_destroy)

		return dev->driver->dumb_destroy(file_priv, dev, args->handle);

		return dev->driver->dumb_destroy(file_priv, dev, handle);

	else

		return drm_gem_dumb_destroy(file_priv, dev, args->handle);

		return drm_gem_dumb_destroy(file_priv, dev, handle);

}



int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,

				void *data, struct drm_file *file_priv)

{

	struct drm_mode_destroy_dumb *args = data;



	return drm_mode_destroy_dumb(dev, args->handle, file_priv);

}

drivers/gpu/drm/drm_framebuffer.c

+27 −15
Original line number Diff line number Diff line
@@ -95,21 +95,20 @@ int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y, 
/**

 * drm_mode_addfb - add an FB to the graphics configuration

 * @dev: drm device for the ioctl

 * @data: data pointer for the ioctl

 * @file_priv: drm file for the ioctl call

 * @or: pointer to request structure

 * @file_priv: drm file

 *

 * Add a new FB to the specified CRTC, given a user request. This is the

 * original addfb ioctl which only supported RGB formats.

 *

 * Called by the user via ioctl.

 * Called by the user via ioctl, or by an in-kernel client.

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int drm_mode_addfb(struct drm_device *dev,

		   void *data, struct drm_file *file_priv)

int drm_mode_addfb(struct drm_device *dev, struct drm_mode_fb_cmd *or,

		   struct drm_file *file_priv)

{

	struct drm_mode_fb_cmd *or = data;

	struct drm_mode_fb_cmd2 r = {};

	int ret;
@@ -134,6 +133,12 @@ int drm_mode_addfb(struct drm_device *dev, 
	return 0;

}



int drm_mode_addfb_ioctl(struct drm_device *dev,

			 void *data, struct drm_file *file_priv)

{

	return drm_mode_addfb(dev, data, file_priv);

}



static int fb_plane_width(int width,

			  const struct drm_format_info *format, int plane)

{
@@ -367,29 +372,28 @@ static void drm_mode_rmfb_work_fn(struct work_struct *w) 


/**

 * drm_mode_rmfb - remove an FB from the configuration

 * @dev: drm device for the ioctl

 * @data: data pointer for the ioctl

 * @file_priv: drm file for the ioctl call

 * @dev: drm device

 * @fb_id: id of framebuffer to remove

 * @file_priv: drm file

 *

 * Remove the FB specified by the user.

 * Remove the specified FB.

 *

 * Called by the user via ioctl.

 * Called by the user via ioctl, or by an in-kernel client.

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int drm_mode_rmfb(struct drm_device *dev,

		   void *data, struct drm_file *file_priv)

int drm_mode_rmfb(struct drm_device *dev, u32 fb_id,

		  struct drm_file *file_priv)

{

	struct drm_framebuffer *fb = NULL;

	struct drm_framebuffer *fbl = NULL;

	uint32_t *id = data;

	int found = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	fb = drm_framebuffer_lookup(dev, file_priv, *id);

	fb = drm_framebuffer_lookup(dev, file_priv, fb_id);

	if (!fb)

		return -ENOENT;
@@ -435,6 +439,14 @@ int drm_mode_rmfb(struct drm_device *dev, 
	return -ENOENT;

}



int drm_mode_rmfb_ioctl(struct drm_device *dev,

			void *data, struct drm_file *file_priv)

{

	uint32_t *fb_id = data;



	return drm_mode_rmfb(dev, *fb_id, file_priv);

}



/**

 * drm_mode_getfb - get FB info

 * @dev: drm device for the ioctl

drivers/gpu/drm/drm_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -644,9 +644,9 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb_ioctl, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB2, drm_mode_addfb2, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb_ioctl, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl, DRM_UNLOCKED),