From patchwork Wed Jun 14 02:47:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sui Jingfeng <15330273260@189.cn> X-Patchwork-Id: 107673 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp959887vqr; Tue, 13 Jun 2023 19:50:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ537mgqNmiT5kJfENJ6JOQEbNAtkp+1+HXD0N+fGGOXA3yhi9EPnj0G3JsZMFg1mPOi1poJ X-Received: by 2002:a17:906:fe43:b0:978:9b09:ccaf with SMTP id wz3-20020a170906fe4300b009789b09ccafmr15750485ejb.14.1686711005068; Tue, 13 Jun 2023 19:50:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686711005; cv=none; d=google.com; s=arc-20160816; b=BjuTiZhBpSkgV2IkFmrw4mbAzDE3ZzyI9ZistFt+O7tuoWYDUZl/zp1/sTgshQc/XD FVbKV2shE7dJB1XmGVNR6JUn7gTRcNsRJY2mwIjtoBNSXEsQGo6ZQk6dKULOIZH2PczX a+R1Rbiz9jhC9rerSGN0E6RcRaKILuwvALnL7bvJuXMYWrZT8aeNjc0q2obwFzfqZHnn S3YoLysAS9i8QICCdX99zz2AHp/LJH1Alhat9AM4bx195kU9BFnkONbF22ec6SYgkO0P v98/xvo+vwBnCg7sIgQ/aHDIY3DiN7p546pAoOEcJsn45neUsU2JiZp+iZWfio753AAR /8fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :hmm_source_type:hmm_attache_num:hmm_source_ip; bh=VGySUCk7HatD+QYkz0NlLMZ1axXsvLqFptXLEpTn0oE=; b=hYwwtlUWRKVFyqTrm42YfUS5gKmA05Lv6yi/pKUXqn2Q3Zjk5Uqgepw0qxtLQpfFrh rOEvS6EP5joh8E8HgH3MNx80FbpKjkZ8s47j/G9DlYw6sllrYg04f3U7dgSHW8hosqvy yGaRIVs/VTBm8rJyFduHX0IhVbbRf4SdhOhK5ylzi2VSI0Tz5E0N659o3OXYuLEYkRy6 +BTVzIhu8OIB1Iib2lmjDZIxxU1m0wYKCtsWuywjMxTPUAsz6U/KLBvxppIrmUJteHeR t4foS8sK38rcqXyVPlHhD//k0tuxHdGhS6ohlDUwy/m/8fac6Kuj1aYvo4Jk/OnSYyTm QMwA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gl16-20020a170906e0d000b0096f8b640d66si3868594ejb.104.2023.06.13.19.49.40; Tue, 13 Jun 2023 19:50:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233436AbjFNCsQ (ORCPT + 99 others); Tue, 13 Jun 2023 22:48:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242052AbjFNCr6 (ORCPT ); Tue, 13 Jun 2023 22:47:58 -0400 Received: from 189.cn (ptr.189.cn [183.61.185.104]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E61C8CE for ; Tue, 13 Jun 2023 19:47:57 -0700 (PDT) HMM_SOURCE_IP: 10.64.8.31:39796.1729481184 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-114.242.206.180 (unknown [10.64.8.31]) by 189.cn (HERMES) with SMTP id 819B5102A42; Wed, 14 Jun 2023 10:47:56 +0800 (CST) Received: from ([114.242.206.180]) by gateway-151646-dep-75648544bd-xp9j7 with ESMTP id 39b79d1d098c4910a97066329ad02cb9 for l.stach@pengutronix.de; Wed, 14 Jun 2023 10:47:57 CST X-Transaction-ID: 39b79d1d098c4910a97066329ad02cb9 X-Real-From: 15330273260@189.cn X-Receive-IP: 114.242.206.180 X-MEDUSA-Status: 0 Sender: 15330273260@189.cn From: Sui Jingfeng <15330273260@189.cn> To: Lucas Stach , Christian Gmeiner , Daniel Vetter , Bjorn Helgaas Cc: linux-kernel@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, loongson-kernel@lists.loongnix.cn, Sui Jingfeng , Philipp Zabel Subject: [PATCH v9 8/9] drm/etnaviv: Add a dedicated function to create the virtual master Date: Wed, 14 Jun 2023 10:47:44 +0800 Message-Id: <20230614024745.865129-9-15330273260@189.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230614024745.865129-1-15330273260@189.cn> References: <20230614024745.865129-1-15330273260@189.cn> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,FROM_LOCAL_DIGITS, FROM_LOCAL_HEX,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768644678622736668?= X-GMAIL-MSGID: =?utf-8?q?1768644678622736668?= From: Sui Jingfeng After introducing the etnaviv_of_first_available_node() helper, the creation of the virtual master platform device can also be simplified. So, switch to etnaviv_create_virtual_master() function. Cc: Lucas Stach Cc: Christian Gmeiner Cc: Philipp Zabel Cc: Bjorn Helgaas Cc: Daniel Vetter Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 43 ++++++++++++++++----------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 1c9386e5a1b0..0ee7f641cee3 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -766,10 +766,32 @@ static void etnaviv_destroy_platform_device(struct platform_device **ppdev) *ppdev = NULL; } +static int etnaviv_create_virtual_master(void) +{ + struct platform_device **master = &etnaviv_platform_device; + struct device_node *np; + + /* + * If the DT contains at least one available GPU device, instantiate + * the DRM platform device. + */ + np = etnaviv_of_first_available_node(); + if (np) { + int ret; + + of_node_put(np); + + ret = etnaviv_create_platform_device("etnaviv", master); + if (ret) + return ret; + } + + return 0; +} + static int __init etnaviv_init(void) { int ret; - struct device_node *np; etnaviv_validate_init(); @@ -785,22 +807,9 @@ static int __init etnaviv_init(void) if (ret != 0) goto unregister_platform_driver; - /* - * If the DT contains at least one available GPU device, instantiate - * the DRM platform device. - */ - for_each_compatible_node(np, NULL, "vivante,gc") { - if (!of_device_is_available(np)) - continue; - of_node_put(np); - - ret = etnaviv_create_platform_device("etnaviv", - &etnaviv_platform_device); - if (ret) - goto unregister_platform_driver; - - break; - } + ret = etnaviv_create_virtual_master(); + if (ret) + goto unregister_platform_driver; return ret;