From patchwork Thu Feb 15 22:04:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 201772 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp149261dyb; Thu, 15 Feb 2024 14:05:57 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVllRojNpZMz5Eohq+Sm0Uavvob5T1bWAbgjOvEim4bjtOp97goYi5Xrrlg4JpP3yb8sPktdYeZpCR/VZenwwvi03fN8g== X-Google-Smtp-Source: AGHT+IEgD4c0dnmroYco7VzVs7Ro2BP+/Mzo5FwXCYLdI5rNCapC/O1PExQd7rYPhW2LYiedL8Yq X-Received: by 2002:a92:c745:0:b0:363:a471:f945 with SMTP id y5-20020a92c745000000b00363a471f945mr3549687ilp.7.1708034757604; Thu, 15 Feb 2024 14:05:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708034757; cv=pass; d=google.com; s=arc-20160816; b=gUw9zkoyFSTb92QCfEWzxAPD7DahyV9x5lzMIPxGFQb5AqDQheOV/ktqYnHr4+Nyqs cXIopI6wQvykKGd3JVZQIssRxuRYHECSTFu6R2gdPg4D+GUpHHJLczbV3fWBphXwuKNo lRl7utoFPjfLaUh5BsPYrPmcZKjg1MOia576tsxoDTSLC1WKy5AiPQnGRXaIIwg82xWw lMuXVZsV5iqRmwaGuQzaloWvTN1IrrxFI4+3lThnutxipv3DbrBwzwd55JK2BZOg1qci spA2h4jXMI0Z89tp1gxi/AgjraolMdTtC4O7F1wZYpZw0naFs7fuXj+V7PpzMrxxKYzV Iqhg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=6rc6eGU7njaSrd3gOPv3RWA0Ip0OaiWxwVmzreal714=; fh=7xTi1bEpWXgFdhdBkF2cCfZM1QBi/zZg8uYNSmEt18E=; b=VdaGO1tif3H/K67PnSm7smnBlR2YHxxGLcRMH967WdcsjaU5KTWONXV1ufT2684jGR UwWC1OALjrXqB1dzmkyLcGMmcwN3yCKPVcsszvAHnKRkeLEgPUINgNOkMOt7F+VIxTIa VxHlVTTwUfu9a5ONMr7EiyOWtXfMDdLWCSOwmnPt6XNVMmwpeXfX1M8kjI+PFC5lJw0Q 6ullRyEQAmbCBx3es37KWJ+Y9uzsVld4wkxb2NiUOEqA/x9hF3WMpu3qVmqsYaFHXUzm vAXqPSSvmKvYAjT4k6PQJiFNq4hjPbsWl+g+Ek+ZeqasTIATDFYLlYfQ5/Kt3CfRb+fb f9bg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@googlemail.com header.s=20230601 header.b=CZJ2wMMY; arc=pass (i=1 spf=pass spfdomain=googlemail.com dkim=pass dkdomain=googlemail.com dmarc=pass fromdomain=googlemail.com); spf=pass (google.com: domain of linux-kernel+bounces-67731-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67731-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id z68-20020a633347000000b005dc85dc982asi1721836pgz.832.2024.02.15.14.05.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 14:05:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67731-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@googlemail.com header.s=20230601 header.b=CZJ2wMMY; arc=pass (i=1 spf=pass spfdomain=googlemail.com dkim=pass dkdomain=googlemail.com dmarc=pass fromdomain=googlemail.com); spf=pass (google.com: domain of linux-kernel+bounces-67731-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67731-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 6E2C5285A2E for ; Thu, 15 Feb 2024 22:05:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0ABB2145329; Thu, 15 Feb 2024 22:05:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="CZJ2wMMY" Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72BFC1420D4; Thu, 15 Feb 2024 22:05:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708034711; cv=none; b=txCrd9yl+JzBn2q2HchU8td9P/sT/iOYVC5GxzRcJ2oPV1N/sazI6ICuqsjRO10gSuFPM0yjx7MBDaZePG0mCFluu6N3ITaq0oxj4KF110gOMHIfKZKlQB+hFE5zwSLVakEoOOJTho5Hby/hgcST81s7HlvX5JZwPvYu/5IA+mY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708034711; c=relaxed/simple; bh=ipHGcTNFt2L60EUgIOT6z3XhY/RM+pxVLwQKS22O3Sc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Fqf3YqguAj6iR7IqeFMBJ8OLwh4nBtgjDwCbVTx+Fs5Y0Ghe7EysZGfnajsef4NNYY57+FbeIdIau9X8yevgN3G3WaFDdTFgBYOTo8BVPRPJfjfWbwuAUl4rDPoyQGpxnvEctY9GYedX2OfDMOAJiNB1QDqzlVXISRsF6QeUuyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=CZJ2wMMY; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-511a4a1c497so1558322e87.3; Thu, 15 Feb 2024 14:05:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1708034707; x=1708639507; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6rc6eGU7njaSrd3gOPv3RWA0Ip0OaiWxwVmzreal714=; b=CZJ2wMMYvYxC67/KJQ6kbOGnA2WFKkcQUwIfcLd8s4djE5DYi5BVyM/bnjV4yk4AIg XIA/ZCB/jb6s9IORTPgGpPBmK0SXCaCdzpe+hVtlQhrHWlCPslcafwwOthsFwsQ/o7GS Uftc0W8Q2YyaTcfyT4LHDjSZS+PSsLT1EAENHrmYN21uqKYZwknksd7QY8oRojMPfAZl 3l1umMYwNFYxQStYGAXX5CusCBrMzkpLlxedRLpWZEt2xegZ29QBhnyXIpGj0p2foDSg s2SiYYkz7F1WjSWldFdlR07glpd9OL0oX4nUVSqmFZ34BZfc+i1VkUKWPmnT/jskOVJN 5CNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708034707; x=1708639507; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6rc6eGU7njaSrd3gOPv3RWA0Ip0OaiWxwVmzreal714=; b=oXwBruRCqb4clQZ58slO9OjmfjSFEwlmKDPy+UUx0eSLi5mywSFEdq4Llw/JSDiM6L R0L7cq4rseIDRcWVbNLQK/S9E97CO73K1QYwBRkUsVcXQUUYItVgOr34hfMD32XfrzQ5 3iAogDb+pw1ga4wQ1my9yiNxdnWNIoK0zHLYphp4FkINYO0HeZUs65hQpFAoxGJKcoTi aXXZgFZLcYHd3CdRFGPabHj2VQUePlMhNryOxzRD+zr5atfVK1G4frBQMo6De/3kaEdQ alxjx+suKnfTkHlvHBG++MC/6YITqlx9MyU7kqlPCWCUIDZQYzRgHYW6Syi9+NQqRgov jr6A== X-Forwarded-Encrypted: i=1; AJvYcCU+29pBr1eftuD7GQM58uB0rhGeyeifNrPTMjSmd4wIlXHmDpvLHfK4cHS4fK3D6wEebmimKXSI/Ap9+zO+YYFDfBI3KoHIiz8tnTUaj58eqvRXDQSEKHcLnxbnvrJNbCEuj2Zf X-Gm-Message-State: AOJu0Yyf/hukki069X4l8s+moEFnpTitd7pFzLT8p14X34D7gGc1m2vc oGOx0KhiQr95OiOi8ieBbFR9zZHj8wsymWhQ9gDbB74axaOM3Mzz X-Received: by 2002:a19:e054:0:b0:511:79ef:529 with SMTP id g20-20020a19e054000000b0051179ef0529mr2474521lfj.55.1708034707051; Thu, 15 Feb 2024 14:05:07 -0800 (PST) Received: from localhost.localdomain (dynamic-2a01-0c22-7b54-ff00-f22f-74ff-fe21-0725.c22.pool.telefonica.de. [2a01:c22:7b54:ff00:f22f:74ff:fe21:725]) by smtp.googlemail.com with ESMTPSA id p17-20020a1709060e9100b00a3d11feb32esm945630ejf.186.2024.02.15.14.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 14:05:06 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, dri-devel@lists.freedesktop.org Cc: neil.armstrong@linaro.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, khilman@baylibre.com, jbrunet@baylibre.com, adrian.larumbe@collabora.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Blumenstingl , stable@vger.kernel.org, Steve Morvai Subject: [PATCH] drm/meson: Don't remove bridges which are created by other drivers Date: Thu, 15 Feb 2024 23:04:42 +0100 Message-ID: <20240215220442.1343152-1-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791004253515581818 X-GMAIL-MSGID: 1791004253515581818 Stop calling drm_bridge_remove() for bridges allocated/managed by other drivers in the remove paths of meson_encoder_{cvbs,dsi,hdmi}. drm_bridge_remove() unregisters the bridge so it cannot be used anymore. Doing so for bridges we don't own can lead to the video pipeline not being able to come up after -EPROBE_DEFER of the VPU because we're unregistering a bridge that's managed by another driver. The other driver doesn't know that we have unregistered it's bridge and on subsequent .probe() we're not able to find those bridges anymore (since nobody re-creates them). This fixes probe errors on Meson8b boards with the CVBS outputs enabled. Fixes: 09847723c12f ("drm/meson: remove drm bridges at aggregate driver unbind time") Fixes: 42dcf15f901c ("drm/meson: add DSI encoder") Cc: stable@vger.kernel.org Reported-by: Steve Morvai Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong --- This issue was reported by Steve off-list to me (thanks again for your patience and sorry it took so long)! The Meson8b VPU driver is not upstream, but the problematic code is. Meaning: This issue can also appear on SoCs which are supported upstream if the meson DRM driver probe has to be re-tried (with -EPROBE_DEFER). That's why I chose to Cc the stable list. drivers/gpu/drm/meson/meson_encoder_cvbs.c | 1 - drivers/gpu/drm/meson/meson_encoder_dsi.c | 1 - drivers/gpu/drm/meson/meson_encoder_hdmi.c | 1 - 3 files changed, 3 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/meson/meson_encoder_cvbs.c index 3f73b211fa8e..3407450435e2 100644 --- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c +++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c @@ -294,6 +294,5 @@ void meson_encoder_cvbs_remove(struct meson_drm *priv) if (priv->encoders[MESON_ENC_CVBS]) { meson_encoder_cvbs = priv->encoders[MESON_ENC_CVBS]; drm_bridge_remove(&meson_encoder_cvbs->bridge); - drm_bridge_remove(meson_encoder_cvbs->next_bridge); } } diff --git a/drivers/gpu/drm/meson/meson_encoder_dsi.c b/drivers/gpu/drm/meson/meson_encoder_dsi.c index 3f93c70488ca..311b91630fbe 100644 --- a/drivers/gpu/drm/meson/meson_encoder_dsi.c +++ b/drivers/gpu/drm/meson/meson_encoder_dsi.c @@ -168,6 +168,5 @@ void meson_encoder_dsi_remove(struct meson_drm *priv) if (priv->encoders[MESON_ENC_DSI]) { meson_encoder_dsi = priv->encoders[MESON_ENC_DSI]; drm_bridge_remove(&meson_encoder_dsi->bridge); - drm_bridge_remove(meson_encoder_dsi->next_bridge); } } diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c index 25ea76558690..c4686568c9ca 100644 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c @@ -474,6 +474,5 @@ void meson_encoder_hdmi_remove(struct meson_drm *priv) if (priv->encoders[MESON_ENC_HDMI]) { meson_encoder_hdmi = priv->encoders[MESON_ENC_HDMI]; drm_bridge_remove(&meson_encoder_hdmi->bridge); - drm_bridge_remove(meson_encoder_hdmi->next_bridge); } }