From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C817AC43331 for ; Fri, 3 Apr 2020 13:59:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FB582077D for ; Fri, 3 Apr 2020 13:59:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="SyctG0Rr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FB582077D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B3BD6EBAD; Fri, 3 Apr 2020 13:58:50 +0000 (UTC) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB8266EBA8 for ; Fri, 3 Apr 2020 13:58:48 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id g3so6352561wrx.2 for ; Fri, 03 Apr 2020 06:58:48 -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 :mime-version:content-transfer-encoding; bh=T0NPd3SzuNReso4uwRwGCbVcCc2DoA/jfFyOSK8g0uQ=; b=SyctG0RrNPpin6d2cjD+pO6Tau9N10S8YUnDqjhexo1UoRPYqvFyrKQN7h/Q6xFFqX eyKkuq2+O3sqyaLVTylmASLcO2Rw9tnUy9Mhq069FcBEwC6zTNJ0wd9tW4W1aq1x/ZVJ x2gsmX6Q4gaPhT90HVr+6TyrT66XC1ZJ/36l4= 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=T0NPd3SzuNReso4uwRwGCbVcCc2DoA/jfFyOSK8g0uQ=; b=KtIDT5D5pFAk6MHcKZlPmd8l6/yuZYVxdvX0nhj9XfIh8klMbJoUYuxbTDfIKckrgH ph9g1b2Br+m/jthLIWughUYXxx2Sz6d/G9N5a4v4yRMnm50o0dhivi1sirvHDINsDwdL xv6EVMO5Dp/h1wDpXhswEgjR/8LC1z/dyiIz3uqjy7hTb6CSzEs9fPVxTaN3yhb6BOVt Gn1JScLDp3/JXIWUYHu8vQC+yHTPlSSgLZQjr4HPzdCJXBoGP3B+fGADMLNOyBr0MzVA SINQSlhp4oA12BZA+1Gyq5M7q9nX2lDYgadx3r/Sifz3qpBYIaDJxHZajpehybKpVBXM Japw== X-Gm-Message-State: AGi0PuaJjxYdfoX907ZdCGsgWqjSIVn5ezzE7hK6F1wnr9MA/9Z3yc1K EE3VYHIRJQvqFWKTjd+tBLedQXzK8+5sAA== X-Google-Smtp-Source: APiQypKDZU+w3+1PTup549ZefqFINetxcvhTGcvlsul/S/Ar0g1P3Hpvzgkl9oy4CA5OT7DurxzyEA== X-Received: by 2002:adf:f58c:: with SMTP id f12mr9751975wro.207.1585922327239; Fri, 03 Apr 2020 06:58:47 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id f141sm11783919wmf.3.2020.04.03.06.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 06:58:46 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 10/44] drm/vboxvideo: Use devm_gen_pool_create Date: Fri, 3 Apr 2020 15:57:54 +0200 Message-Id: <20200403135828.2542770-11-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200403135828.2542770-1-daniel.vetter@ffwll.ch> References: <20200403135828.2542770-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Hans de Goede , Daniel Vetter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Aside from deleting all the cleanup code we're now also setting a name for the pool Signed-off-by: Daniel Vetter Cc: Hans de Goede --- drivers/gpu/drm/vboxvideo/vbox_main.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/vboxvideo/vbox_main.c b/drivers/gpu/drm/vboxvideo/vbox_main.c index 1336ab9795fc..d68d9bad7674 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_main.c +++ b/drivers/gpu/drm/vboxvideo/vbox_main.c @@ -121,7 +121,8 @@ int vbox_hw_init(struct vbox_private *vbox) return -ENOMEM; /* Create guest-heap mem-pool use 2^4 = 16 byte chunks */ - vbox->guest_pool = gen_pool_create(4, -1); + vbox->guest_pool = devm_gen_pool_create(vbox->ddev.dev, 4, -1, + "vboxvideo-accel"); if (!vbox->guest_pool) return -ENOMEM; @@ -130,12 +131,12 @@ int vbox_hw_init(struct vbox_private *vbox) GUEST_HEAP_OFFSET(vbox), GUEST_HEAP_USABLE_SIZE, -1); if (ret) - goto err_destroy_guest_pool; + return ret; ret = hgsmi_test_query_conf(vbox->guest_pool); if (ret) { DRM_ERROR("vboxvideo: hgsmi_test_query_conf failed\n"); - goto err_destroy_guest_pool; + return ret; } /* Reduce available VRAM size to reflect the guest heap. */ @@ -147,30 +148,23 @@ int vbox_hw_init(struct vbox_private *vbox) if (!have_hgsmi_mode_hints(vbox)) { ret = -ENOTSUPP; - goto err_destroy_guest_pool; + return ret; } vbox->last_mode_hints = devm_kcalloc(vbox->ddev.dev, vbox->num_crtcs, sizeof(struct vbva_modehint), GFP_KERNEL); - if (!vbox->last_mode_hints) { - ret = -ENOMEM; - goto err_destroy_guest_pool; - } + if (!vbox->last_mode_hints) + return -ENOMEM; ret = vbox_accel_init(vbox); if (ret) - goto err_destroy_guest_pool; + return ret; return 0; - -err_destroy_guest_pool: - gen_pool_destroy(vbox->guest_pool); - return ret; } void vbox_hw_fini(struct vbox_private *vbox) { vbox_accel_fini(vbox); - gen_pool_destroy(vbox->guest_pool); } -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel