diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-05 11:29:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-05 11:29:50 -0700 |
| commit | 28a0674a4c306c7702fb79bc55f3cce2af23b2d1 (patch) | |
| tree | edeb5ddc3700bceebc1f02233260c9fd1b91e47d | |
| parent | 82385d783046e9842a33038ea2079fb6c29c1aef (diff) | |
| download | longterm-queue-2.6.33-28a0674a4c306c7702fb79bc55f3cce2af23b2d1.tar.gz | |
.33 patches
| -rw-r--r-- | queue-2.6.33/drm-i915-fix-typo-in-drm_i915_overlay_put_image-ioctl.patch | 37 | ||||
| -rw-r--r-- | queue-2.6.33/series | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/queue-2.6.33/drm-i915-fix-typo-in-drm_i915_overlay_put_image-ioctl.patch b/queue-2.6.33/drm-i915-fix-typo-in-drm_i915_overlay_put_image-ioctl.patch new file mode 100644 index 0000000..e230a0f --- /dev/null +++ b/queue-2.6.33/drm-i915-fix-typo-in-drm_i915_overlay_put_image-ioctl.patch @@ -0,0 +1,37 @@ +From 842d452985300f4ec14c68cb86046e8a1a3b7251 Mon Sep 17 00:00:00 2001 +From: Ole Henrik Jahren <olehenja@alumni.ntnu.no> +Date: Fri, 22 Jul 2011 15:56:01 +0200 +Subject: drm/i915: Fix typo in DRM_I915_OVERLAY_PUT_IMAGE ioctl + define + +From: Ole Henrik Jahren <olehenja@alumni.ntnu.no> + +commit 842d452985300f4ec14c68cb86046e8a1a3b7251 upstream. + +Because of a typo, calling ioctl with DRM_IOCTL_I915_OVERLAY_PUT_IMAGE +is broken if the macro is used directly. When using libdrm the bug is +not hit, since libdrm handles the ioctl encoding internally. + +The typo also leads to the .cmd and .cmd_drv fields of the drm_ioctl +structure for DRM_I915_OVERLAY_PUT_IMAGE having inconsistent content. + +Signed-off-by: Ole Henrik Jahren <olehenja@alumni.ntnu.no> +Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> +Signed-off-by: Keith Packard <keithp@keithp.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + include/drm/i915_drm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/drm/i915_drm.h ++++ b/include/drm/i915_drm.h +@@ -227,7 +227,7 @@ typedef struct _drm_i915_sarea { + #define DRM_IOCTL_I915_GEM_GET_APERTURE DRM_IOR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture) + #define DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_PIPE_FROM_CRTC_ID, struct drm_i915_get_pipe_from_crtc_id) + #define DRM_IOCTL_I915_GEM_MADVISE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MADVISE, struct drm_i915_gem_madvise) +-#define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE DRM_IOW(DRM_COMMAND_BASE + DRM_IOCTL_I915_OVERLAY_ATTRS, struct drm_intel_overlay_put_image) ++#define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image) + #define DRM_IOCTL_I915_OVERLAY_ATTRS DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs) + + /* Allow drivers to submit batchbuffers directly to hardware, relying diff --git a/queue-2.6.33/series b/queue-2.6.33/series index 8cbd1d6..e7b86ec 100644 --- a/queue-2.6.33/series +++ b/queue-2.6.33/series @@ -47,3 +47,4 @@ proc-restrict-access-to-proc-pid-io.patch alsa-sound-core-pcm_compat.c-adjust-array-index.patch dm-mpath-fix-potential-null-pointer-in-feature-arg.patch dm-fix-idr-leak-on-module-removal.patch +drm-i915-fix-typo-in-drm_i915_overlay_put_image-ioctl.patch |