From patchwork Wed Sep 29 15:47:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 217632 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8TFras6018739 for ; Wed, 29 Sep 2010 15:53:57 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 181819EB26 for ; Wed, 29 Sep 2010 08:53:36 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.187]) by gabe.freedesktop.org (Postfix) with ESMTP id C15599EB26 for ; Wed, 29 Sep 2010 08:53:26 -0700 (PDT) Received: from localhost.localdomain (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0Lxdlr-1OgQmt0x0F-0176iq; Wed, 29 Sep 2010 17:48:04 +0200 From: Arnd Bergmann To: Dave Airlie Subject: [PATCH 1/2] drm: i810/i830: fix locked ioctl variant Date: Wed, 29 Sep 2010 17:47:58 +0200 Message-Id: <1285775279-31123-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1285775279-31123-1-git-send-email-arnd@arndb.de> References: <1285775279-31123-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:ncO5qflcaD/VlRKIwXxfPTRpZonW+3eJPpsJOBSv8hS JsiM52CzcY9EbA0zPaeoxw4G0FHGvBhG8a1MghnCUbj4bDX8aL gRxqaFB+nPgTzyAxPg9sIHWEfbOmsjWqJjnyRdcbH612l86v0b PMM+3/hTQrWpgR1gQeXsqHVEicITYmY7PEzz2/HJzUlUQWcdRl FudHQqt0acLpopJk8fyrA== Cc: Arnd Bergmann , DRI mailing list 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: , MIME-Version: 1.0 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 29 Sep 2010 15:53:57 +0000 (UTC) diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index 00f1bda..ff33e53 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -116,7 +116,7 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) static const struct file_operations i810_buffer_fops = { .open = drm_open, .release = drm_release, - .unlocked_ioctl = drm_ioctl, + .unlocked_ioctl = i810_ioctl, .mmap = i810_mmap_buffers, .fasync = drm_fasync, .llseek = noop_llseek, diff --git a/drivers/gpu/drm/i830/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c index 5c6eb65..ca6f31f 100644 --- a/drivers/gpu/drm/i830/i830_dma.c +++ b/drivers/gpu/drm/i830/i830_dma.c @@ -118,7 +118,7 @@ static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) static const struct file_operations i830_buffer_fops = { .open = drm_open, .release = drm_release, - .unlocked_ioctl = drm_ioctl, + .unlocked_ioctl = i830_ioctl, .mmap = i830_mmap_buffers, .fasync = drm_fasync, .llseek = noop_llseek,