From patchwork Wed Dec 7 13:13:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9464453 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 56D1A60236 for ; Wed, 7 Dec 2016 13:13:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52E1E283E9 for ; Wed, 7 Dec 2016 13:13:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47B07284D0; Wed, 7 Dec 2016 13:13:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11F18283E9 for ; Wed, 7 Dec 2016 13:13:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C1766E57D; Wed, 7 Dec 2016 13:13:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8D996E579 for ; Wed, 7 Dec 2016 13:13:21 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id m203so27751293wma.3 for ; Wed, 07 Dec 2016 05:13:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Uq1FDEHaaIwMeuW3RSy+heXJJUH95G8GK0k/rSRBK1w=; b=SkieJ3QW1L7/tM2G6NgOh4xydwYpR3PhRBrFbAMqrXsWCvYSdX3yGUkXRKPEKCkn4N vzeNgQHfdlCv7gNyeMeqh1E8LVQz6wkgwd7v0eL9j+gltSWjt/5m9tovEcfF6H8xFBH1 lyFXzYQJ8PePjquQErhevsceyCfOYs7l++U5w= 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:mime-version :content-transfer-encoding; bh=Uq1FDEHaaIwMeuW3RSy+heXJJUH95G8GK0k/rSRBK1w=; b=T26ftyk7XmXur6d8wtoi8Omfm17Z7ZeZXKQzVXRxIQ28+qFHduD80EmMOXg410iuII Dns2eXunSgaXHlCZQDQB3yS9O/ve9rdCohe7jq9+IaQLVUvW/VinsIpY0unA2qOdYWcd 8UyxfH/03xLKMM/zIFCOZ7W/MusHOuv88ILItEnUQ57oChvwKNRzi7yKv4hwZFlMycpO b1gc5gJpFO3VZmSwJePHBH/epBGpYb4tkQCh9314oGk0MnNQJH+LDjaSuX6KpN568Ict zkWZ9v0ehXg09ZvnosvfWU1YRUbeTStdn6EkLmSjHHPkdxzP63TKoaMvenW5eIBuc5xG CX3g== X-Gm-Message-State: AKaTC03NEXompzg06mqSuBJ3eXRvLr0/aPwoKJ5fxVCYSaE3lRzEg1iz9ggPfL3FbtXyEA== X-Received: by 10.28.107.77 with SMTP id g74mr2503476wmc.109.1481116400112; Wed, 07 Dec 2016 05:13:20 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id ab10sm31291566wjc.45.2016.12.07.05.13.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2016 05:13:19 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm: Allow CAP_PRIME on !MODESET Date: Wed, 7 Dec 2016 14:13:23 +0100 Message-Id: <20161207131323.12836-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.10.2 MIME-Version: 1.0 Cc: Daniel Vetter , Intel Graphics Development , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Alex Deucher , Daniel Vetter 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP vgem (and our igt tests using vgem) need this. I suspect etnaviv will fare similarly. Fixes: d5264ed3823a ("drm: Return -ENOTSUPP when called for KMS cap with a non-KMS driver") Cc: Michel Dänzer Cc: Alex Deucher Cc: Chris Wilson Signed-off-by: Daniel Vetter Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/drm_ioctl.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 0a900bd4575d..60bf95644739 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -234,10 +234,15 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ req->value = 0; - /* Only one cap makes sense with a UMS driver: */ - if (req->capability == DRM_CAP_TIMESTAMP_MONOTONIC) { + /* Only some caps make sense with UMS/render-only drivers. */ + switch (req->capability) ) { + case DRM_CAP_TIMESTAMP_MONOTONIC: req->value = drm_timestamp_monotonic; return 0; + case DRM_CAP_PRIME: + req->value |= dev->driver->prime_fd_to_handle ? DRM_PRIME_CAP_IMPORT : 0; + req->value |= dev->driver->prime_handle_to_fd ? DRM_PRIME_CAP_EXPORT : 0; + return 0; } /* Other caps only work with KMS drivers */ @@ -258,10 +263,6 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ case DRM_CAP_DUMB_PREFER_SHADOW: req->value = dev->mode_config.prefer_shadow; break; - case DRM_CAP_PRIME: - req->value |= dev->driver->prime_fd_to_handle ? DRM_PRIME_CAP_IMPORT : 0; - req->value |= dev->driver->prime_handle_to_fd ? DRM_PRIME_CAP_EXPORT : 0; - break; case DRM_CAP_ASYNC_PAGE_FLIP: req->value = dev->mode_config.async_page_flip; break;