Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1657064imu; Thu, 10 Jan 2019 00:19:51 -0800 (PST) X-Google-Smtp-Source: ALg8bN49iPmlKP3WOYr0IhM4CjFirWVfkSdKqKXLn0hkF22ZkERy3TrndEutdRuNOLDOEW/skH5/ X-Received: by 2002:a62:5486:: with SMTP id i128mr9034269pfb.215.1547108391415; Thu, 10 Jan 2019 00:19:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547108391; cv=none; d=google.com; s=arc-20160816; b=hLp8JjHYmMf0xDZxeaMgcWPJ/UdeO/x6hzsyElXqxRgfvcBKD8pKupnSN1gzzZavE0 T6kUTrKZsJpC2ECZ6kLmKq84HoL6m//Kj9MwasRD3eK9CdWX7Dz+mbNL0pZBDKEMajOL Iy5g0HiZlGExJQJHbbw9OoBvB1ulfyIykagcOqeOQedp1q9xSOVO/YkIDN6vbDNhxyuX h8Ou7p2oL+q25Uhoso4wWqklcsAa6Q/jRREXboVpIxKXB8KzRVaVh8K9K7xDIHnPlJN/ dr57rQ1MuGGNWsh0+I0ep00/TRIDaPNkrtZTDIOmTIIOCkXXwvX/L/VdQ43vbiu2hds0 MVTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=2f2XMEqXnuXDUp2JQA8C7SuLhaopRKY5hiydfztQtlY=; b=IkvU8+IZ5XXfOzChlG8BWM0iD9+cjaGW80NDvOJ/Jfb7ESuysbu1DnANrZJaD2UA93 OUX/Zvz7qh0mhS6xs2szcZl9U3ouNrS2/rbaxQNExNJwuH0mXujwiywop12zyOvOBZq8 vzRTp+f3Zb/v2LxuKI89suhAzG5ixeT5/2onETiL3T2nOGG8ubz+E5G9PSMz8jZbxprR XiOhW/bNoip1SK9PLPych8j9dWCghH+eTK5LfF3VSl+pE8atGVa6+BgDeSLXCZMh5LHl JbkKvQqdnSY0pqIda63lq88Md34Ve1WkGTXExp+oKT8aVt5c5O2W8zKPtCPzSxN3wBkk gO/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n4si14675713pgv.512.2019.01.10.00.19.36; Thu, 10 Jan 2019 00:19:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727675AbfAJIRy (ORCPT + 99 others); Thu, 10 Jan 2019 03:17:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45080 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727551AbfAJIRy (ORCPT ); Thu, 10 Jan 2019 03:17:54 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3393B7A19B; Thu, 10 Jan 2019 08:17:54 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-203.ams2.redhat.com [10.36.116.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id C39B95C224; Thu, 10 Jan 2019 08:17:51 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F017116E03; Thu, 10 Jan 2019 09:17:50 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , Dave Airlie , David Airlie , virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR QXL VIRTUAL GPU), spice-devel@lists.freedesktop.org (open list:DRM DRIVER FOR QXL VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/qxl: drop prime import/export callbacks Date: Thu, 10 Jan 2019 09:17:50 +0100 Message-Id: <20190110081750.11358-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 10 Jan 2019 08:17:54 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Also set prime_handle_to_fd and prime_fd_to_handle to NULL, so drm will not advertive DRM_PRIME_CAP_{IMPORT,EXPORT} to userspace. Signed-off-by: Gerd Hoffmann --- drivers/gpu/drm/qxl/qxl_drv.c | 4 ---- drivers/gpu/drm/qxl/qxl_prime.c | 14 -------------- 2 files changed, 18 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 13c8a662f9..ccb090f3ab 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -250,14 +250,10 @@ static struct drm_driver qxl_driver = { #if defined(CONFIG_DEBUG_FS) .debugfs_init = qxl_debugfs_init, #endif - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_export = drm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, .gem_prime_pin = qxl_gem_prime_pin, .gem_prime_unpin = qxl_gem_prime_unpin, - .gem_prime_get_sg_table = qxl_gem_prime_get_sg_table, - .gem_prime_import_sg_table = qxl_gem_prime_import_sg_table, .gem_prime_vmap = qxl_gem_prime_vmap, .gem_prime_vunmap = qxl_gem_prime_vunmap, .gem_prime_mmap = qxl_gem_prime_mmap, diff --git a/drivers/gpu/drm/qxl/qxl_prime.c b/drivers/gpu/drm/qxl/qxl_prime.c index a55dece118..df65d3c1a7 100644 --- a/drivers/gpu/drm/qxl/qxl_prime.c +++ b/drivers/gpu/drm/qxl/qxl_prime.c @@ -38,20 +38,6 @@ void qxl_gem_prime_unpin(struct drm_gem_object *obj) WARN_ONCE(1, "not implemented"); } -struct sg_table *qxl_gem_prime_get_sg_table(struct drm_gem_object *obj) -{ - WARN_ONCE(1, "not implemented"); - return ERR_PTR(-ENOSYS); -} - -struct drm_gem_object *qxl_gem_prime_import_sg_table( - struct drm_device *dev, struct dma_buf_attachment *attach, - struct sg_table *table) -{ - WARN_ONCE(1, "not implemented"); - return ERR_PTR(-ENOSYS); -} - void *qxl_gem_prime_vmap(struct drm_gem_object *obj) { WARN_ONCE(1, "not implemented"); -- 2.9.3