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

Commit 09e40d65 authored by David Miller's avatar David Miller Committed by Dave Airlie
Browse files

drm: Only use DRM_IOCTL_UPDATE_DRAW compat wrapper for compat X86. 



Only X86 32-bit uses a different alignment for "unsigned long long"
than it's 64-bit counterpart.

Therefore this compat translation is only correct, and only needed,
when either CONFIG_X86 or CONFIG_IA64.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 958a6f8c

drivers/gpu/drm/drm_ioc32.c

+4 −0
Original line number Diff line number Diff line
@@ -954,6 +954,7 @@ static int compat_drm_sg_free(struct file *file, unsigned int cmd, 
			 DRM_IOCTL_SG_FREE, (unsigned long)request);

}



#if defined(CONFIG_X86) || defined(CONFIG_IA64)

typedef struct drm_update_draw32 {

	drm_drawable_t handle;

	unsigned int type;
@@ -984,6 +985,7 @@ static int compat_drm_update_draw(struct file *file, unsigned int cmd, 
			DRM_IOCTL_UPDATE_DRAW, (unsigned long)request);

	return err;

}

#endif



struct drm_wait_vblank_request32 {

	enum drm_vblank_seq_type type;
@@ -1066,7 +1068,9 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = { 
#endif

	[DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC32)] = compat_drm_sg_alloc,

	[DRM_IOCTL_NR(DRM_IOCTL_SG_FREE32)] = compat_drm_sg_free,

#if defined(CONFIG_X86) || defined(CONFIG_IA64)

	[DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW32)] = compat_drm_update_draw,

#endif

	[DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)] = compat_drm_wait_vblank,

};