From patchwork Fri Jul 22 13:56:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ole Henrik Jahren X-Patchwork-Id: 999402 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6ME35cW028031 for ; Fri, 22 Jul 2011 14:03:26 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AE0FA027A for ; Fri, 22 Jul 2011 07:03:04 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 22 Jul 2011 14:03:26 +0000 (UTC) X-Greylist: delayed 403 seconds by postgrey-1.31 at gabe; Fri, 22 Jul 2011 07:02:52 PDT Received: from hylle02.itea.ntnu.no (hylle02.itea.ntnu.no [129.241.56.101]) by gabe.freedesktop.org (Postfix) with ESMTP id 47E9AA021D for ; Fri, 22 Jul 2011 07:02:52 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by hylle02.itea.ntnu.no (Postfix) with ESMTP id 878952C03B; Fri, 22 Jul 2011 15:56:05 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle02.itea.ntnu.no Received: from kontakt.itea.ntnu.no (kontakt.itea.ntnu.no [129.241.18.25]) by hylle02.itea.ntnu.no (Postfix) with ESMTP id 362182C09D; Fri, 22 Jul 2011 15:56:05 +0200 (CEST) Received: from siv.localdomain (ti0025a380-dhcp0033.bb.online.no [83.108.96.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: olehenja) by kontakt.itea.ntnu.no (Postfix) with ESMTPSA id 211054A0959; Fri, 22 Jul 2011 15:56:05 +0200 (CEST) Received: by siv.localdomain (Postfix, from userid 1000) id 0F87760190A; Fri, 22 Jul 2011 15:56:01 +0200 (CEST) Date: Fri, 22 Jul 2011 15:56:01 +0200 From: Ole Henrik Jahren To: keithp@keithp.com Subject: [PATCH] drm/i915: Fix typo in DRM_I915_OVERLAY_PUT_IMAGE ioctl define Message-ID: <20110722135601.GA17512@siv.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org 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 Acked-by: Daniel Vetter --- include/drm/i915_drm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index c4d6dbf..28c0d11 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -237,7 +237,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