Patch "drm: Only use compat ioctl for addfb2 on X86/IA64" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm: Only use compat ioctl for addfb2 on X86/IA64
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-only-use-compat-ioctl-for-addfb2-on-x86-ia64.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
47a66e45d7a7613322549c2475ea9d809baaf514Mon Sep 17 00:00:00 2001
From: "Kristian H. Kristensen" <[email protected]>
Date: Tue, 13 Sep 2016 14:20:45 -0700
Subject: drm: Only use compat ioctl for addfb2 on X86/IA64
From: Kristian H. Kristensen <[email protected]>
commit 47a66e45d7a7613322549c2475ea9d809baaf514 upstream.
Similar to struct drm_update_draw, struct drm_mode_fb_cmd2 has an unaligned 64 bit field (modifier). This get packed differently between 32 bit and 64 bit modes on architectures that can handle unaligned 64 bit access (X86 and IA64). Other architectures pack the structs the same and don't need the compat wrapper. Use the same condition for drm_mode_fb_cmd2 as we use for drm_update_draw.
Note that only the modifier will be packed differently between compat and non-compat versions.
--- drivers/gpu/drm/drm_ioc32.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/drm_ioc32.c +4 -0
@@ -1015,6 +1015,7 @@ static int compat_drm_wait_vblank(structreturn 0 ; } +#if defined(CONFIG_X86) || defined(CONFIG_IA64) typedef struct drm_mode_fb_cmd232 { u32 fb_id; u32 width;
@@ -1071,6 +1072,7 @@ static int compat_drm_mode_addfb2(structreturn 0 ; } +#endif static drm_ioctl_compat_t *drm_compat_ioctls[] = { [DRM_IOCTL_NR (DRM_IOCTL_VERSION32 )] = compat_drm_version,
@@ -1104,7 +1106,9 @@ static drm_ioctl_compat_t *drm_compat_io [DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW32)] = compat_drm_update_draw, #endif [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)] = compat_drm_wait_vblank, +#if defined(CONFIG_X86) || defined(CONFIG_IA64) [DRM_IOCTL_NR(DRM_IOCTL_MODE_ADDFB232)] = compat_drm_mode_addfb2, +#endif }; /**
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/drm-only-use-compat-ioctl-for-addfb2-on-x86-ia64.patch