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

Commit 770179d5 authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie
Browse files

gma500: Rename the ioctls to avoid clashing with the legacy drivers 



Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 61bedf70

drivers/gpu/drm/gma500/gem.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -274,13 +274,13 @@ int psb_gem_create_ioctl(struct drm_device *dev, void *data, 
{

{

	struct drm_psb_gem_create *args = data;

	struct drm_psb_gem_create *args = data;

	int ret;

	int ret;

	if (args->flags & PSB_GEM_CREATE_STOLEN) {

	if (args->flags & GMA_GEM_CREATE_STOLEN) {

		ret = psb_gem_create_stolen(file, dev, args->size,

		ret = psb_gem_create_stolen(file, dev, args->size,

							&args->handle);

							&args->handle);

		if (ret == 0)

		if (ret == 0)

			return 0;

			return 0;

		/* Fall throguh */

		/* Fall throguh */

		args->flags &= ~PSB_GEM_CREATE_STOLEN;

		args->flags &= ~GMA_GEM_CREATE_STOLEN;

	}

	}

	return psb_gem_create(file, dev, args->size, &args->handle);

	return psb_gem_create(file, dev, args->size, &args->handle);

}

}

drivers/gpu/drm/gma500/psb_drm.h

+10 −10
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ struct drm_psb_gem_create { 
	__u64 size;

	__u64 size;

	__u32 handle;

	__u32 handle;

	__u32 flags;

	__u32 flags;

#define PSB_GEM_CREATE_STOLEN		1	/* Stolen memory can be used */

#define GMA_GEM_CREATE_STOLEN		1	/* Stolen memory can be used */

};

};





struct drm_psb_gem_mmap {

struct drm_psb_gem_mmap {
@@ -79,15 +79,15 @@ struct drm_psb_gem_mmap { 




/* Controlling the kernel modesetting buffers */

/* Controlling the kernel modesetting buffers */





#define DRM_PSB_GEM_CREATE	0x00		/* Create a GEM object */

#define DRM_GMA_GEM_CREATE	0x00		/* Create a GEM object */

#define DRM_PSB_GEM_MMAP	0x01		/* Map GEM memory */

#define DRM_GMA_GEM_MMAP	0x01		/* Map GEM memory */

#define DRM_PSB_STOLEN_MEMORY	0x02		/* Report stolen memory */

#define DRM_GMA_STOLEN_MEMORY	0x02		/* Report stolen memory */

#define DRM_PSB_2D_OP		0x03		/* Will be merged later */

#define DRM_GMA_2D_OP		0x03		/* Will be merged later */

#define DRM_PSB_GAMMA		0x04		/* Set gamma table */

#define DRM_GMA_GAMMA		0x04		/* Set gamma table */

#define DRM_PSB_ADB		0x05		/* Get backlight */

#define DRM_GMA_ADB		0x05		/* Get backlight */

#define DRM_PSB_DPST_BL		0x06		/* Set backlight */

#define DRM_GMA_DPST_BL		0x06		/* Set backlight */

#define DRM_PSB_GET_PIPE_FROM_CRTC_ID 0x1	/* CRTC to physical pipe# */

#define DRM_GMA_GET_PIPE_FROM_CRTC_ID 0x1	/* CRTC to physical pipe# */

#define DRM_PSB_MODE_OPERATION	0x07		/* Mode validation/DC set */

#define DRM_GMA_MODE_OPERATION	0x07		/* Mode validation/DC set */

#define 	PSB_MODE_OPERATION_MODE_VALID	0x01

#define 	PSB_MODE_OPERATION_MODE_VALID	0x01

drivers/gpu/drm/gma500/psb_drv.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -81,27 +81,27 @@ MODULE_DEVICE_TABLE(pci, pciidlist); 
 */

 */





#define DRM_IOCTL_PSB_ADB	\

#define DRM_IOCTL_PSB_ADB	\

		DRM_IOWR(DRM_PSB_ADB + DRM_COMMAND_BASE, uint32_t)

		DRM_IOWR(DRM_GMA_ADB + DRM_COMMAND_BASE, uint32_t)

#define DRM_IOCTL_PSB_MODE_OPERATION	\

#define DRM_IOCTL_PSB_MODE_OPERATION	\

		DRM_IOWR(DRM_PSB_MODE_OPERATION + DRM_COMMAND_BASE, \

		DRM_IOWR(DRM_GMA_MODE_OPERATION + DRM_COMMAND_BASE, \

			 struct drm_psb_mode_operation_arg)

			 struct drm_psb_mode_operation_arg)

#define DRM_IOCTL_PSB_STOLEN_MEMORY	\

#define DRM_IOCTL_PSB_STOLEN_MEMORY	\

		DRM_IOWR(DRM_PSB_STOLEN_MEMORY + DRM_COMMAND_BASE, \

		DRM_IOWR(DRM_GMA_STOLEN_MEMORY + DRM_COMMAND_BASE, \

			 struct drm_psb_stolen_memory_arg)

			 struct drm_psb_stolen_memory_arg)

#define DRM_IOCTL_PSB_GAMMA	\

#define DRM_IOCTL_PSB_GAMMA	\

		DRM_IOWR(DRM_PSB_GAMMA + DRM_COMMAND_BASE, \

		DRM_IOWR(DRM_GMA_GAMMA + DRM_COMMAND_BASE, \

			 struct drm_psb_dpst_lut_arg)

			 struct drm_psb_dpst_lut_arg)

#define DRM_IOCTL_PSB_DPST_BL	\

#define DRM_IOCTL_PSB_DPST_BL	\

		DRM_IOWR(DRM_PSB_DPST_BL + DRM_COMMAND_BASE, \

		DRM_IOWR(DRM_GMA_DPST_BL + DRM_COMMAND_BASE, \

			 uint32_t)

			 uint32_t)

#define DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID	\

#define DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID	\

		DRM_IOWR(DRM_PSB_GET_PIPE_FROM_CRTC_ID + DRM_COMMAND_BASE, \

		DRM_IOWR(DRM_GMA_GET_PIPE_FROM_CRTC_ID + DRM_COMMAND_BASE, \

			 struct drm_psb_get_pipe_from_crtc_id_arg)

			 struct drm_psb_get_pipe_from_crtc_id_arg)

#define DRM_IOCTL_PSB_GEM_CREATE	\

#define DRM_IOCTL_PSB_GEM_CREATE	\

		DRM_IOWR(DRM_PSB_GEM_CREATE + DRM_COMMAND_BASE, \

		DRM_IOWR(DRM_GMA_GEM_CREATE + DRM_COMMAND_BASE, \

			 struct drm_psb_gem_create)

			 struct drm_psb_gem_create)

#define DRM_IOCTL_PSB_GEM_MMAP	\

#define DRM_IOCTL_PSB_GEM_MMAP	\

		DRM_IOWR(DRM_PSB_GEM_MMAP + DRM_COMMAND_BASE, \

		DRM_IOWR(DRM_GMA_GEM_MMAP + DRM_COMMAND_BASE, \

			 struct drm_psb_gem_mmap)

			 struct drm_psb_gem_mmap)





static int psb_adb_ioctl(struct drm_device *dev, void *data,

static int psb_adb_ioctl(struct drm_device *dev, void *data,