From patchwork Mon Oct 21 21:45:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 177136 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3977339ill; Mon, 21 Oct 2019 14:45:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpKC417MW5lpVhpO8mUMqwZIDOySW6PlKg5+gxX5B4xOkRgnfNCSxifQfW7UXNDXkp3P7F X-Received: by 2002:a17:902:8a8c:: with SMTP id p12mr168384plo.208.1571694359394; Mon, 21 Oct 2019 14:45:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571694359; cv=none; d=google.com; s=arc-20160816; b=P3HEXzF3vfhVLDI9n3LsRB4C6v2z8KrJTwrxo/hYDTBWOt//0U7d/R1zUXr7vgtg1S l8XqCCuSwO8pHfylom8PsoaYFCQ2gPptIscO9GYoB3hxIb/KGRN0f3K8moWWpDNSGIgX 9DJ0I5xeBPASNmyowgF7gfk9HsUu8n68TMsqaHg23BTKCN0/1pioQ4UCnlAmF0lkrA3S 7GpiukynX/dShulcCRs3ReR6rHHD6DYbP7hb12g8slKN7oRjUApOeO0gspAmLY0NdXIY POVQonmRWeRrKzhb7mH3AQiKn+2hX8ePeP5sx+OxEA05WGtCxSm0csCaDscXII1TiKnR XvAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to; bh=uFqhk0MGGR2tpu6JhceDkXTwBCSx75tnUJ0voN0cok0=; b=eIooFY+IrlPMM377oN+oE7n8e3K/VKr7wIT+d5IPt19Gpufmclm9I6Vb1nWiyw6Jep TwiiK8kAgOQpGJw7OnguTIr7c2Hf/Yp3HcyRD7iMC9SW0uFYDEhPhb8q5refzGkqLyVG KzpXiI8QUvg7PhjqpN77dcUVuVQM7tH11kT6f1Q6uHISnjnxAGsyvIVCn+0KkCbG8McA XrdbJKn++wU4FqCwC4KMA7S89RJuhCKZVydtgrFSqH+Sq7dUJFHceOS+w9KhYdFPBTUG kj/pxWqAVBqUtD2pIkZ4WoWXJMd/Ma84b9j3BM7QN6aeA35QL6ShWq+xWqRYW0304yMu HYQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id 30si15980397plf.333.2019.10.21.14.45.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Oct 2019 14:45:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 35C5F6E279; Mon, 21 Oct 2019 21:45:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by gabe.freedesktop.org (Postfix) with ESMTPS id 83FBF6E277 for ; Mon, 21 Oct 2019 21:45:56 +0000 (UTC) Received: by mail-oi1-f193.google.com with SMTP id w144so12420267oia.6 for ; Mon, 21 Oct 2019 14:45:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nG1jrqiVrLvARMweYNsyPG+j+EFZbDQxRJlgrVpfL4I=; b=tkzu+x32IjRhPjMpr/KbDQMA8Tq45LavPJwpewimcGNI1bYJSWQ96BEJ08p+9cMxvl WRAEuoivZppL4j0KhOqfghgxB+ONUlR8JUkyHbNb8vTH2dRjn44Q0VK8bMnhNIfcDfYN 4AUts7/tTJLkZOuW7Uoea4NVFw5p6+HKiUgeX3RG/+/XVyiHcUiXSp9euqZPgU81tJTM oXNfYfNeirL09kp7QSwUHOF9bhsws+7+IJ23Kxi/72xu62TeL6HrwxVWYBEBJK1+hnsx LidrPZtB371dCkm/40qW4cy+uQ9BT6PdRZlSyULS+T3VhZAlKMOOyqhx8OXXZH2hCKUZ 8Hjg== X-Gm-Message-State: APjAAAVxfNgDRjYHTpKtCG6HZtl1k9r/3btv2cD7pvKY1KQDaO8qui7X 2V0RoRzvdcOCgV3XknJ+j6hdvXY= X-Received: by 2002:aca:40b:: with SMTP id 11mr191900oie.59.1571694355381; Mon, 21 Oct 2019 14:45:55 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id u130sm4122676oib.56.2019.10.21.14.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 14:45:54 -0700 (PDT) From: Rob Herring To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/6] drm/kirin: Use DRM_GEM_CMA_VMAP_DRIVER_OPS Date: Mon, 21 Oct 2019 16:45:45 -0500 Message-Id: <20191021214550.1461-2-robh@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191021214550.1461-1-robh@kernel.org> References: <20191021214550.1461-1-robh@kernel.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , David Airlie , Liviu Dudau , Laurent Pinchart , Yannick Fertre , Kevin Hilman , Xinwei Kong , Xinliang Liu , linux-rockchip@lists.infradead.org, Chen-Yu Tsai , Kieran Bingham , "James \(Qian\) Wang" , Alexandre Torgue , Chen Feng , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Philippe Cornu , Vincent Abriou , Maxime Coquelin , Rongrong Zou Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" drm_gem_cma_dumb_create_internal() is not supposed to be used for .dumb_create directly. drm_gem_cma_dumb_create() should be used instead. If we do that, we might as well convert over to using DRM_GEM_CMA_VMAP_DRIVER_OPS instead. Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Rob Herring --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 73cd28a6ea07..490537a1d035 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -941,16 +941,7 @@ DEFINE_DRM_GEM_CMA_FOPS(ade_fops); static struct drm_driver ade_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &ade_fops, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .dumb_create = drm_gem_cma_dumb_create_internal, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, - .gem_prime_mmap = drm_gem_cma_prime_mmap, + DRM_GEM_CMA_VMAP_DRIVER_OPS, .name = "kirin", .desc = "Hisilicon Kirin620 SoC DRM Driver",