From patchwork Mon Mar 5 08:57:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 130622 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2451836lja; Mon, 5 Mar 2018 00:58:10 -0800 (PST) X-Google-Smtp-Source: AG47ELunt14SIMc77Ag2j5u5nfjbCwNc6qi3KCTNB0rc5UQuo5Tot5ghRAUeMUPMeK6UcEiG7f8d X-Received: by 10.101.71.138 with SMTP id e10mr12050210pgs.317.1520240290666; Mon, 05 Mar 2018 00:58:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520240290; cv=none; d=google.com; s=arc-20160816; b=rLTY19Nz0/1KZwxvUKA91Ub3TtSZu+9PMOumDQXeA5clqFibMsNGlreC2WftGNyMZj 9cN3u4ojluYh+vJuwFPlBzWtMFpdo8h+23wJFr6ZTx3qSnz7dGHDT/gCvdG1mLIcwCav dL5PdPr5JVksE4PI/cd8RWKW4PIVncqGwBjVoBe6u7Oq1h6sI4dquWW84VyUD2D2tYQy vjrsU2TBacItEB+v84hzW44+sqxJn6/KvvUxMPUVmYygc4cTvBWyjzSoJTr2c3tdLL+6 0uiUcy3Oy+mixvCFqnuUfjv30XE7fdIwTDDfiStWRg4B1kFwpkWlElTn4GW070cV/JOB rzjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:in-reply-to :message-id:date:subject:cc:to:from:content-transfer-encoding :mime-version:dkim-signature:dkim-filter:arc-authentication-results; bh=OPcq3/FceKCOLkv+ujkgMLSr+/ekj7qylYAWwEW8/lU=; b=iJzJsanq+AcCkIfhw6w8M9oG+zkY1OujYmzkYqcbhUxqfmMAE3W7dBxqPCcFgGdUwr 4CU09+4Gvcuinkv4LSniW8AdARJiOh5wP0jtL0/PoWovbb5dpRgJ/m0uMuhO1fTNfNaB 4okdmlmsXSUMP3rxRfVSkzklTFvqBENBYPG2xAdWn30yARnHN9jmD1t8SMHEV5HaCyMb vfZMRNx+/kTnKBZHkkqGxfL+eRMIYEGh78WjzGqbBhJ1frunhlwO+p173FrjTQ+R/cu0 B0BjXOwj96Y53nwVq1cN9M60CQyWcwpzbVldxcZXJ4fZGg/YAd9TFmghACKGYQfzC9DS 8Oyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=l9ZtphTY; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1-v6si8947909pld.744.2018.03.05.00.58.10; Mon, 05 Mar 2018 00:58:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=l9ZtphTY; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933267AbeCEI6K (ORCPT + 3 others); Mon, 5 Mar 2018 03:58:10 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:39579 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933484AbeCEI6I (ORCPT ); Mon, 5 Mar 2018 03:58:08 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180305085806euoutp0189b881be9349d1786edfe33aa7bee9a5~Y_nxjhJF72395923959euoutp01r; Mon, 5 Mar 2018 08:58:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180305085806euoutp0189b881be9349d1786edfe33aa7bee9a5~Y_nxjhJF72395923959euoutp01r DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1520240286; bh=VoV2r9QqDDw8wZkPMQXb+P1SYVLEOxIzLC4YxQYcNNs=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=l9ZtphTYdqlKy2hKFF1LIlVXpkGUDigBySLEoMJsQxblrdLmp8BSr+IEQIPfZvlUh 1zAZ8Ras6JCCufPKQDiRDsAKSp7IzkIZJZoMoAfr/xpLj6LODkyAQmc/hazl4hDAnY AfFqyArMEwQ0tkHykefLHOJ+SuNCQCdupTJcSBdY= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180305085805eucas1p12f8053e4ee947d993f37c0e31fa56b12~Y_nwpyVjC1090610906eucas1p1g; Mon, 5 Mar 2018 08:58:05 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id A1.C6.17380.D960D9A5; Mon, 5 Mar 2018 08:58:05 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180305085804eucas1p10709830a36b02a28a6cb74827968f64d~Y_nvxqmd81411514115eucas1p1J; Mon, 5 Mar 2018 08:58:04 +0000 (GMT) X-AuditID: cbfec7f4-6f9ff700000043e4-1d-5a9d069d8e8a Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 69.74.04183.C960D9A5; Mon, 5 Mar 2018 08:58:04 +0000 (GMT) MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset="UTF-8" Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P5400MEY0WMAI90@eusync1.samsung.com>; Mon, 05 Mar 2018 08:58:04 +0000 (GMT) From: Marek Szyprowski To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: Marek Szyprowski , Archit Taneja , =?utf-8?q?Heiko_St=C3=BCbner?= , Thierry Escande , Tomasz Figa , Sean Paul , Bartlomiej Zolnierkiewicz , Laurent Pinchart , Thierry Reding , Sandy Huang , Enric Balletbo i Serra , Andrzej Hajda , Douglas Anderson , Haixia Shi , Zain Wang , Lin Huang , =?utf-8?q?St=C3=A9phane_Marches?= =?utf-8?q?in?= , Caesar Wang Subject: [PATCH 1/3] drm/bridge: analogix_dp: Don't power bridge in analogix_dp_bind Date: Mon, 05 Mar 2018 09:57:39 +0100 Message-id: <20180305085741.18896-2-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.15.0 In-reply-to: <20180305085741.18896-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA01Sa0hTYRjuO7cdtVNns/Ltag2CLmbZjS+yKFA4EVFR9GOCtfIwxTllU8ug Gpk2LZfT7DIvdBlSYjc1XWarliloq8xS1GYZIV0chjNUKs15ivr3fM/l5XlfPpZUdNKz2Dhd sqjXqbVKxp+qbhh5sayYKVatOG9mcOfN5zQ+bvLQ+M6FWzR2lT5m8Ovv/Qwu73IiPPbhK42L 847g4dtNJD5Z9YHAWRabDA+8HyPxhRcOAt+od8twifMHwu7bLoS9GaMMPvPmFYNHaksofDK9 lMCZ7TM2TRcKjS2U0GrOIQS724aEe1a3TCg0XaSFd6caCaHSdkz4ZX1ICeaqMiTUtJWQgrdi 3o4AlX94jKiNSxX1yzfu8491tlvIJBd3qL/ZRRlRW0A28mOBXw2Pn9aR2cifVfDXEBQ+MlPS w4ug92Mh+uuqrytjJKEUgbHuG+kTOF4Ow/nd4wmWJflgqH8V76NJfjHcvX9LJvmNBLz92cX4 BIYPg2xP9gSexmthwNSHpEABAxY3+HAgvwcyh1soH6b4hdDzMp3wzef4DfDeoZP6BMPVoXsT Y/z4jVB0uWFiA+CbZDCWc/xP6QjwOE2EhAPhS2OVTMJzoDX/FCXhY2Aeqiek8GkED04U/Ams hyeNLbRUbgrkVZ8nfSWA58CUqZAsAhizummJ3gzXexJ9tIK3IGhum5eL5lr/u5D134Ws/13o EiLLUJCYYkjQiIaVOvFgqEGdYEjRaUIPJCZUoPEf1zzaOGhHtT/3OxHPIuVkzq4rUilodaoh LcGJgCWV07hU7zjFxajTDov6xL36FK1ocKLZLKUM4qIXHVUpeI06WYwXxSRR/1clWL9ZRrTO EeOS14i13l3ykeTIjkkZF+XLO5YO7MafB642KCodM6vjy4MiX0ZVpO1MCb8y4m6qIYwncgbL d1Z2RkesimtV3Xm2brA6wGLXhIZsi+1enXUuUv4mj8wyfbI5pvauba0KORu1fcGh+b9yPeHO h21bf0xaU8llaLS2vgPpn7eEdygpQ6w6bAmpN6h/AxPdO4ptAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHIsWRmVeSWpSXmKPExsVy+t/xy7pz2OZGGTTuE7O4te4cq0VTx1tW i40z1rNanF12kM3iytf3bBZrbh9itPj/6DWrxdxJtRY/Npxitmjf8ojJonPiEnaLTw/+M1vM OL+PyWLtkbvsFvMO/Wa0uLvhLKPF59Z/bBb9Vy+xWfzcNY/For15GZNF23UxB1GP2Q0XWTwu 9/Uyeey4u4TRY+esu+wesztmsnrc7z7O5LF5Sb3H31n7WTz6tqxi9Nh+bR6zx+dNcgHcUVw2 Kak5mWWpRfp2CVwZh65PZC44y1vx/vRZlgbGa9xdjJwcEgImEkf2rGLrYuTiEBJYwihx5OIq JpAEr4CgxI/J91i6GDk4mAXkJY5cygYJMwuoS0yat4gZor6JSeL9z9tsIAk2AUOJrrddYLaI QI7E4u/TwYYyC8xkk1j26R5YQlggTKLtx0UWEJtFQFXi4YVmJpAFvAK2Eg/25UEcJA/UuxOs nFPATmLOwmPMILYQUMm9x/eYJzDyz0Jy3iyE82YhOW8BI/MqRpHU0uLc9NxiI73ixNzi0rx0 veT83E2MwFjcduznlh2MXe+CDzEKcDAq8fAKFM6JEmJNLCuuzD3EKMHBrCTCW/YZKMSbklhZ lVqUH19UmpNafIhRmoNFSZz3vEFllJBAemJJanZqakFqEUyWiYNTqoHReKWYyeOsphf2k7KN OEOtGue822ilFapRa/LnW3bsos3bKn48bxRZ+elaUs71gl3Hm4IF/n85Jqp/I9pEXr5Nr1JX YWZykeQpqy37H9at99ng6Gb67qYr8+cWEdOiXZolPZ5Kp1MXfBHRrs05dfjKPtni9+nTBRY4 XZlqte77AfapLxeUTpyvxFKckWioxVxUnAgA3AANZsECAAA= X-CMS-MailID: 20180305085804eucas1p10709830a36b02a28a6cb74827968f64d X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180305085804eucas1p10709830a36b02a28a6cb74827968f64d X-RootMTR: 20180305085804eucas1p10709830a36b02a28a6cb74827968f64d References: <20180305085741.18896-1-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org From: zain wang The bridge does not need to be powered in analogix_dp_bind(), so remove the calls to pm_runtime_get()/phy_power_on()/analogix_dp_init_dp() as well as their power-off counterparts. Cc: Stéphane Marchesin Signed-off-by: zain wang Signed-off-by: Caesar Wang [the patch originally just removed the power_on portion, seanpaul removed the power off code as well as improved the commit message] Signed-off-by: Sean Paul Signed-off-by: Thierry Escande Signed-off-by: Marek Szyprowski --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 10 ---------- 1 file changed, 10 deletions(-) -- 2.15.0 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Tested-by: Heiko Stuebner Reviewed-by: Heiko Stuebner diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 3f7a796b27e4..8475749baae5 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1378,11 +1378,6 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, pm_runtime_enable(dev); - pm_runtime_get_sync(dev); - phy_power_on(dp->phy); - - analogix_dp_init_dp(dp); - ret = devm_request_threaded_irq(&pdev->dev, dp->irq, analogix_dp_hardirq, analogix_dp_irq_thread, @@ -1410,15 +1405,10 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, goto err_disable_pm_runtime; } - phy_power_off(dp->phy); - pm_runtime_put(dev); - return dp; err_disable_pm_runtime: - phy_power_off(dp->phy); - pm_runtime_put(dev); pm_runtime_disable(dev); return ERR_PTR(ret); From patchwork Mon Mar 5 08:57:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 130623 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2451846lja; Mon, 5 Mar 2018 00:58:12 -0800 (PST) X-Google-Smtp-Source: AG47ELtD5lH1xoI9MSLaU2uBFbTiDgIfYHNsIdOoFdjwSd9OPhS6D598kHjt5TXgVXkNRbv8Zl8w X-Received: by 2002:a17:902:4545:: with SMTP id m63-v6mr12174970pld.15.1520240292003; Mon, 05 Mar 2018 00:58:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520240291; cv=none; d=google.com; s=arc-20160816; b=vSAxn5wp24WlFnrimh2ESg4vCHJ8chlk+U8gCPwJO2SAwtCmOD14FGCrAT8K2q1dkw qzA25CMsstpcMML5R06XH66g3XepUV5IFR1rmms/bARCO61X1+oJsjCYr1wABVH9QlfL 2DqRhufWwXk2KAZdhx6rNrZC7tZyuioDg8YrW37YZrKx8k2FHUxY5zjFG2/Q9LgsTyZa H6JuOy/7pHzMGtMlvrt/BWGfd6biU53/g2Z2VA5Skp8uHAq9bqveF2nGyJrvyKgcz2Ds lf1NddgkoyFNXeVStZBsz+y7iMjnGr+IqznpszYWRgIW02KoaLSYBSATUvSOhfOCP9tq CfKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=TCfDfKXAUe1M60KIDuUEXmCCWrPloPcrVp0oImGqo5U=; b=AsJg+EGaQrPKfr8bDXaYemNpOGfSyHXSzcBIa+7xICRndKEsodEr/tZ3H1Sy6T4BYG shQnpjQSTkWBuzO2uhwiBOj7UEhd7wUReMx8jfJX5WonkcFjqDgwqJmwm9UOZFoAIocY pc40h1L4CcSmGBUW3uS0S/LeLZVtUVaByrJw6vqqg7OXUwnJp6cqp5ppI+Mzm4olztvG el26gGpOD8sk/s6TDQpYuz7DUpfCFoUA8n6o9yrMur5IN0ItizpBVuyMMCNA2GirNyzM uILolFETYlW77tb3TgUNf0XlamiBx6ee2wWz+mpmyzx4XBt8E2Aeq6C3xx2lkqAKK+Hk 3JOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=cdu3tbCF; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1-v6si8947909pld.744.2018.03.05.00.58.11; Mon, 05 Mar 2018 00:58:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=cdu3tbCF; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933484AbeCEI6L (ORCPT + 3 others); Mon, 5 Mar 2018 03:58:11 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:39589 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933491AbeCEI6J (ORCPT ); Mon, 5 Mar 2018 03:58:09 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180305085807euoutp0165e6ec3b1d50ca804489aa97fbcb5758~Y_nyaO_bQ2387723877euoutp010; Mon, 5 Mar 2018 08:58:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180305085807euoutp0165e6ec3b1d50ca804489aa97fbcb5758~Y_nyaO_bQ2387723877euoutp010 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1520240287; bh=57KaNWJ6guqoQmLx4kMXs7dxo6OYcCRPNcq4/6Gu90s=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=cdu3tbCF1YiOkS1tb6V5sMiGN4skt9NC4jQHWro423s53qoWWLN+4JjsCCYip+c/w qjDtM7l4KAHRI2s1WV2nYNlP+8KUhufrQ8GbdMXjz8kxWs7PDH4Dq5I4qhwC5ki4tt 2KauM69ws9zdjKAXMZCICHOO9XL1p5BSRolF71Tw= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180305085806eucas1p174d39e8acaf9941cac09d7ff3869bbd9~Y_nxlvKuw0637906379eucas1p1J; Mon, 5 Mar 2018 08:58:06 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 35.F8.10409.E960D9A5; Mon, 5 Mar 2018 08:58:06 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180305085805eucas1p23b768fec0ab88387084b7b6bfc7c7b53~Y_nwyv_yI2292322923eucas1p26; Mon, 5 Mar 2018 08:58:05 +0000 (GMT) X-AuditID: cbfec7f5-f95739c0000028a9-76-5a9d069ee833 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 6E.E1.04178.D960D9A5; Mon, 5 Mar 2018 08:58:05 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P5400MEY0WMAI90@eusync1.samsung.com>; Mon, 05 Mar 2018 08:58:05 +0000 (GMT) From: Marek Szyprowski To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: Marek Szyprowski , Archit Taneja , =?utf-8?q?Heiko_St=C3=BCbner?= , Thierry Escande , Tomasz Figa , Sean Paul , Bartlomiej Zolnierkiewicz , Laurent Pinchart , Thierry Reding , Sandy Huang , Enric Balletbo i Serra , Andrzej Hajda , Douglas Anderson , Haixia Shi , Zain Wang , Lin Huang Subject: [PATCH 2/3] drm/bridge: analogix_dp: Postpone enabling runtime power management Date: Mon, 05 Mar 2018 09:57:40 +0100 Message-id: <20180305085741.18896-3-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.15.0 In-reply-to: <20180305085741.18896-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSa0hTYRjHfc9tZ9bq5djlxZbJspKglhn4RhcK+nC+lBLUh9Ft5XFJc9aO 0wxsp9KaK+cFJPOWlYmIeccblrW0QRfFtAvKMlS6qVkOUyFnuq1v/+f5/57nzwMPS3IZdCAb a0gQjAatXsX4U40vZru2FDNFmm33nSzur+qi8VXLOI1r86pp/KbsGYP7piYYXDlgB3h+aJTG RTkpeKbmJYlvNAwROD27VIYnP8+TOK/7CYEfdThl2FnzBmBXmpvBme/eMni2tZjC1z+s2hfA F0g9FN9ryyD4Zmcp4FvynTK+wHKH5gdvOgi+vtTMz+W3U7ytoQLwTe+LSd5VFxS1ROO/O1rQ xyYKRvXeU/5nv9WVk+dvhV7szXpKS2BeZQVyFsEdqL51lrACf5aD5QC1jUvAW7gASmu7S/+n pP4J0muUAdRZ9thHSQRy/HlHLlIMDEPWcSuzqFdAPZq0jHkgEtbS6NFAC1g0AqAGtbvzPBAF N6CKyivUolbAPahveJTwxq1DD6ZbPIwc7kWF9154ohG8JkODr39TXugA+tHpZrw6AP1wNMi8 WonSLc98i8zINt1BeIdvAfQ4Nddn7ELPHT2e40i4DOU03l5IYBf6CmS5znkRHk2OpPv270eZ rjnPlRzMBmh6ZmMWCCwBfhVgtWAS43SCGG4QkraK2jjRZNBtPRMfVwcWnuSV2zHVDJ78PW0H kAWqpQp4oVDD0dpEMTnODhBLqlYoEl0LLUW0NvmSYIw/aTTpBdEO1rCUarXiROhlDQd12gTh nCCcF4z/XYKVB0pg+34Urt6xMibqsJxeplTCTR+PUeXH7uu4fvnIzaH4kYEQW0HMrghlhOXL z+87yfcyv8qDhtoY8/eQ6OVLBoYdyl9vg+rpoKPm6s6cqkNqzjGWampqyYpOcUol9ofqquJA a3ZvcJIuTF/9NX995JHS4xMVuTDjaGRfcLe0du6TihLPasM2k0ZR+w8Um7RHIAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHLMWRmVeSWpSXmKPExsVy+t/xy7pz2eZGGbz9rmhxa905Voumjres FhtnrGe1OLvsIJvFla/v2SzW3D7EaPH/0WtWi7mTai1+bDjFbNG+5RGTRefEJewWnx78Z7aY cX4fk8XaI3fZLe5uOMto8bn1H5tF/9VLbBY/d81jsWi7LuYg7DG74SKLx+W+XiaPHXeXMHrs nHWX3WN2x0xWj/vdx5k8Ni+p9/g7az+LR9+WVYwe26/NY/b4vEkugDuKyyYlNSezLLVI3y6B K+PFphXMBT0aFZcnHGBtYPyv1MXIySEhYCLRcOs9cxcjF4eQwBJGiSc3rzFCOE1MEo/3/mEH qWITMJToetvFBmKLCORILP4+HcxmFtjKKvH3YxCILSwQJbG7rY8VxGYRUJVYtaaRBcTmFbCV uPL4NRPENnmg3p1gvZwCdhJzFh5jBrGFgGruPb7HPIGRZwEjwypGkdTS4tz03GJDveLE3OLS vHS95PzcTYzAUN927OfmHYyXNgYfYhTgYFTi4RUonBMlxJpYVlyZe4hRgoNZSYS37DNQiDcl sbIqtSg/vqg0J7X4EKM0B4uSOO95g8ooIYH0xJLU7NTUgtQimCwTB6dUA6P9j/+CiVapUz4f OKWVZ3gxI7WkYPGu3/1V53f/spiotWfBPpbVi+e4neOwrQxy+tsruePusepsMReB3Wf6/tdp P1/+uKdOZaW5paD5f+njhf5/Ex8VtMf6aGlrBdY6ZInxVH/ivcEU8GZBwIaH9wSqknxX2jxa fLHq6qvaHXtPJXnXH9CwUFZiKc5INNRiLipOBAA3IfzPcQIAAA== X-CMS-MailID: 20180305085805eucas1p23b768fec0ab88387084b7b6bfc7c7b53 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180305085805eucas1p23b768fec0ab88387084b7b6bfc7c7b53 X-RootMTR: 20180305085805eucas1p23b768fec0ab88387084b7b6bfc7c7b53 References: <20180305085741.18896-1-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Enabling runtime power management early in analogix_dp_bind() causes following kernel NULL pointer dereference: Unable to handle kernel NULL pointer dereference at virtual address 000007d8 pgd = 28ffa2e4 [000007d8] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT SMP ARM Modules linked in: CPU: 6 PID: 69 Comm: kworker/6:1 Not tainted 4.16.0-rc1-00062-ge25751974ba8 #3622 Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) Workqueue: events deferred_probe_work_func PC is at analogix_dp_resume+0x8/0xc0 LR is at pm_generic_runtime_resume+0x2c/0x38 pc : [] lr : [] psr: a0000113 sp : ee13fbd8 ip : 0000001a fp : 00000001 r10: ee0eb080 r9 : c0552bd8 r8 : c0fb1d98 r7 : eebb1010 r6 : eeae9808 r5 : 00000000 r4 : d4850415 r3 : ee0ed010 r2 : b2d05e00 r1 : 00000000 r0 : 00000000 Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: 2000406a DAC: 00000051 Process kworker/6:1 (pid: 69, stack limit = 0x913205b4) Stack: (0xee13fbd8 to 0xee140000) ... [] (analogix_dp_resume) from [] (pm_generic_runtime_resume+0x2c/0x38) [] (pm_generic_runtime_resume) from [] (__genpd_runtime_resume+0x2c/0x8c) [] (__genpd_runtime_resume) from [] (genpd_runtime_resume+0x14c/0x258) [] (genpd_runtime_resume) from [] (__rpm_callback+0x134/0x214) [] (__rpm_callback) from [] (rpm_callback+0x20/0x80) [] (rpm_callback) from [] (rpm_resume+0x3a0/0x734) [] (rpm_resume) from [] (__pm_runtime_resume+0x64/0x9c) [] (__pm_runtime_resume) from [] (__device_attach+0x8c/0x134) [] (__device_attach) from [] (bus_probe_device+0x88/0x90) [] (bus_probe_device) from [] (device_add+0x3a8/0x580) [] (device_add) from [] (i2c_register_adapter+0xd4/0x3ec) [] (i2c_register_adapter) from [] (analogix_dp_bind+0x2a0/0x410) [] (analogix_dp_bind) from [] (exynos_dp_bind+0x9c/0x12c) [] (exynos_dp_bind) from [] (component_bind_all+0xfc/0x258) [] (component_bind_all) from [] (exynos_drm_bind+0x15c/0x28c) [] (exynos_drm_bind) from [] (try_to_bring_up_master+0x1b8/0x29c) [] (try_to_bring_up_master) from [] (component_add+0xa0/0x170) [] (component_add) from [] (exynos_dp_probe+0x64/0xb8) [] (exynos_dp_probe) from [] (platform_drv_probe+0x50/0xb0) [] (platform_drv_probe) from [] (driver_probe_device+0x2b8/0x4a0) [] (driver_probe_device) from [] (bus_for_each_drv+0x44/0x8c) [] (bus_for_each_drv) from [] (__device_attach+0xa0/0x134) [] (__device_attach) from [] (bus_probe_device+0x88/0x90) [] (bus_probe_device) from [] (deferred_probe_work_func+0x3c/0x168) [] (deferred_probe_work_func) from [] (process_one_work+0x1d0/0x7bc) [] (process_one_work) from [] (worker_thread+0x34/0x4dc) [] (worker_thread) from [] (kthread+0x128/0x164) [] (kthread) from [] (ret_from_fork+0x14/0x20) Exception stack(0xee13ffb0 to 0xee13fff8) ffa0: 00000000 00000000 00000000 00000000 ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 Code: e2800e37 eafee601 e92d4070 e1a05000 (e59067d8) ---[ end trace bf6046013df7cab2 ]--- This oops happens, because analogix_dp_bind() calls drm_dp_aux_register() which registers i2c adapter. I2C core tries to runtime get i2c host device during registration. This ends in analogix_dp_resume(), but dp context is NULL there. dp context is set in exynos_dp_bind() after executing analogix_dp_bind(). Fix this issue by postponing enabling runtime power management after drm_dp_aux_register(). Signed-off-by: Marek Szyprowski --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.15.0 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Tested-by: Heiko Stuebner Reviewed-by: Heiko Stuebner diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 8475749baae5..b391d149db91 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1376,8 +1376,6 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, return ERR_PTR(-ENODEV); } - pm_runtime_enable(dev); - ret = devm_request_threaded_irq(&pdev->dev, dp->irq, analogix_dp_hardirq, analogix_dp_irq_thread, @@ -1397,7 +1395,9 @@ analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, ret = drm_dp_aux_register(&dp->aux); if (ret) - goto err_disable_pm_runtime; + return ERR_PTR(ret); + + pm_runtime_enable(dev); ret = analogix_dp_create_bridge(drm_dev, dp); if (ret) { From patchwork Mon Mar 5 08:57:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 130624 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2451856lja; Mon, 5 Mar 2018 00:58:12 -0800 (PST) X-Google-Smtp-Source: AG47ELvHsf0rI/hBrYLJD8Kc078o+APJc7LdkjVZ5vMCFTOr4BPNl90mx1uEoY8HYYwjvlbp47hn X-Received: by 2002:a17:902:12e:: with SMTP id 43-v6mr12439920plb.77.1520240292530; Mon, 05 Mar 2018 00:58:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520240292; cv=none; d=google.com; s=arc-20160816; b=YGEDyz6CHjeo7K/3b5wkUzYqhvqQp9G5KBw3xmJ6HU2jhfyzQp7vFfGLhwODY9Bd1H 6J6Cx+OKNZB02e0SIoqfoNecbnA3IC74xTcP9lgsnS0BIadbZaa6E6ZWtVLDxSx8NbrW eE8AlXsujl+ElwtBCBmlY2inaEDQ1pZzJP4tVzsaXVfo6iFYVd8eXckPAqQ49EcQOAVg xSM5FCYx5NE4L7BVVBpG26lXux+B+TN4tc0Q80ZVMREwhnTA2fPQ/bWqk5g0PyYrp+4x T/GlnOKAzQBg6saWCaLCe5JhJMwMd6aXw9a5hb4Ws++7HV6oLIEmylm+D2HljjH1Ri8w SGYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:cms-type:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=uuiV2t6kx+jdJ/EwZ4tSzS4a+F1wZfXa8JiAI5YbfgQ=; b=Ayh+nAdsGpEKlSlgX2YcZi7OaVqqQ+BvCkBgW6vYF9ktyiMLj519Hs2kysWLwQ43UX ajDznQGmrv6jD4buTVBaw4et5dyt6tVsU05eWsEDVq56HZ/1iiZlIjzAl6o/2gQxgSoL ppPbVUnxEztN/2U7G+SJR8mrmSIonGRcEEEBReysCmAvIRGI5pkT4jaGtvYzz2rqj97j J9W6tNAM9EKVIrCTZQ5JiBA71LPToZw6K6ButUF58RIg4M+V/1LpILmr06wsDc4UOHRP 6ivseYhZgb/RqnUNvGOB7snaHRerqtrLM+u29clKJ5KEHl4za9snC1LJARVpDpkYwkld KwiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=d7WMTu4w; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1-v6si8947909pld.744.2018.03.05.00.58.12; Mon, 05 Mar 2018 00:58:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=d7WMTu4w; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933491AbeCEI6L (ORCPT + 3 others); Mon, 5 Mar 2018 03:58:11 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:39600 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933492AbeCEI6J (ORCPT ); Mon, 5 Mar 2018 03:58:09 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180305085807euoutp01123cc93d2e272ab5f55292dfa431fc5d~Y_ny8L4qO2387723877euoutp011; Mon, 5 Mar 2018 08:58:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180305085807euoutp01123cc93d2e272ab5f55292dfa431fc5d~Y_ny8L4qO2387723877euoutp011 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1520240287; bh=bW/OM0hqVhw2bwfdhVWXyXGcaTquvOO/BaMir5HmBb0=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=d7WMTu4wkKZzWyM0D6tFjneXZp1eI3Z2sFhHGzXV4TQcjZcWBlMWF3VPG0cHZZcNK yHE0TUAi1AXbZplCn961K5uElJupiyZ7lp1j9BOgg6swysjQu8o/UWIATYIC6SevJx uY8N1LwGsIXM1cDVRRY9pdugC63ty+Osk4i1xv3E= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180305085807eucas1p2f2bb549b7dc1151b27f8639b34048ee9~Y_nyZzWjl2306223062eucas1p22; Mon, 5 Mar 2018 08:58:07 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 04.C6.17380.E960D9A5; Mon, 5 Mar 2018 08:58:06 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180305085806eucas1p2156c70fa406dd25814b12a873dac5281~Y_nxl_mNF0174101741eucas1p2H; Mon, 5 Mar 2018 08:58:06 +0000 (GMT) X-AuditID: cbfec7f4-6f9ff700000043e4-25-5a9d069ea170 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 60.F1.04178.E960D9A5; Mon, 5 Mar 2018 08:58:06 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P5400MEY0WMAI90@eusync1.samsung.com>; Mon, 05 Mar 2018 08:58:06 +0000 (GMT) From: Marek Szyprowski To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: Marek Szyprowski , Archit Taneja , =?utf-8?q?Heiko_St=C3=BCbner?= , Thierry Escande , Tomasz Figa , Sean Paul , Bartlomiej Zolnierkiewicz , Laurent Pinchart , Thierry Reding , Sandy Huang , Enric Balletbo i Serra , Andrzej Hajda , Douglas Anderson , Haixia Shi , Zain Wang , Lin Huang Subject: [PATCH 3/3] drm/bridge: analogix_dp: Don't create useless connectors Date: Mon, 05 Mar 2018 09:57:41 +0100 Message-id: <20180305085741.18896-4-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.15.0 In-reply-to: <20180305085741.18896-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzWSfyyUcRzH+z6/7nG5PDvGd2q1XauZSWm1fW9Ev6antaY/rLbbKocn5Bzd wxWFW5OOOD82y88L3fxahEyYH1HRMoxIkmXEH4S4miy5nEf/vT6f9/v9+Xy+25fGpQbSmQ5T R3MatVIlo8REY/da/yEjVaQ4YqySo881/SS6r18gUV3ucxL1lXVSaPjXEoWejXcBZJmaJ1FR djz6XfseRw8bpjCUkmUSoZVJC45yB9oxVP1mQoQmavsAMj/YoFDGyBCF1lqMBEoedTxpzxbo Bgn2gyEdY5smTIBtzp8QsQX6PJL9+qgHY1+YEtm/+R0Ea2ioAuzLj0acNdfvvbRTIfYK5lRh Wk5z2DtAHFq+OElF/XW+M/a2ktSBT46pwIaGzDG4kNOBpQIxLWUqAHwyObxdmAFc7lgH/121 f0wiQSgD8NX9SkIodBhcbTNhVhfFeMDUhVTKyg6MCq7ovwOrCWfqSFg93rw1yp7xg+ZRi8jK BHMAFqXptsIS5gSsmDOIhHX74NPV5q1BNow3LCzpxq2DIGOhYMYDy/ZNZ+F6WS8hsD2c62nY Du+BKfpOTOBEaFh9gwnhNADbknK2BU/4umeQtDLO7ILZjY83N9CbfQnUJ0sFCwvbvg1QAp+C xZWlpPDkLABLlxbJTOBcDHZUAScuho8I4fijau62O6+M4GPUIe5BkRH1YPOX9G70/GwCLeuB XYChgcxW0qQuVEhJpZaPjegCkMZlDhKtebMlCVbGxnGayOuaGBXHd4HdNCFzklxzSVBImRBl NBfOcVGc5r+K0TbOOmCPVEtyzfm75W5ycGBZrr3Q1BlfY8u338w43Y6PeHVrk8+0UK3z2ZnT Llfchs7NFjkd9Cz7ciRnY9X98kDCjNg/7ocfkecT844p93e9mh5+urbu4r0Ku+aAlN2lY3Je EdZRgvAbAzPK4z7Tcwm3gvb7zopRUmug3ZSvObgvKVJG8KFKD1dcwyv/AU/ZLJohAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHLMWRmVeSWpSXmKPExsVy+t/xy7rz2OZGGbzaIGZxa905Voumjres FhtnrGe1OLvsIJvFla/v2SzW3D7EaPH/0WtWi7mTai1+bDjFbNG+5RGTRefEJewWnx78Z7aY cX4fk8XaI3fZLe5uOMto8bn1H5tF/9VLbBY/d81jsWi7LuYg7DG74SKLx+W+XiaPHXeXMHrs nHWX3WN2x0xWj/vdx5k8Ni+p9/g7az+LR9+WVYwe26/NY/b4vEkugDuKyyYlNSezLLVI3y6B K2P5uwdsBX+lKm4eXcnawHhDrIuRk0NCwERiw+8l7F2MXBxCAksYJfoutrBBOE1MEi3nZzGB VLEJGEp0ve1iA7FFBHIkFn+fDmYzC2xllfj7MQjEFhbwldjz+RsjiM0ioCoxt6cBrJdXwFZi xas+doht8kC9O8F6OQXsJOYsPMYMYgsB1dx7fI95AiPPAkaGVYwiqaXFuem5xYZ6xYm5xaV5 6XrJ+bmbGIGhvu3Yz807GC9tDD7EKMDBqMTDK1A4J0qINbGsuDL3EKMEB7OSCG/ZZ6AQb0pi ZVVqUX58UWlOavEhRmkOFiVx3vMGlVFCAumJJanZqakFqUUwWSYOTqkGRp886em8DzhFX3D2 FNXaFc84pcrf37fVtOF+18PAxesN7weVXLKzeyN+ZZ3dKvvXN7ZM/q/5WOnH9ETxlMPajDu/ XH8gIdnmO/vr8sZPlkI8W+PUDpgJvOWdxOmaMGmyUE/3pq/XUyYZq93dw9gxL2qdxEtvh7+Z wU0fovKF9zdllVuYN6yIUmIpzkg01GIuKk4EAI+myKZxAgAA X-CMS-MailID: 20180305085806eucas1p2156c70fa406dd25814b12a873dac5281 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180305085806eucas1p2156c70fa406dd25814b12a873dac5281 X-RootMTR: 20180305085806eucas1p2156c70fa406dd25814b12a873dac5281 References: <20180305085741.18896-1-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org If there is another bridge after analogix_dp, then the connector object should not be created. This fixes following timeouts on Exynos5420-based Chromebook2 Peach-PIT board during boot: exynos-dp 145b0000.dp-controller: AUX CH cmd reply timeout! exynos-dp 145b0000.dp-controller: AUX CH enable timeout! exynos-dp 145b0000.dp-controller: AUX CH enable timeout! exynos-dp 145b0000.dp-controller: AUX CH enable timeout! exynos-dp 145b0000.dp-controller: AUX CH enable timeout! Signed-off-by: Marek Szyprowski --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 29 ++++++++++++---------- drivers/gpu/drm/exynos/exynos_dp.c | 1 + include/drm/bridge/analogix_dp.h | 1 + 3 files changed, 18 insertions(+), 13 deletions(-) -- 2.15.0 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index b391d149db91..a693ab3078f0 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1012,27 +1012,30 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge) { struct analogix_dp_device *dp = bridge->driver_private; struct drm_encoder *encoder = dp->encoder; - struct drm_connector *connector = &dp->connector; - int ret; + struct drm_connector *connector = NULL; + int ret = 0; if (!bridge->encoder) { DRM_ERROR("Parent encoder object not found"); return -ENODEV; } - connector->polled = DRM_CONNECTOR_POLL_HPD; + if (!dp->plat_data->skip_connector) { + connector = &dp->connector; + connector->polled = DRM_CONNECTOR_POLL_HPD; - ret = drm_connector_init(dp->drm_dev, connector, - &analogix_dp_connector_funcs, - DRM_MODE_CONNECTOR_eDP); - if (ret) { - DRM_ERROR("Failed to initialize connector with drm\n"); - return ret; - } + ret = drm_connector_init(dp->drm_dev, connector, + &analogix_dp_connector_funcs, + DRM_MODE_CONNECTOR_eDP); + if (ret) { + DRM_ERROR("Failed to initialize connector with drm\n"); + return ret; + } - drm_connector_helper_add(connector, - &analogix_dp_connector_helper_funcs); - drm_mode_connector_attach_encoder(connector, encoder); + drm_connector_helper_add(connector, + &analogix_dp_connector_helper_funcs); + drm_mode_connector_attach_encoder(connector, encoder); + } /* * NOTE: the connector registration is implemented in analogix diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 33319a858f3a..964831dab102 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -244,6 +244,7 @@ static int exynos_dp_probe(struct platform_device *pdev) /* The remote port can be either a panel or a bridge */ dp->plat_data.panel = panel; + dp->plat_data.skip_connector = !!bridge; dp->ptn_bridge = bridge; out: diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h index 5518fc75dd6e..711fff9b6803 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -31,6 +31,7 @@ struct analogix_dp_plat_data { struct drm_panel *panel; struct drm_encoder *encoder; struct drm_connector *connector; + bool skip_connector; int (*power_on)(struct analogix_dp_plat_data *); int (*power_off)(struct analogix_dp_plat_data *);