From patchwork Sun Sep 24 19:25:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 144136 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp808363vqu; Sun, 24 Sep 2023 12:31:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgBELYf24M1YTnbGtVvGuZE912U4y0SXkQjiW9PsZKCa2ML2CgeVOajQ/kid5smUH59hFx X-Received: by 2002:a05:6a21:3e07:b0:147:d861:50e4 with SMTP id bk7-20020a056a213e0700b00147d86150e4mr3132523pzc.33.1695583912220; Sun, 24 Sep 2023 12:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695583912; cv=none; d=google.com; s=arc-20160816; b=uRDcn1q0mg8ZEa3KFEVGyGjJxXr4+NI9XfgIbeUfM0mFNDxLnC6CpDJnyiwhBmTm79 vuyXIp5ahuI1Mb575re0xtKR0u1vuG9FWcQJrCIGWuwcy94e6o+pe6mJ19GFsXrd7hFj sNdTPOKkZZEfVMDUnXBLg+R3sMD1r987akui0PRNlJ5CAzf+ZcdgZPXd13vDWh+gSiBi QSdYfm++664bTWaOavmZxfO6Q+P1trreltNtMAQGDjiJlT2qt7RydIhxLBZOEArTx8VB JiYux8udVzfTMhA215ddZd+3jbnROZbIHT70Ka48jK0GgKM29/osnd62CHvrLb28Aog1 3RWg== 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 :dkim-signature; bh=d66F58Zyq56V9Vs4Hyo0TkmljKT89gyNoM7Khlph/EE=; fh=ythuQA64SNE7wujD11OFYiH8HaGGRVN0m1KGJA3eIXU=; b=Vc/UTkt78YUFHRLOulnO7qXCWc+dfYzQ3R1KNpp527T9dViN9EbwPJ/u4TQIE1hNTU abnKae2dJb4Zysa9EZkzDeI7c4bX0X0Jah74oqqM3HTLgXnhSgbKEhkOB8ClsfBKQBfX +3qkHKhcEkDjODgU2ON978WDWOZC9qPy3RTuYMb5i062puMrEorQnJ1ssJMB2Tb4+reF /4MHB8wrrimbEeNNb50k8NCLsocU21QL7mKSUb5JcbN28fAIh/9yOX7I0BQO8NPSi0dt oG53TR1KymRaGrO/prUFDoD9I9gxEujdqJR4ZUZ3x31cunO8qPxvGS1X79xcIYkwU/h3 AZnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XQ+ERoKk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id kz4-20020a170902f9c400b001bda93595d9si1271469plb.604.2023.09.24.12.31.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:31:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XQ+ERoKk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 631EC808EF49; Sun, 24 Sep 2023 12:26:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229883AbjIXT0X (ORCPT + 30 others); Sun, 24 Sep 2023 15:26:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjIXT0V (ORCPT ); Sun, 24 Sep 2023 15:26:21 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68E2EFA for ; Sun, 24 Sep 2023 12:26:15 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-9ae7383b7ecso893672566b.0 for ; Sun, 24 Sep 2023 12:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695583574; x=1696188374; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d66F58Zyq56V9Vs4Hyo0TkmljKT89gyNoM7Khlph/EE=; b=XQ+ERoKkivTUgW0gcspZnVZ84aEm/rPMUHkgMDsgLqxjI8bCErRo0ww0iEW3Faztxe KHJIujXXIu20Npr+GVtxZYZ+dx+TxAa2AY0eHxDgN9K+Z5oW0alqZNs6uu4Ru+nvWtqJ hTahv5ZKqJJZN5IwClKPxoh1UIyZhoMk/QOm3YQzzgBcM7tiAEAM4u7kR/Y9GjOD2fzg kmjGamcnusJxHBpPghQsvddBNq2SOuuWSGH8NNldDDKeCH24ZLWpFi2VjrmTTnww/e9v z2ClAo3WJ+i4H/W4EqqoG/CeQEuFep2FJP/8qLXE2n943ez7HWT5xUYpqQbHBm0vl25k Swbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695583574; x=1696188374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d66F58Zyq56V9Vs4Hyo0TkmljKT89gyNoM7Khlph/EE=; b=nU8hoOnumPzyQuiq5cbhcY3I1UIxI5r7AMTV5blIy/gzUINCDbfp7sUh97tPvRzvA6 PlCfIB26p/TLnRCgnmPErbCG4XXDaaYhCve/71CjB4Qb+/1/BFwvCKBuYydXmg6Hfb0A CbCz3CJx8DyUBo2qESP91Kthcq8O1to4oqMcgOa/N8QLlmET7N2q+Em0ZrdP1Q3AFP/h jjiPOwRHUMsp3MA2vqB3VwmugViza5gxPwhg+OrvzcX9UJvvynjvdFmrjkvzk+ioHk9T O9c7JGBmeU8SBOZAyIZAY3YAE9GWPVwT3Te1t+Kp2QxQE7MWpqAhb9rG1/tROdzPjiSp Zy8A== X-Gm-Message-State: AOJu0YyogqECgKM4uEv10eKo9PKKdzcARoVRi1sbpyBWsJy4mc0AJNu3 jFTlUWBnQocgsGOMhqCasG4= X-Received: by 2002:a17:906:74d3:b0:9ae:614e:4560 with SMTP id z19-20020a17090674d300b009ae614e4560mr7802850ejl.29.1695583573619; Sun, 24 Sep 2023 12:26:13 -0700 (PDT) Received: from localhost.localdomain (82-149-12-148.dynamic.telemach.net. [82.149.12.148]) by smtp.gmail.com with ESMTPSA id z21-20020a1709063a1500b0099d0c0bb92bsm5317632eje.80.2023.09.24.12.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:26:13 -0700 (PDT) From: Jernej Skrabec To: mripard@kernel.org, wens@csie.org Cc: airlied@gmail.com, daniel@ffwll.ch, samuel@sholland.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH 1/7] drm/sun4i: dw-hdmi: Deinit PHY in fail path Date: Sun, 24 Sep 2023 21:25:58 +0200 Message-ID: <20230924192604.3262187-2-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230924192604.3262187-1-jernej.skrabec@gmail.com> References: <20230924192604.3262187-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 24 Sep 2023 12:26:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777948596436328790 X-GMAIL-MSGID: 1777948596436328790 Commit 9bf3797796f5 ("drm/sun4i: dw-hdmi: Make HDMI PHY into a platform device") removed code for PHY deinitialization in fail path. Add it back. Fixes: 9bf3797796f5 ("drm/sun4i: dw-hdmi: Make HDMI PHY into a platform device") Signed-off-by: Jernej Skrabec Acked-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c index 4727dfaa8fb9..0b647b030b15 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c @@ -203,6 +203,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, cleanup_encoder: drm_encoder_cleanup(encoder); + sun8i_hdmi_phy_deinit(hdmi->phy); err_disable_clk_tmds: clk_disable_unprepare(hdmi->clk_tmds); err_assert_ctrl_reset: From patchwork Sun Sep 24 19:25:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 144153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp865076vqu; Sun, 24 Sep 2023 15:30:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBBsfTTFtfBaB0AJOz2u63nt3DV/+QK1zDFscDjXJX8B54B9n/ohCnT7nPKNXzK+5gcZBf X-Received: by 2002:a17:90a:7f8b:b0:274:4161:b9dc with SMTP id m11-20020a17090a7f8b00b002744161b9dcmr4810594pjl.31.1695594641292; Sun, 24 Sep 2023 15:30:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695594641; cv=none; d=google.com; s=arc-20160816; b=cndVN40/eBLIT5FDGZitlA7jd84V/O8scuQlygA5VF3WAmYp3dHbyOJj3qf/20rRii dmdSPEG0PDxJNNT5WNkqaKRIvQ6mGP+Q8ZKYtcwkSWyNdsb6eAXC+5pmI9+NTlkR0WnT wlFiOiH/kfLmfrJLwxkb8Jlcc8cuGab9oty7cskHRpDNm8CKnzQfB4rbXwLyE4CAxKWB Dl3LUlp7qB1Gd/wdW6p74RyDNNHKF6Io+mgGo0APig6PFJfD1j/XNqBbZFPYVnI21mG/ IuOTFTmfJ/23IouAmrbJP2gWVpBfxavAN8IQTFRd+5/3vZH2t8IiV0wjABKP4eyEq7ga fxrw== 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 :dkim-signature; bh=7GGwz4wHTU6Hq3RRU7lNI3Q1wc2dl9iWY5fWoPCz14w=; fh=ythuQA64SNE7wujD11OFYiH8HaGGRVN0m1KGJA3eIXU=; b=kBH+pF/symCdUboy6dtL2MNepIpvT/vLkUJuHFd9PWxJNnVVYrKR05+NK/OjF7Vp5e Rsj/a2KdbkClPYw6fk5Py4Fe0+8cfKIzXCzufSbMCyJgdGBUeKgbiQ+vMoJU7Nd/+EaT UpX6YEm+OfSxJVghrYvuaRHT5m41itMaJO41d9uDIIGl6M+6i7XVvTRb3mm+4J9LAeD7 JS4wDGveXtITcerG2rYTIq90X7cXVSMEpqe+rqE3OBUe4RNSwlixNxviHHlPUvY0OXBB aG59QHB9LLIBVXgYcNT5oWUQNuqRDA7gIHs21nuzLvYzWSc15DH1QoIP0t0BevSZNtaL pw0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=d9HexRLB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id h23-20020a17090aa89700b00274cf8042b6si7309302pjq.102.2023.09.24.15.30.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 15:30:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=d9HexRLB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 4A32B828E8EB; Sun, 24 Sep 2023 12:26:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230122AbjIXT00 (ORCPT + 30 others); Sun, 24 Sep 2023 15:26:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbjIXT0W (ORCPT ); Sun, 24 Sep 2023 15:26:22 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EFBBF1 for ; Sun, 24 Sep 2023 12:26:16 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-9b275afb6abso281653866b.1 for ; Sun, 24 Sep 2023 12:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695583575; x=1696188375; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7GGwz4wHTU6Hq3RRU7lNI3Q1wc2dl9iWY5fWoPCz14w=; b=d9HexRLBkVxBtbwzgZFtb19Hr36iAPGUwUG5HSIN5SlAkrgcPnAfsdAiMtsJwD3597 C4AjA5IeF1pvn0iyT7xpXCAalB1FDg6HgzwEXhux3Dd56n1iCC59oUHMeEGdhEge6YXU eM/WYxrbqLwYmiZ15qc8K667xwdciLl1BZ9oIieumOF04RHDGc/Cede6oI1liLsx5XaK DSj7ZzurnqFSmVMQ472sHj9AnUaVeacC52eBSeQVAYuWq2SHYkX3Cv9qgNML4OIoBYgE AycjDMWHu6uehLhoroaBUcVDWFIUTFC4ZKkipgAUJ+CWuFGyCH7mB6lnjc5PPME7Lh8I iVEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695583575; x=1696188375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7GGwz4wHTU6Hq3RRU7lNI3Q1wc2dl9iWY5fWoPCz14w=; b=RYu/d4yxi/FFfXn3KZHtUe6tCypxlBJmPCZX8CekhvjCMFlj4ZnktxLONewRbcJIzz fbsHbpZvAgAm1I3A8p7noEF8Y/drlitoa2i3CI/2mhdjJ7GJ3rP7d3iyn1qNTz1nsmMs UA8g8vBAyUFExgwb9Da29tR0pB3YQ+3L9jkFlnha7v2qcqgNOhmoLVi6r+7Hja3dsdRG 6elVZGWbY2imNZkA/F9O4/XFuHm1mbt3RDRyitNklp+PBTcekp094EHpsQSmkdMfjjXz vtJliV5jGhXxWoniY9IgRqBSln1zquYuO95Bsu4iIa5oqiBWGtkMLzLpFeGJgsaOSWGx VtKA== X-Gm-Message-State: AOJu0Yw9WNL+u+IooDaA2ON8dOU9N7HNX89Scu8Zgm6AwPJ8UYLjgGKS FCh19gx44AooXTk9VSJEO+o= X-Received: by 2002:a17:907:ea5:b0:9a1:e0b1:e919 with SMTP id ho37-20020a1709070ea500b009a1e0b1e919mr13414633ejc.4.1695583574659; Sun, 24 Sep 2023 12:26:14 -0700 (PDT) Received: from localhost.localdomain (82-149-12-148.dynamic.telemach.net. [82.149.12.148]) by smtp.gmail.com with ESMTPSA id z21-20020a1709063a1500b0099d0c0bb92bsm5317632eje.80.2023.09.24.12.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:26:14 -0700 (PDT) From: Jernej Skrabec To: mripard@kernel.org, wens@csie.org Cc: airlied@gmail.com, daniel@ffwll.ch, samuel@sholland.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH 2/7] drm/sun4i: dw-hdmi: Remove double encoder cleanup Date: Sun, 24 Sep 2023 21:25:59 +0200 Message-ID: <20230924192604.3262187-3-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230924192604.3262187-1-jernej.skrabec@gmail.com> References: <20230924192604.3262187-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 12:26:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777959846218139879 X-GMAIL-MSGID: 1777959846218139879 It turns out that comment is wrong - dw hdmi driver never does any encoder cleanup. In fact, cleanup is done automatically, in destroy callback of encoder. Even more, encoder memory will be freed when hdmi device is destroyed. However, encoder will be cleaned up after that, in drm_mode_config_cleanup(), which is called later. This will cause use after free bug. Remove redundant encoder cleanup, switch memory allocation to live as long as drm object and while at it, check return code of encoder initialization. Fixes: b7c7436a5ff0 ("drm/sun4i: Implement A83T HDMI driver") Signed-off-by: Jernej Skrabec Acked-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c index 0b647b030b15..8f8d3bdba5ce 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -107,7 +108,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, if (!pdev->dev.of_node) return -ENODEV; - hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL); + hdmi = drmm_kzalloc(drm, sizeof(*hdmi), GFP_KERNEL); if (!hdmi) return -ENOMEM; @@ -180,7 +181,9 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, goto err_disable_clk_tmds; drm_encoder_helper_add(encoder, &sun8i_dw_hdmi_encoder_helper_funcs); - drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); + ret = drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); + if (ret) + goto err_deinit_phy; plat_data->mode_valid = hdmi->quirks->mode_valid; plat_data->use_drm_infoframe = hdmi->quirks->use_drm_infoframe; @@ -189,20 +192,14 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, platform_set_drvdata(pdev, hdmi); hdmi->hdmi = dw_hdmi_bind(pdev, encoder, plat_data); - - /* - * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(), - * which would have called the encoder cleanup. Do it manually. - */ if (IS_ERR(hdmi->hdmi)) { ret = PTR_ERR(hdmi->hdmi); - goto cleanup_encoder; + goto err_deinit_phy; } return 0; -cleanup_encoder: - drm_encoder_cleanup(encoder); +err_deinit_phy: sun8i_hdmi_phy_deinit(hdmi->phy); err_disable_clk_tmds: clk_disable_unprepare(hdmi->clk_tmds); From patchwork Sun Sep 24 19:26:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 144139 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp831901vqu; Sun, 24 Sep 2023 13:45:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbQWKpZjdTLjX2JrOBj3OpiPGhxVYF9w5zEqpqyHp5Bnu11M75mJJk1eXfnimLjZWDn55i X-Received: by 2002:a05:6a20:f3a2:b0:15e:f2a1:dae with SMTP id qr34-20020a056a20f3a200b0015ef2a10daemr1522949pzb.27.1695588320031; Sun, 24 Sep 2023 13:45:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695588320; cv=none; d=google.com; s=arc-20160816; b=PZI9Jdjcr8ocZY5425g0lVQPAlGOIJMsQd/WoSSbMKlwiy1XAE3vKXn12K+0PwHlK9 7Ap3rbMSb5W/bILD34RNBbKmhl/ItXJNe+5yOymsuZyVj8pU5xqbF/nBq2ETL9yftqL7 CjrwlMgeX/036X0vIfgeFRqU5Dth3GMQeV72+6/LH4RRVJvhRQ8eosZHC0RNjEvq5bwC 9/f65zmN3dMLA9xPCaPZgoM6lAh+xUv38sb6igAmqI1U8FnoSnoHWJQ1GIQb5GIY39nk UExhClq01kGknJuvd0x2rTO64Pigj17nfMF0BI9eLAGFgf8plYBwUUXqu/64N4pM4d7T R/jw== 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 :dkim-signature; bh=c6KY3l38JJQzo0U3VJY6BsoHFoiqXvY2L3IXiGvOPS0=; fh=ythuQA64SNE7wujD11OFYiH8HaGGRVN0m1KGJA3eIXU=; b=oYn9rLmAJUb45iqBnUXCv4HrnTjsfVayofjwXL0wIgsRgn5w++5YTw6DMPkq8sheMs kQ5hK2lPTtpgOYuHsWKyUVWgZ0Q+KcKXrrr158LGP1aZvO/l/RK8dXCP8KFFqnfVaMqi kqfgePEFNRuplQr75yOQ3fTYqSRP53RGxJVBsNHHJmKGfvPDLg9TNYwZFZbUPEFOhUKF ytYo1i+tcwnVcp4x4ORunoSn28BT1gocJN97aY0p1ubz3JIfrtCsdY2zIjR/pBuOo6OR igkmj/u4Svpsc9zozG70MFWMVCSUWAJlB0uHW7RrIvYxMJS83Ssv9P2Gtp7jx0ijUi0W Kl0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="YG/YrdAn"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id x5-20020a654145000000b00578afd89ba6si4714113pgp.457.2023.09.24.13.45.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 13:45:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="YG/YrdAn"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id C28E3801F201; Sun, 24 Sep 2023 12:26:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230151AbjIXT0a (ORCPT + 30 others); Sun, 24 Sep 2023 15:26:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229807AbjIXT0X (ORCPT ); Sun, 24 Sep 2023 15:26:23 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1699BFA for ; Sun, 24 Sep 2023 12:26:17 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-99c3c8adb27so637270066b.1 for ; Sun, 24 Sep 2023 12:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695583575; x=1696188375; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c6KY3l38JJQzo0U3VJY6BsoHFoiqXvY2L3IXiGvOPS0=; b=YG/YrdAndp68NbzADNKsQ8L+51MCw/VI+NV3DxWnLt7OTCCS8Zs7ttfZrO4EGTa6Jk x9/IEuLfHMe39XKXudCXMTadRfJ7Ya/8lPsB+LlfpSCnwGANuStbXzB+mkyi1Pr1KGQo +nsRzQkYWYSvBi9yNk2SDqdAq3h7VFYfhROxp/2rGZm5sfm+vFDmKrJlCV+vfUwclwhq myN22M1kguKgDDTWcJYB77FA+FIyhAiuRZrJwIpW62N75kmJ6WIZGZnBR1FPWrdKg+sM T3cjctknNTiY62iTHnneIR24cMeoAu5cgLvaLKpdOn+RSiz3PAXJBtv2wTytJbxg+hWs xGaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695583575; x=1696188375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c6KY3l38JJQzo0U3VJY6BsoHFoiqXvY2L3IXiGvOPS0=; b=gPPeSGxhPSwsB4Hsp/hW6GM4kursh/hJDwBfDwHQef4xmWiIyson/CwM9zNqdnY/28 MseK8mwr5cIlQBKWN6OQsVqxaQkBujOc8UEJAwcOqUt39sOF2481jTWf6IECBWjzW8oE 4jBlA7eQDzc9SMkXL8d6IA8VLKpkK3UThv3MSnV2lk5BcfZoGqf78NNRAyaDdtK+duHI bmYUQJvTxztxsu6xd4FE2wJ+BPt8gWeUYgDuzzgepa1241DnI11Z53Bl1CAaTke7JKJT UO/vE71d1M0QSTIU+qq1u5YF+mn90+493k4uY5ED7ZVpQoizJmcQhV76A6cBlJRZ/8qK gXVw== X-Gm-Message-State: AOJu0YxCcq+TclZXTsqKdWpVkA5FHdoPZ6MxjTU/RznmSlRB3rgeVs84 LgaqJXtQ/4kfjPoAXCizEoE= X-Received: by 2002:a17:906:3010:b0:9ae:513d:de22 with SMTP id 16-20020a170906301000b009ae513dde22mr4045355ejz.56.1695583575563; Sun, 24 Sep 2023 12:26:15 -0700 (PDT) Received: from localhost.localdomain (82-149-12-148.dynamic.telemach.net. [82.149.12.148]) by smtp.gmail.com with ESMTPSA id z21-20020a1709063a1500b0099d0c0bb92bsm5317632eje.80.2023.09.24.12.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:26:15 -0700 (PDT) From: Jernej Skrabec To: mripard@kernel.org, wens@csie.org Cc: airlied@gmail.com, daniel@ffwll.ch, samuel@sholland.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH 3/7] drm/sun4i: dw-hdmi: Switch to bridge functions Date: Sun, 24 Sep 2023 21:26:00 +0200 Message-ID: <20230924192604.3262187-4-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230924192604.3262187-1-jernej.skrabec@gmail.com> References: <20230924192604.3262187-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 24 Sep 2023 12:26:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777953218469446025 X-GMAIL-MSGID: 1777953218469446025 Since ddc-en property handling was moved from sun8i dw-hdmi driver to display connector driver, probe order of drivers determines if EDID is properly read at boot time or not. In order to fix this, let's switch to bridge functions which allows us to build proper chain and defer execution until all drivers are probed. Fixes: 920169041baa ("drm/sun4i: dw-hdmi: Fix ddc-en GPIO consumer conflict") Signed-off-by: Jernej Skrabec --- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 114 +++++++++++++++++++++++++- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 5 ++ 2 files changed, 117 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c index 8f8d3bdba5ce..93831cdf1917 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c @@ -8,14 +8,82 @@ #include #include +#include +#include #include #include #include #include +#include + #include "sun8i_dw_hdmi.h" #include "sun8i_tcon_top.h" +#define bridge_to_sun8i_dw_hdmi(x) \ + container_of(x, struct sun8i_dw_hdmi, enc_bridge) + +static int sun8i_hdmi_enc_attach(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) +{ + struct sun8i_dw_hdmi *hdmi = bridge_to_sun8i_dw_hdmi(bridge); + + return drm_bridge_attach(&hdmi->encoder, hdmi->hdmi_bridge, + &hdmi->enc_bridge, flags); +} + +static void sun8i_hdmi_enc_detach(struct drm_bridge *bridge) +{ + struct sun8i_dw_hdmi *hdmi = bridge_to_sun8i_dw_hdmi(bridge); + + cec_notifier_conn_unregister(hdmi->cec_notifier); + hdmi->cec_notifier = NULL; +} + +static void sun8i_hdmi_enc_hpd_notify(struct drm_bridge *bridge, + enum drm_connector_status status) +{ + struct sun8i_dw_hdmi *hdmi = bridge_to_sun8i_dw_hdmi(bridge); + struct edid *edid; + + if (!hdmi->cec_notifier) + return; + + if (status == connector_status_connected) { + edid = drm_bridge_get_edid(hdmi->hdmi_bridge, hdmi->connector); + if (edid) + cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, + edid); + } else { + cec_notifier_phys_addr_invalidate(hdmi->cec_notifier); + } +} + +static int sun8i_hdmi_enc_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct drm_connector_state *old_conn_state = + drm_atomic_get_old_connector_state(conn_state->state, + conn_state->connector); + + if (!drm_connector_atomic_hdr_metadata_equal(old_conn_state, conn_state)) + crtc_state->mode_changed = true; + + return 0; +} + +static const struct drm_bridge_funcs sun8i_hdmi_enc_bridge_funcs = { + .attach = sun8i_hdmi_enc_attach, + .detach = sun8i_hdmi_enc_detach, + .hpd_notify = sun8i_hdmi_enc_hpd_notify, + .atomic_check = sun8i_hdmi_enc_atomic_check, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, +}; + static void sun8i_dw_hdmi_encoder_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, struct drm_display_mode *adj_mode) @@ -99,6 +167,8 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, { struct platform_device *pdev = to_platform_device(dev); struct dw_hdmi_plat_data *plat_data; + struct cec_connector_info conn_info; + struct drm_connector *connector; struct drm_device *drm = data; struct device_node *phy_node; struct drm_encoder *encoder; @@ -187,18 +257,57 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, plat_data->mode_valid = hdmi->quirks->mode_valid; plat_data->use_drm_infoframe = hdmi->quirks->use_drm_infoframe; + plat_data->output_port = 1; sun8i_hdmi_phy_set_ops(hdmi->phy, plat_data); platform_set_drvdata(pdev, hdmi); - hdmi->hdmi = dw_hdmi_bind(pdev, encoder, plat_data); + hdmi->hdmi = dw_hdmi_probe(pdev, plat_data); if (IS_ERR(hdmi->hdmi)) { ret = PTR_ERR(hdmi->hdmi); goto err_deinit_phy; } + hdmi->hdmi_bridge = of_drm_find_bridge(dev->of_node); + + hdmi->enc_bridge.funcs = &sun8i_hdmi_enc_bridge_funcs; + hdmi->enc_bridge.type = DRM_MODE_CONNECTOR_HDMIA; + hdmi->enc_bridge.interlace_allowed = true; + + drm_bridge_add(&hdmi->enc_bridge); + + ret = drm_bridge_attach(encoder, &hdmi->enc_bridge, NULL, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (ret) + goto err_remove_dw_hdmi; + + connector = drm_bridge_connector_init(drm, encoder); + if (IS_ERR(connector)) { + dev_err(dev, "Unable to create HDMI bridge connector\n"); + ret = PTR_ERR(connector); + goto err_remove_dw_hdmi; + } + + hdmi->connector = connector; + drm_connector_attach_encoder(connector, encoder); + + if (hdmi->quirks->use_drm_infoframe) + drm_connector_attach_hdr_output_metadata_property(connector); + + cec_fill_conn_info_from_drm(&conn_info, connector); + + hdmi->cec_notifier = cec_notifier_conn_register(&pdev->dev, NULL, + &conn_info); + if (!hdmi->cec_notifier) { + ret = -ENOMEM; + goto err_remove_dw_hdmi; + } + return 0; +err_remove_dw_hdmi: + drm_bridge_remove(&hdmi->enc_bridge); + dw_hdmi_remove(hdmi->hdmi); err_deinit_phy: sun8i_hdmi_phy_deinit(hdmi->phy); err_disable_clk_tmds: @@ -216,7 +325,8 @@ static void sun8i_dw_hdmi_unbind(struct device *dev, struct device *master, { struct sun8i_dw_hdmi *hdmi = dev_get_drvdata(dev); - dw_hdmi_unbind(hdmi->hdmi); + drm_bridge_remove(&hdmi->enc_bridge); + dw_hdmi_remove(hdmi->hdmi); sun8i_hdmi_phy_deinit(hdmi->phy); clk_disable_unprepare(hdmi->clk_tmds); reset_control_assert(hdmi->rst_ctrl); diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h index ab80d52a70bb..18ffc1b4841f 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h @@ -7,6 +7,7 @@ #define _SUN8I_DW_HDMI_H_ #include +#include #include #include #include @@ -178,9 +179,13 @@ struct sun8i_dw_hdmi_quirks { }; struct sun8i_dw_hdmi { + struct cec_notifier *cec_notifier; struct clk *clk_tmds; + struct drm_connector *connector; struct device *dev; + struct drm_bridge enc_bridge; struct dw_hdmi *hdmi; + struct drm_bridge *hdmi_bridge; struct drm_encoder encoder; struct sun8i_hdmi_phy *phy; struct dw_hdmi_plat_data plat_data; From patchwork Sun Sep 24 19:26:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 144154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp865403vqu; Sun, 24 Sep 2023 15:31:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOwvppDejj8ItJnmuCAzkdF36B2xVWwyfF+6Z33CW8fezFzWTd6NQs6vmt7Nr4b0FbZ81J X-Received: by 2002:a17:903:2442:b0:1c4:375c:110a with SMTP id l2-20020a170903244200b001c4375c110amr7328944pls.19.1695594689932; Sun, 24 Sep 2023 15:31:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695594689; cv=none; d=google.com; s=arc-20160816; b=pELUY4/wWcoKHNcN0CtjApMnjqu9DoPSmkTER5yNMR+Q7zOBI8irZgr++UQ6Scxd2a yHMCqN4fTqavuG55OAYCZajbz+x5UdN2kISmZuL67m9GQNK9rTMGWrSRdBZPoV7nBsvX r+z8aGGdadD7+oB1ex2354x0EJrVcCfCZiCAePE34MMDYxIjD197eCFw77lKd2G0fVXk gaMJ2QPO1EByYT751UvnrM0pJNpLzchVnoG6ndEJhjZ15AhQFV224GJvncfxUEeOAmvO npfAeqc2xHexG4heDbkIlCZ/HbPxwUssF7VdWVq2YfOdOC3pfJmbB0j18QNtR6H4Q/Yp ZP/A== 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 :dkim-signature; bh=P67yQ9/R8vP33MNrFu8s/BR4RgUF4Oo7AxmSI7wtbGo=; fh=ythuQA64SNE7wujD11OFYiH8HaGGRVN0m1KGJA3eIXU=; b=W1ZDVCX82n/R6VAtjfk/zRRr+C6aIxb7lNKE2TIH2PffMGa0QOsmE/5gpiX1NgRTq/ GGDi64ElVbXBiLlO86E2Rd0eugNuuJmqSN8aOfzNuBab83afy1ks9VtJoWdgVtQE7kqB h/Mh8i4JJPDf2g0cLTdCn4rHG6ss7Yr96kmu2Sfin1cWAZPqxFQOolbjmmDPU+cSuXW9 MMsdgXKoUFHIBhqOZo+zCpG1rxa4BPXAPKAZ0kP6dBnMrGO7yQaWGVms36n3iNyQUYmM 5cj5wwU2Nle7CPOVa5g6G9zvnT/tOjwqddx7/gAeVHuE5pt9KtJOcBi2PZczUeWB80zD a9yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LRbg1WbV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id li16-20020a170903295000b001bc02b730f3si7946807plb.242.2023.09.24.15.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 15:31:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LRbg1WbV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id A8B978198C55; Sun, 24 Sep 2023 12:26:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229576AbjIXT0d (ORCPT + 30 others); Sun, 24 Sep 2023 15:26:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229993AbjIXT0Y (ORCPT ); Sun, 24 Sep 2023 15:26:24 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 518CFF1 for ; Sun, 24 Sep 2023 12:26:18 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9ada2e6e75fso669829366b.2 for ; Sun, 24 Sep 2023 12:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695583576; x=1696188376; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P67yQ9/R8vP33MNrFu8s/BR4RgUF4Oo7AxmSI7wtbGo=; b=LRbg1WbVE61YqEHyiUHXU46unUMx1cX1WEkhs2nBnEmlMGhgIPkThEj6CgIDs5J9RI 50GmpeOEqUYqw1hu/b2J8MFnfDNcNifXx3SQQ4gXifrL0wcoeU3GdrmYsPvLg9qqj8GS ub3xww6C5eU/h+bcXgzQ0FdTvHA6E+B5q5Y4RlxkUCANm1mtXiPZ2JCUhVul1KA9FUk+ jR4Tbsq+FWKBCPXON0yc4crm+SMBeX00byqXKfEdDqgKUNzX1cC2s7TbsEUvDD403qOk 0LMbqUWEhF8uakDHAk3nzT4cEql3ntKmC53L2AUnvjzRApP2u6IPo8TYDrBmovkZNifD iNqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695583576; x=1696188376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P67yQ9/R8vP33MNrFu8s/BR4RgUF4Oo7AxmSI7wtbGo=; b=H6LFlaGqTywppzoqeA9UzyAlSwOa4/+5/ht4zdXqf/HR0RpUc+pWSDW8miULZOUBte wBU1cwCFN9p8w0JTtVauTqDvMrSNSqruFL8q7L8ZA3zlhs2TORv+Wfzp2YECA38YE8oQ hOGi5Q91Uh5Dt4QgwIwY2WCA1OZm4j8TnVxK2GIyydoAnP7g2jqx0NEoM8XVi402Xfnh SzKVe3S9RhUOUykBFGS4leKu+AgO6v8+Zm7JPDARA3W3VM3YAlGoUAn7aO/0HkFc1Doi 9VttmnFWvkUVpRSaC/5e+tOjR5VTaHVLAKY2UGDgXA+A+y8U8dBz32ojf9vRdAGkDWfJ w47Q== X-Gm-Message-State: AOJu0YyCfXU/EGyqRm3DKWFf/NWTcMbWS+4wYCsOFLZtXMhwmH65Mje4 hnL6grQSKmgeLuPfDZT8j3s= X-Received: by 2002:a17:907:775a:b0:9b0:169b:eee2 with SMTP id kx26-20020a170907775a00b009b0169beee2mr4068950ejc.10.1695583576620; Sun, 24 Sep 2023 12:26:16 -0700 (PDT) Received: from localhost.localdomain (82-149-12-148.dynamic.telemach.net. [82.149.12.148]) by smtp.gmail.com with ESMTPSA id z21-20020a1709063a1500b0099d0c0bb92bsm5317632eje.80.2023.09.24.12.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:26:16 -0700 (PDT) From: Jernej Skrabec To: mripard@kernel.org, wens@csie.org Cc: airlied@gmail.com, daniel@ffwll.ch, samuel@sholland.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH 4/7] drm/sun4i: Don't show error for deferred probes. Date: Sun, 24 Sep 2023 21:26:01 +0200 Message-ID: <20230924192604.3262187-5-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230924192604.3262187-1-jernej.skrabec@gmail.com> References: <20230924192604.3262187-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 24 Sep 2023 12:26:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777959897663849507 X-GMAIL-MSGID: 1777959897663849507 Drivers probing in display pipeline can be deferred for many reasons. Don't print error for such cases. Signed-off-by: Jernej Skrabec Acked-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 6a8dfc022d3c..b4816a1b0be3 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -88,7 +88,8 @@ static int sun4i_drv_bind(struct device *dev) ret = component_bind_all(drm->dev, drm); if (ret) { - dev_err(drm->dev, "Couldn't bind all pipelines components\n"); + dev_err_probe(drm->dev, ret, + "Couldn't bind all pipelines components\n"); goto cleanup_mode_config; } From patchwork Sun Sep 24 19:26:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 144156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp873715vqu; Sun, 24 Sep 2023 16:01:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+x6EI8PgB2gATwsfiwoZ27j2VX8rM/dVQPP4QujLyNffnguJp9lbLrZ4TY5BeXqDW54ah X-Received: by 2002:a05:6a21:6da5:b0:159:6b5c:5653 with SMTP id wl37-20020a056a216da500b001596b5c5653mr3752644pzb.37.1695596476772; Sun, 24 Sep 2023 16:01:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695596476; cv=none; d=google.com; s=arc-20160816; b=CIGbKrRYR1BKU7YLAhVAbo8ebfhZkDDygjkds/an2Ws5Qr1W2iR3G9Te3NsUhhTtSS tq/dVMZmrF+g/Nooq3taamyTDqwC5sB/bitJwx8VxyItwoB7DE376fFocLWpd7fWEYtS +h8uvhZsi6TYoG1ZisTua34DjPcDyF7cUSDo3nVPu3+9zuKMlZVMyIfWP3/g6cwgg1ap JAgvIiXj1TbmrsJtRGhRE6GbpvNxhRd9LCYicJ6Uu0aYTvcNEaBxVfi41FBZ5l9AftZF xOoZWfdaUD/EhgonzAY3+hsHOw7e6JFGxT2uKI/qxdEk9eNhQ+wnsf/VFQ2U/HPNkSEO TFwA== 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 :dkim-signature; bh=MFf1cGltxf8drTRitrLUgd7Y0FznH+yCbskJSQDkt2Q=; fh=ythuQA64SNE7wujD11OFYiH8HaGGRVN0m1KGJA3eIXU=; b=eFAWpkZjwzgXU60hQwVwvDPv6rgsBO1WAyWDKSG1q0h4HRC7Yqm3W3rRs7cAI0gYgb dCXzQCas6aFFI2zP/bRUSh48HbB24UQ4bdxHBp4bscwn+eOQmZmLOErx1KFaA1cEq3Rq CbN4JbgJSRR+1T1A99CaOS9NIiS7iQkiguLsQVB5uIUNtDCR7w1iODVoC+lFWkswcFx5 O96DTtYJmKNHVPE1sKFrJIbP44oxUZXKX//QlnSEPBXx0RkBK7X68vOE8tURZoZr65iZ GY2/WeVMPbIJUA9xzdkfiB0FkgkZ59BZyaN7ltmoBvmMBEAa9zV1bCEnA6Ga5rr0xbbA 7Uzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DZhOtr5j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id pc2-20020a17090b3b8200b0027740943ec2si2884888pjb.158.2023.09.24.16.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 16:01:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DZhOtr5j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id D2B0F806A856; Sun, 24 Sep 2023 12:27:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230391AbjIXT0f (ORCPT + 30 others); Sun, 24 Sep 2023 15:26:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbjIXT0Z (ORCPT ); Sun, 24 Sep 2023 15:26:25 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 123D9FB for ; Sun, 24 Sep 2023 12:26:19 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9ad810be221so635099066b.2 for ; Sun, 24 Sep 2023 12:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695583577; x=1696188377; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MFf1cGltxf8drTRitrLUgd7Y0FznH+yCbskJSQDkt2Q=; b=DZhOtr5jdCqctyv2RQkA/Pf11FbJKVVQG+oykz40ViA+0ytUCDykLUY0lbChQYNXBC ChptrjhuLCVY1atSVFfZZNGuupHXND97VolFC3cKtwe3Hne5x+dINvcdT0r2R7GNCyxC qukF7Pk9LambNvqKYseRyc5M1dF2H9dPcprR9eI6O1QBe/8pL8U+WAOoH0TlOxoza3RF +iUfqs+62Nx3Ua9v4aubaGimsOcT2QYkA9DxLOME+eNLq2QiUiGJeNqnf9S1Rzbm6ze6 fUnYFOo5gIHOYhzBPIfDTH4hS3Id4BMTnRT8p882I1/FXJyWbjpcKRSYAh5tkSoqbcwg d1gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695583577; x=1696188377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MFf1cGltxf8drTRitrLUgd7Y0FznH+yCbskJSQDkt2Q=; b=XHbqvwzzv426+J6iiwUmBUsd00LkQNwqJHIS1yNiFoWuhu4N5C8/tm1bWLzR8znh30 hBeHseBWEDSCCqve04RVwMWSYAZptslF8w1SSGlN9v7ybRV16uxky8t3RY32Ia2TyH0I 5vR4hJUf5OjoL9e7Y3k+0dRd/E7qbyQOYDcg6FdIE39+wjmhEDzFyfOZnziHVb0UhuOh VKmElUjZQj/VIst3ZgDw3SMTa87qXSMO/I4vyS519Mr0x9aLrNcXBn3thg7sEG/7Yk4D jk28CpTeb9vJuQsk34BGFlzzRaVf/NtGU0VUVG+cmNqfsZZ8Sk4F8/Ee2subvDWVzc3b jsWQ== X-Gm-Message-State: AOJu0YxDIYi7FBwkIBXVopOIMjNz7qnk8e+TIaxJMK4NKR4/aiuuTNS4 470YtJM1Zo134IpNNdJ0iMw= X-Received: by 2002:a17:906:210a:b0:9a3:c4f4:12de with SMTP id 10-20020a170906210a00b009a3c4f412demr4134394ejt.37.1695583577533; Sun, 24 Sep 2023 12:26:17 -0700 (PDT) Received: from localhost.localdomain (82-149-12-148.dynamic.telemach.net. [82.149.12.148]) by smtp.gmail.com with ESMTPSA id z21-20020a1709063a1500b0099d0c0bb92bsm5317632eje.80.2023.09.24.12.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:26:17 -0700 (PDT) From: Jernej Skrabec To: mripard@kernel.org, wens@csie.org Cc: airlied@gmail.com, daniel@ffwll.ch, samuel@sholland.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH 5/7] drm/sun4i: dw-hdmi: Split driver registration Date: Sun, 24 Sep 2023 21:26:02 +0200 Message-ID: <20230924192604.3262187-6-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230924192604.3262187-1-jernej.skrabec@gmail.com> References: <20230924192604.3262187-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 24 Sep 2023 12:27:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777961770907181444 X-GMAIL-MSGID: 1777961770907181444 There is no reason to register two drivers in same place. Using macro lowers amount of boilerplate code. Signed-off-by: Jernej Skrabec --- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 27 +------------------------- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 2 -- drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 3 ++- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c index 93831cdf1917..d93e8ff71aae 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c @@ -378,32 +378,7 @@ static struct platform_driver sun8i_dw_hdmi_pltfm_driver = { .of_match_table = sun8i_dw_hdmi_dt_ids, }, }; - -static int __init sun8i_dw_hdmi_init(void) -{ - int ret; - - ret = platform_driver_register(&sun8i_dw_hdmi_pltfm_driver); - if (ret) - return ret; - - ret = platform_driver_register(&sun8i_hdmi_phy_driver); - if (ret) { - platform_driver_unregister(&sun8i_dw_hdmi_pltfm_driver); - return ret; - } - - return ret; -} - -static void __exit sun8i_dw_hdmi_exit(void) -{ - platform_driver_unregister(&sun8i_dw_hdmi_pltfm_driver); - platform_driver_unregister(&sun8i_hdmi_phy_driver); -} - -module_init(sun8i_dw_hdmi_init); -module_exit(sun8i_dw_hdmi_exit); +module_platform_driver(sun8i_dw_hdmi_pltfm_driver); MODULE_AUTHOR("Jernej Skrabec "); MODULE_DESCRIPTION("Allwinner DW HDMI bridge"); diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h index 18ffc1b4841f..21e010deeb48 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h @@ -194,8 +194,6 @@ struct sun8i_dw_hdmi { struct reset_control *rst_ctrl; }; -extern struct platform_driver sun8i_hdmi_phy_driver; - static inline struct sun8i_dw_hdmi * encoder_to_sun8i_dw_hdmi(struct drm_encoder *encoder) { diff --git a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c index 489ea94693ff..f917a979e4a4 100644 --- a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +++ b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c @@ -729,10 +729,11 @@ static int sun8i_hdmi_phy_probe(struct platform_device *pdev) return 0; } -struct platform_driver sun8i_hdmi_phy_driver = { +static struct platform_driver sun8i_hdmi_phy_driver = { .probe = sun8i_hdmi_phy_probe, .driver = { .name = "sun8i-hdmi-phy", .of_match_table = sun8i_hdmi_phy_of_table, }, }; +module_platform_driver(sun8i_hdmi_phy_driver); From patchwork Sun Sep 24 19:26:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 144209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp994841vqu; Sun, 24 Sep 2023 22:38:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/ESVYe/rz03Dwn0aSdFZfr7O/Lm2uCU6/B1zTt5DBp7NNo5av1fY1mPn9wBt3unNesWuk X-Received: by 2002:a05:6a20:1451:b0:153:63b9:8bf9 with SMTP id a17-20020a056a20145100b0015363b98bf9mr7650396pzi.0.1695620330232; Sun, 24 Sep 2023 22:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695620330; cv=none; d=google.com; s=arc-20160816; b=LQrJiAKpXfx1dPC5p/GBFOGZMYUnesmx5gep9dzTl9mF7D+OUs8LEOZgrxVULFjk25 q34tPiU7I90ux8PGWAnt4iAXmjaGhguqm681Fi7IrxKwcUe2dlWETgp5RbOGxCh8rB2y NNWlQmuPZBGG7upb6Kf/zxQkMUntzcsNsUl9VZ4VWjt/JurYk+7LS3zixbwzQoUCKlg1 Vdd9jtQjGrlvxJ6BBqWiTCzhO5L9WiBvdmsMlziSfZl/EL/QcAsyjcWoPbryrMw12HQh WQtVUI8NNQwFKZnJtjPDHIvbd23iJD2sbGzKjS3znsxF6aYy9p2r/5S88HKQw8+qzOPU 9Dvg== 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 :dkim-signature; bh=8y8h3EEz9VirQFhjmojPuvqBkQuqu/oUUWDuJnG4W+c=; fh=ythuQA64SNE7wujD11OFYiH8HaGGRVN0m1KGJA3eIXU=; b=MEMPllXY7w3hfD+FNk6BmGQC/kBqIOj99wGtE8bmpKUeQJxpRkObaaz+ngv/pC7Yh1 6vmwQVhoYHg0yANSpIiJLlrIaZWK2Od0mmTzqCj2XGUqsa2hm16Mzxy7U0bBmRIDK52Y XKNOvcZ5oU9MVHW42LgswCvdtzPVquq8ZWxB7BDAj/iUM/1fXBCt6wdF/O3f3CTFp27u 1SRd6GIQh5p5OSbWmEeBnQaZO2wPBYjG/GpAb9wpvPbmynlyqhHcrmAUN1ZPxq3RlJaS DDo2ThWDjZ0qkzzppbcnzwf6Ct00f40/8z/IegJrCPn90o9eYPoYRxTJ4Szy2sleFL+2 y/fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=M490nm+Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id br12-20020a17090b0f0c00b002773af24826si3383056pjb.123.2023.09.24.22.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 22:38:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=M490nm+Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 8D9FF807D8CD; Sun, 24 Sep 2023 12:26:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230090AbjIXT0h (ORCPT + 30 others); Sun, 24 Sep 2023 15:26:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230289AbjIXT03 (ORCPT ); Sun, 24 Sep 2023 15:26:29 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1FC6103 for ; Sun, 24 Sep 2023 12:26:21 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2c108e106f0so83255011fa.1 for ; Sun, 24 Sep 2023 12:26:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695583580; x=1696188380; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8y8h3EEz9VirQFhjmojPuvqBkQuqu/oUUWDuJnG4W+c=; b=M490nm+YnzsS6uGhB710H9q5n9pSWJMhz7Du4/0xk4nZK0Ys+uQn4Rm8otYw8m9+1k u9xbfRQn1GzqHGa1iKRf6xcTxJzMbHVvJac+dMci9JaGylp++6jSvxebueL4FBTQxqvm dHpQ5ybxVUrq87WFvtFvt46SdGr1qYOuTqO2HtH7UH9Z7nB4iuBdMXj5O42c92goH7Nf +ak19+ncEObB/QnBYQHPJ6o8ucjL6Ync/7Vo1ZfqN9En8mKIEvahRPbkY0c5n4ICKTJM E0dKoHjHlFvHD7KTrFs/jAgx3/qAJW3yLpejl3eLAnGUvWqjt1/4wtwROgkNhPVRisUy YspA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695583580; x=1696188380; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8y8h3EEz9VirQFhjmojPuvqBkQuqu/oUUWDuJnG4W+c=; b=t+hP4j/ZlJBzOa1G3qZH/WS0/foeZ4OUZvm6f+nlfBe+EzBt/3+g/d5CPOZzwqhoyQ yrWb/5esaqa8yd5YJ4lBzyYl40+bGvWT0CN9+EclO9qJHPZKk43OMYqfX8PsGN2lD+JZ nALUaNVVFLEVCjUDvxeB6zLETOljcyQYTi+4GRBco6D46jmZEEX/IJXNQ1vmXd2dgUrJ 6rzSeiGGmAiAplmxOJyu5pWuhcKPK1WOsKw8yT8QHxWD+UXsrhahmm7pfN+dps1JMc9b qvaDsRYZyY8IlxKGBGzLQo2FW/5+P5EU/j3PsNWuGeLH4HVg0X2TzyDHHSADrgq8ffZJ AdmA== X-Gm-Message-State: AOJu0Ywfm2lQhyrqwjGwXFnusC3KFDL9mkYEyu45O/o9Myaauhy9j/ze D5R4zMRFJz6dduOqnTR0nmQ= X-Received: by 2002:a2e:2417:0:b0:2c0:2ab7:9ab5 with SMTP id k23-20020a2e2417000000b002c02ab79ab5mr4174912ljk.12.1695583579523; Sun, 24 Sep 2023 12:26:19 -0700 (PDT) Received: from localhost.localdomain (82-149-12-148.dynamic.telemach.net. [82.149.12.148]) by smtp.gmail.com with ESMTPSA id z21-20020a1709063a1500b0099d0c0bb92bsm5317632eje.80.2023.09.24.12.26.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:26:19 -0700 (PDT) From: Jernej Skrabec To: mripard@kernel.org, wens@csie.org Cc: airlied@gmail.com, daniel@ffwll.ch, samuel@sholland.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH 7/7] drm/sun4i: dw-hdmi: check for phy device first Date: Sun, 24 Sep 2023 21:26:04 +0200 Message-ID: <20230924192604.3262187-8-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230924192604.3262187-1-jernej.skrabec@gmail.com> References: <20230924192604.3262187-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 12:26:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777986783222929495 X-GMAIL-MSGID: 1777986783222929495 Let's check for phy device first. Since it uses much of the same clocks and resets it also lowers amount of possible deferred probes. While at it, don't report error for deferred phy probe. Signed-off-by: Jernej Skrabec Acked-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 35 +++++++++++++-------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c index 41f815a1faec..c1becd964326 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c @@ -173,11 +173,24 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, struct device_node *phy_node; struct drm_encoder *encoder; struct sun8i_dw_hdmi *hdmi; + struct sun8i_hdmi_phy *phy; int ret; if (!pdev->dev.of_node) return -ENODEV; + phy_node = of_parse_phandle(dev->of_node, "phys", 0); + if (!phy_node) { + dev_err(dev, "Can't find PHY phandle\n"); + return -EINVAL; + } + + phy = sun8i_hdmi_phy_get(phy_node); + of_node_put(phy_node); + if (IS_ERR(phy)) + return dev_err_probe(dev, PTR_ERR(phy), + "Couldn't get the HDMI PHY\n"); + hdmi = drmm_kzalloc(drm, sizeof(*hdmi), GFP_KERNEL); if (!hdmi) return -ENOMEM; @@ -185,6 +198,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, plat_data = &hdmi->plat_data; hdmi->dev = &pdev->dev; encoder = &hdmi->encoder; + hdmi->phy = phy; hdmi->quirks = of_device_get_match_data(dev); @@ -232,22 +246,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, goto err_assert_ctrl_reset; } - phy_node = of_parse_phandle(dev->of_node, "phys", 0); - if (!phy_node) { - dev_err(dev, "Can't found PHY phandle\n"); - ret = -EINVAL; - goto err_disable_clk_tmds; - } - - hdmi->phy = sun8i_hdmi_phy_get(phy_node); - of_node_put(phy_node); - if (IS_ERR(hdmi->phy)) { - dev_err(dev, "Couldn't get the HDMI PHY\n"); - ret = PTR_ERR(hdmi->phy); - goto err_disable_clk_tmds; - } - - ret = sun8i_hdmi_phy_init(hdmi->phy); + ret = sun8i_hdmi_phy_init(phy); if (ret) goto err_disable_clk_tmds; @@ -259,7 +258,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, plat_data->mode_valid = hdmi->quirks->mode_valid; plat_data->use_drm_infoframe = hdmi->quirks->use_drm_infoframe; plat_data->output_port = 1; - sun8i_hdmi_phy_set_ops(hdmi->phy, plat_data); + sun8i_hdmi_phy_set_ops(phy, plat_data); platform_set_drvdata(pdev, hdmi); @@ -310,7 +309,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, drm_bridge_remove(&hdmi->enc_bridge); dw_hdmi_remove(hdmi->hdmi); err_deinit_phy: - sun8i_hdmi_phy_deinit(hdmi->phy); + sun8i_hdmi_phy_deinit(phy); err_disable_clk_tmds: clk_disable_unprepare(hdmi->clk_tmds); err_assert_ctrl_reset: