From patchwork Tue Apr 26 17:30:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8941691 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 727989F1C1 for ; Tue, 26 Apr 2016 17:32:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E55A20219 for ; Tue, 26 Apr 2016 17:32:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D0ACF201EC for ; Tue, 26 Apr 2016 17:32:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1B7A6E8B3; Tue, 26 Apr 2016 17:31:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x229.google.com (mail-wm0-x229.google.com [IPv6:2a00:1450:400c:c09::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id C2D356E8E4 for ; Tue, 26 Apr 2016 17:30:59 +0000 (UTC) Received: by mail-wm0-x229.google.com with SMTP id e201so5640716wme.0 for ; Tue, 26 Apr 2016 10:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/M14fE6kvcC9z8saFMFf7e2lyD0XYGUX4chpZDgAH7U=; b=PRttzFBdHLgrMgw3mawV8/aukmSdCj5oFC1ATYrVlaO0EjomvXPGEkRnlsm+gUaq5+ O6ABLrsd17/5JHSkJFksdHzwO3ubl0EewDSbkotVqCpKArYqJjEfkaFZw6+BosKleZuW XQ2A9FVBOnW3kr7bKmqKyC8MtidGYZhoSUbtc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/M14fE6kvcC9z8saFMFf7e2lyD0XYGUX4chpZDgAH7U=; b=Qom4MjpxKYX2kXKhvzYu/zCwvxMBdriUc6pDC1XFY/S6O7InCxji2UFeivul5JUpoJ uakj4j04bW7ypZy6dDGcjTUCReS3PRajFyKN5VG0Tp4zGvBZKdT8h6Tybbe7XVZsezo0 e8wY81mGIQa+AQ04p5moUAEEoLSeDRHJSS+KdLaZ9bMd+jXz2SJNY3aEOdd1N7A03Gec P5KvesxtIThZbdh/vJRvb7jXi31X+pSST+yIYbKNNmMPvAQ8XTwR0UwTF/bYu7sfwS9S apBcR4evDNMik3Cb5FL2CSGDCHmTjGels/18Ng+CEpu0GA1eU1GWLzCK2FmLCbotJNwr G9Rw== X-Gm-Message-State: AOPr4FVx0Mbtn9/ZMeKYDWYyHwce9GJ4Ni8oNFpok7bQ5xSl/e8dswZUGNJCESYgqhd+Mg== X-Received: by 10.194.111.229 with SMTP id il5mr4966748wjb.82.1461691857427; Tue, 26 Apr 2016 10:30:57 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id wr2sm29928678wjc.49.2016.04.26.10.30.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 10:30:56 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 35/35] drm/rockchip: Use cma gem vm ops Date: Tue, 26 Apr 2016 19:30:08 +0200 Message-Id: <1461691808-12414-36-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461691808-12414-1-git-send-email-daniel.vetter@ffwll.ch> References: <1461691808-12414-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No need to reinvent this little wheel. Cc: Mark Yao Signed-off-by: Daniel Vetter --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 903202224057..4484d5a53d89 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -292,11 +292,6 @@ static const struct file_operations rockchip_drm_driver_fops = { .release = drm_release, }; -const struct vm_operations_struct rockchip_drm_vm_ops = { - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; - static struct drm_driver rockchip_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, @@ -307,7 +302,7 @@ static struct drm_driver rockchip_drm_driver = { .get_vblank_counter = drm_vblank_no_hw_counter, .enable_vblank = rockchip_drm_crtc_enable_vblank, .disable_vblank = rockchip_drm_crtc_disable_vblank, - .gem_vm_ops = &rockchip_drm_vm_ops, + .gem_vm_ops = &drm_gem_cma_vm_ops, .gem_free_object_unlocked = rockchip_gem_free_object, .dumb_create = rockchip_gem_dumb_create, .dumb_map_offset = rockchip_gem_dumb_map_offset,