From patchwork Tue Jun 23 09:37:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6659341 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 084E69F399 for ; Tue, 23 Jun 2015 09:34:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E5E82065F for ; Tue, 23 Jun 2015 09:34:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 901A52065A for ; Tue, 23 Jun 2015 09:34:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 20C9E7A0E1; Tue, 23 Jun 2015 02:34:29 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F3DB6E369 for ; Tue, 23 Jun 2015 02:34:27 -0700 (PDT) Received: by wicnd19 with SMTP id nd19so100102668wic.1 for ; Tue, 23 Jun 2015 02:34:26 -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=w76+N1VDrdJyoZVVMPwh5DrnuOdVzgppgJYFLtFyGVw=; b=bJHx5QsYY83k9saf4YCREa3pZNv0kG7ysqjDJADqg4wIdh6JDw1OOFG/sbcCBIIBTm ZWkakWWWl/CuAmoNuM0Yf75vtbkpCrptMmfg9XCvWwUYyejEAuWJ8IhSgvHlu5I+4BOs Hfz7m/NAalTvxcib1GkJ0fkV5F63/PLvIwJ5o= 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=w76+N1VDrdJyoZVVMPwh5DrnuOdVzgppgJYFLtFyGVw=; b=Fm9A0WkBqxb+6lN72KQlUw8Nn8xQYQVCywurW9ojH1mFzHLiTYmtZ9I8f97w+NVry8 YO8M3upL9kaViBCxfFwY+7H4OhhbnqiG3+xkL0QRTksUzU/047NWA1AdyGvzJ6wGjfFh qc9SPiFIwv1MwYbjNclzyXqXSQF8gtu2uAaEBCEQqFgRHbAkDg+5Mgt5Xhr9GvZEj6f5 cHj9lGG1e/urNZFHNvNuhqBaIEyVpPTZtTLp5wrBDg9awbo3KoTAl1lE3DqpGOw2YjK/ iQxb1SdoCxi4b0UjuTf548SlB19HGpKrnF7FyCWP/s851tnbUbJnxPNXE0w05qkF/wAR TrIA== X-Gm-Message-State: ALoCoQlq1829mjCWBSlHqQQ//R/h69HmV41hOxWuGrgqsXEiF1WeWtHN1JBFrjiY9iYoyQlii91M X-Received: by 10.180.95.101 with SMTP id dj5mr1776433wib.16.1435052066817; Tue, 23 Jun 2015 02:34:26 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id n10sm4225902wiz.19.2015.06.23.02.34.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jun 2015 02:34:26 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/3] drm: Convert drm_legacy_ctxbitmap_init to void return type Date: Tue, 23 Jun 2015 11:37:07 +0200 Message-Id: <1435052228-29710-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435052228-29710-1-git-send-email-daniel.vetter@ffwll.ch> References: <1435052228-29710-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Peter Antoine , 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 It can't fail really. Also remove the redundant kms check Peter added. Cc: Peter Antoine Signed-off-by: Daniel Vetter Reviewed-by: Peter Antoine --- drivers/gpu/drm/drm_context.c | 5 ++--- drivers/gpu/drm/drm_drv.c | 10 +--------- drivers/gpu/drm/drm_legacy.h | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index 32958dabd7b0..192a5f9eeb74 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c @@ -89,14 +89,13 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev) * * Initialise the drm_device::ctx_idr */ -int drm_legacy_ctxbitmap_init(struct drm_device * dev) +void drm_legacy_ctxbitmap_init(struct drm_device * dev) { if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && drm_core_check_feature(dev, DRIVER_MODESET)) - return -EINVAL; + return; idr_init(&dev->ctx_idr); - return 0; } /** diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index e5717116346d..ddc4943404c6 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -584,14 +584,7 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver, if (drm_ht_create(&dev->map_hash, 12)) goto err_minors; - if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) || - !drm_core_check_feature(dev, DRIVER_MODESET)) - ret = drm_legacy_ctxbitmap_init(dev); - if (ret) { - DRM_ERROR( - "Cannot allocate memory for context bitmap.\n"); - goto err_ht; - } + drm_legacy_ctxbitmap_init(dev); if (drm_core_check_feature(dev, DRIVER_GEM)) { ret = drm_gem_init(dev); @@ -605,7 +598,6 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver, err_ctxbitmap: drm_legacy_ctxbitmap_cleanup(dev); -err_ht: drm_ht_remove(&dev->map_hash); err_minors: drm_minor_free(dev, DRM_MINOR_LEGACY); diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h index c1dc61473db5..9b731786e4db 100644 --- a/drivers/gpu/drm/drm_legacy.h +++ b/drivers/gpu/drm/drm_legacy.h @@ -42,7 +42,7 @@ struct drm_file; #define DRM_KERNEL_CONTEXT 0 #define DRM_RESERVED_CONTEXTS 1 -int drm_legacy_ctxbitmap_init(struct drm_device *dev); +void drm_legacy_ctxbitmap_init(struct drm_device *dev); void drm_legacy_ctxbitmap_cleanup(struct drm_device *dev); void drm_legacy_ctxbitmap_free(struct drm_device *dev, int ctx_handle); void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file);