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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 EA7BBC433E2 for ; Tue, 8 Sep 2020 19:17:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 9288B2076C for ; Tue, 8 Sep 2020 19:17:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="C9xv7XT5"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="BnRhJgZ8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9288B2076C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cKMhwCt32T8hM9Du1gA4oZTX/2bygtLleiO/kwubNPQ=; b=C9xv7XT5CjyMlfSoGPZKOOFCo S8vGS6whuoAsRNpOqstfmyu46MjREiI8ThVUZHGtDZrXvX71ZIc2kgZXKWNV+o3WqTpShHAWnlvIg c4NpfH/0Z6jNKEJAd4EPwP110GeIe7YU81mSnwhjx7iMY6vFCv0vlzO9TZv5lLuSNFWfdBavRbht8 dzQ4FbMEa6n4BTzNLxTdxB7kSVMNOdICoke9uNg/9VJxJbVEIc5NfIJZiQ5MTrZzTAey1ukX6uLb9 pxHiI1lSMCM0srnfX4JQciINC5Lrd2va7N248GmUQuUsF3+XVwmHzDcVjBvjyv2CNSb0nFOyKMdZf SMdUOqN3Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFj6H-0002yq-TB; Tue, 08 Sep 2020 19:16:17 +0000 Received: from mail-dm6nam12on2043.outbound.protection.outlook.com ([40.107.243.43] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFj6E-0002yC-I0 for linux-arm-kernel@lists.infradead.org; Tue, 08 Sep 2020 19:16:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9NmcO5jREJCHmCZmv5PhW3cU172y/p7E3cbdl14CgspCgs+qy6+m2iKz0BRUPYdhzbx5sA0G4Tk6s8AqYcOoU3XKEYWr6R4r0V2mK6ShpSt368Quv1RKbx7/NVcuEg5m9g4+loEWnSst1IRpEELrAlmBF2Pj0QsR9ipYv3ci3vOvegnkQWujfpzCaqqcx5n/bf3Hc/yTDSs8fFQEu2C2Dq2trWFawtF9mnImUwOqDdYDaHN3Mr7YAUfAa+PXRrAWUj6HggdD2nzjlfrY+dGFIdhcRTyesf1fIeuQYL+0NmVWtKta2k1rSyY15Opz3Gk8YKL1tcF2wvU+lr4SUQBUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d2iIlSL/+JwQQr7qbdEdVNLS39E7eII+AKtfg10xNYc=; b=kttFZuXeHOuTpMUxfQVL1QTRoeijKa7XwQGcULEAbtQ7sSRiuM4la7dmRqAzfRxcr0yynR5GYKR4A5lv5/7eSonoB6x2T8sUmpvnQv7iZ/JDywNglHy/jkaGE1H/Nye6UvQN76xIFudBsmj+XacCKQ9objeGPms50kyJwE/LEqXNXqumZ37TVPVsDaiQLBk7oGs0OIXn7hWPPMonTOayB5lIvEZxVyLsnSwSqCVidfOQJVHbDTJMnPdqoabciv7gubP9mrPzA59ofWREeT7l4aPsbmDNDxMcK2ByN86Y+xyzco5IMQiKGlS6f+1DWkdNmJB0KRh2Z0n15qySgBX6iA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d2iIlSL/+JwQQr7qbdEdVNLS39E7eII+AKtfg10xNYc=; b=BnRhJgZ8QSMd/BJJ/KD1uc8yKT9/qhb6psF8KGWl5N8dyh9irMzsKdC8iLcW57FbLvHOZzmu9uOp4zOpJs6PYWyo8g89EWF+ijztwMXVA6yk4y5QXe10yXldibzYJzhBb0a0Ku0HX/wxQ/FWdiOJvrfXeZPZbktB+G4INnwgJec= Received: from CY4PR14CA0030.namprd14.prod.outlook.com (2603:10b6:903:101::16) by MN2PR02MB6877.namprd02.prod.outlook.com (2603:10b6:208:204::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15; Tue, 8 Sep 2020 19:16:11 +0000 Received: from CY1NAM02FT052.eop-nam02.prod.protection.outlook.com (2603:10b6:903:101:cafe::56) by CY4PR14CA0030.outlook.office365.com (2603:10b6:903:101::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.15 via Frontend Transport; Tue, 8 Sep 2020 19:16:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT052.mail.protection.outlook.com (10.152.74.123) with Microsoft SMTP Server id 15.20.3348.17 via Frontend Transport; Tue, 8 Sep 2020 19:16:10 +0000 Received: from [149.199.38.66] (port=39053 helo=smtp.xilinx.com) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1kFj5v-0006Ao-B8; Tue, 08 Sep 2020 12:15:55 -0700 Received: from [127.0.0.1] (helo=localhost) by smtp.xilinx.com with smtp (Exim 4.63) (envelope-from ) id 1kFj69-0007JW-Qa; Tue, 08 Sep 2020 12:16:09 -0700 Received: from xsj-pvapsmtp01 (smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 088JG0Kw023800; Tue, 8 Sep 2020 12:16:00 -0700 Received: from [172.19.75.82] (helo=xsjsycl40.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1kFj60-0007EO-3Y; Tue, 08 Sep 2020 12:16:00 -0700 Received: by xsjsycl40.xilinx.com (Postfix, from userid 13638) id 12A36352762; Tue, 8 Sep 2020 12:16:00 -0700 (PDT) Date: Tue, 8 Sep 2020 12:16:00 -0700 From: Hyun Kwon To: Daniel Vetter Subject: Re: [PATCH] drm/xlnx: Use devm_drm_dev_alloc Message-ID: <20200908191600.GA1569998@xilinx.com> References: <20200904143941.110665-7-daniel.vetter@ffwll.ch> <20200907082225.150837-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200907082225.150837-1-daniel.vetter@ffwll.ch> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7726dea6-dbea-47e2-48d3-08d8542ba4f3 X-MS-TrafficTypeDiagnostic: MN2PR02MB6877: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xEK0QhHDrhGijlpRY44GWRBjROQYrWYpMU5/H6ZBC5ay6MzIJBjGX7D0dH3oYQa35BAE2ewMu6sNGXaQ5ALYDT42Hp/g7nd8OLb6uGbVPiknNLw30z53pbxYSkc53A2+m4rvogZIarquTKr9ti3xFXmmGJEPPVJPCYqW690nblLOPc/81aS8fglOUfW7tIQnNPWRw67Y8YTkevH5XB2bu4ZMNbUO9EYifdRFPxorIOvzu895EKS4MPd7490A0JBIEkomH9mePM7lSdpUstNg7w853Xhh0NN6TbiOg0BFCUvsyJ416g8PrNpuFGRK/xW3qyFCDxltA4htWhuRWTPWmoI4FMEO8caDwxpgjrk1+HhqIhIrcOunNWwGzkxZWOXiRQi9oDCiFfQWRpBZPw0VXA== X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFS:(396003)(346002)(136003)(376002)(39860400002)(46966005)(33656002)(44832011)(54906003)(42186006)(2616005)(8936002)(426003)(336012)(81166007)(478600001)(316002)(82740400003)(82310400003)(83380400001)(8676002)(47076004)(6266002)(5660300002)(26005)(4326008)(6916009)(186003)(356005)(70206006)(70586007)(2906002)(36756003)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2020 19:16:10.0569 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7726dea6-dbea-47e2-48d3-08d8542ba4f3 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-AuthSource: CY1NAM02FT052.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR02MB6877 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200908_151614_598691_F1A7FD35 X-CRM114-Status: GOOD ( 25.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel Graphics Development , DRI Development , Michal Simek , Laurent Pinchart , Daniel Vetter , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Daniel, On Mon, Sep 07, 2020 at 01:22:25AM -0700, Daniel Vetter wrote: > Gets rid of drmm_add_final_kfree, which I want to unexport so that it > stops confusion people about this transitional state of rolling drm > managed memory out. > > This also fixes the missing drm_dev_put in the error path of the probe > code. > > v2: Drop the misplaced drm_dev_put from zynqmp_dpsub_drm_init (all > other paths leaked on error, this should have been in > zynqmp_dpsub_probe), now that subsumed by the auto-cleanup of > devm_drm_dev_alloc. > > Signed-off-by: Daniel Vetter > Cc: Hyun Kwon > Cc: Laurent Pinchart > Cc: Michal Simek > Cc: linux-arm-kernel@lists.infradead.org Looks correct to me. Reviewed-by: Hyun Kwon Thanks! -hyun > --- > drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 27 ++++++--------------------- > 1 file changed, 6 insertions(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > index 26328c76305b..8e69303aad3f 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > @@ -111,7 +111,7 @@ static int zynqmp_dpsub_drm_init(struct zynqmp_dpsub *dpsub) > /* Initialize mode config, vblank and the KMS poll helper. */ > ret = drmm_mode_config_init(drm); > if (ret < 0) > - goto err_dev_put; > + return ret; > > drm->mode_config.funcs = &zynqmp_dpsub_mode_config_funcs; > drm->mode_config.min_width = 0; > @@ -121,7 +121,7 @@ static int zynqmp_dpsub_drm_init(struct zynqmp_dpsub *dpsub) > > ret = drm_vblank_init(drm, 1); > if (ret) > - goto err_dev_put; > + return ret; > > drm->irq_enabled = 1; > > @@ -154,8 +154,6 @@ static int zynqmp_dpsub_drm_init(struct zynqmp_dpsub *dpsub) > > err_poll_fini: > drm_kms_helper_poll_fini(drm); > -err_dev_put: > - drm_dev_put(drm); > return ret; > } > > @@ -208,27 +206,16 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev) > int ret; > > /* Allocate private data. */ > - dpsub = kzalloc(sizeof(*dpsub), GFP_KERNEL); > - if (!dpsub) > - return -ENOMEM; > + dpsub = devm_drm_dev_alloc(&pdev->dev, &zynqmp_dpsub_drm_driver, > + struct zynqmp_dpsub, drm); > + if (IS_ERR(dpsub)) > + return PTR_ERR(dpsub); > > dpsub->dev = &pdev->dev; > platform_set_drvdata(pdev, dpsub); > > dma_set_mask(dpsub->dev, DMA_BIT_MASK(ZYNQMP_DISP_MAX_DMA_BIT)); > > - /* > - * Initialize the DRM device early, as the DRM core mandates usage of > - * the managed memory helpers tied to the DRM device. > - */ > - ret = drm_dev_init(&dpsub->drm, &zynqmp_dpsub_drm_driver, &pdev->dev); > - if (ret < 0) { > - kfree(dpsub); > - return ret; > - } > - > - drmm_add_final_kfree(&dpsub->drm, dpsub); > - > /* Try the reserved memory. Proceed if there's none. */ > of_reserved_mem_device_init(&pdev->dev); > > @@ -286,8 +273,6 @@ static int zynqmp_dpsub_remove(struct platform_device *pdev) > clk_disable_unprepare(dpsub->apb_clk); > of_reserved_mem_device_release(&pdev->dev); > > - drm_dev_put(drm); > - > return 0; > } > > -- > 2.28.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel