From patchwork Fri Jun 28 16:01:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Pietrasiewicz X-Patchwork-Id: 11024563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A175214E5 for ; Sun, 30 Jun 2019 18:26:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F9132843B for ; Sun, 30 Jun 2019 18:26:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 823DF285EA; Sun, 30 Jun 2019 18:26:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0752C2843B for ; Sun, 30 Jun 2019 18:26:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC14F89CE1; Sun, 30 Jun 2019 18:26:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F4B16E95B; Fri, 28 Jun 2019 16:08:06 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id 3282E289CF7 From: Andrzej Pietrasiewicz To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 21/22] drm/amdgpu: Provide ddc symlink in connector sysfs directory Date: Fri, 28 Jun 2019 18:01:35 +0200 Message-Id: <5e355b8bec8fb3907566a741db8cc3e356246a32.1561735433.git.andrzej.p@collabora.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: <3fb19371-db7d-f9dc-31a7-1ccd126f6784@collabora.com> In-Reply-To: References: X-Mailman-Approved-At: Sun, 30 Jun 2019 18:26:11 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Neil Armstrong , Maxime Ripard , Liviu Dudau , Douglas Anderson , Thierry Reding , Laurent Pinchart , kernel@collabora.com, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, Vincent Abriou , Krzysztof Kozlowski , Jonathan Hunter , David Airlie , Chen-Yu Tsai , Kukjin Kim , NXP Linux Team , Dave Airlie , freedreno@lists.freedesktop.org, linux-tegra@vger.kernel.org, Pengutronix Kernel Team , Jonas Karlman , linux-arm-msm@vger.kernel.org, Jyri Sarha , Alexios Zavras , Mamta Shukla , linux-mediatek@lists.infradead.org, Matthias Brugger , Thomas Gleixner , Sean Paul , linux-arm-kernel@lists.infradead.org, amd-gfx@lists.freedesktop.org, Tomi Valkeinen , Thomas Zimmermann , Seung-Woo Kim , linux-kernel@vger.kernel.org, Todor Tomov , Kyungmin Park , Huang Rui , Alex Deucher , Shawn Guo , =?utf-8?q?Christian_K=C3=B6nig?= , Gerd Hoffmann MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use the ddc pointer provided by the generic connector. Signed-off-by: Andrzej Pietrasiewicz --- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 70 ++++++++++++++----- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 73b2ede773d3..5f8a7e3818b9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -1573,11 +1573,15 @@ amdgpu_connector_add(struct amdgpu_device *adev, goto failed; amdgpu_connector->con_priv = amdgpu_dig_connector; if (i2c_bus->valid) { - amdgpu_connector->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); - if (amdgpu_connector->ddc_bus) + struct amdgpu_connector *acn = amdgpu_connector; + + acn->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); + if (acn->ddc_bus) { has_aux = true; - else + connector->ddc = &acn->ddc_bus->adapter; + } else { DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + } } switch (connector_type) { case DRM_MODE_CONNECTOR_VGA: @@ -1662,9 +1666,13 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_connector_init(dev, &amdgpu_connector->base, &amdgpu_connector_vga_funcs, connector_type); drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_vga_helper_funcs); if (i2c_bus->valid) { - amdgpu_connector->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); - if (!amdgpu_connector->ddc_bus) + struct amdgpu_connector *acn = amdgpu_connector; + + acn->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); + if (!acn->ddc_bus) DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &acn->ddc_bus->adapter; } amdgpu_connector->dac_load_detect = true; drm_object_attach_property(&amdgpu_connector->base.base, @@ -1682,9 +1690,13 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_connector_init(dev, &amdgpu_connector->base, &amdgpu_connector_vga_funcs, connector_type); drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_vga_helper_funcs); if (i2c_bus->valid) { - amdgpu_connector->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); - if (!amdgpu_connector->ddc_bus) + struct amdgpu_connector *acn = amdgpu_connector; + + acn->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); + if (!acn->ddc_bus) DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &acn->ddc_bus->adapter; } amdgpu_connector->dac_load_detect = true; drm_object_attach_property(&amdgpu_connector->base.base, @@ -1707,9 +1719,13 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_connector_init(dev, &amdgpu_connector->base, &amdgpu_connector_dvi_funcs, connector_type); drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_dvi_helper_funcs); if (i2c_bus->valid) { - amdgpu_connector->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); - if (!amdgpu_connector->ddc_bus) + struct amdgpu_connector *acn = amdgpu_connector; + + acn->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); + if (!acn->ddc_bus) DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &acn->ddc_bus->adapter; } subpixel_order = SubPixelHorizontalRGB; drm_object_attach_property(&amdgpu_connector->base.base, @@ -1757,9 +1773,13 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_connector_init(dev, &amdgpu_connector->base, &amdgpu_connector_dvi_funcs, connector_type); drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_dvi_helper_funcs); if (i2c_bus->valid) { - amdgpu_connector->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); - if (!amdgpu_connector->ddc_bus) + struct amdgpu_connector *acn = amdgpu_connector; + + acn->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); + if (!acn->ddc_bus) DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &acn->ddc_bus->adapter; } drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.coherent_mode_property, @@ -1799,11 +1819,15 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_connector_init(dev, &amdgpu_connector->base, &amdgpu_connector_dp_funcs, connector_type); drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs); if (i2c_bus->valid) { - amdgpu_connector->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); - if (amdgpu_connector->ddc_bus) + struct amdgpu_connector *acn = amdgpu_connector; + + acn->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); + if (acn->ddc_bus) { has_aux = true; - else + connector->ddc = &acn->ddc_bus->adapter; + } else { DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + } } subpixel_order = SubPixelHorizontalRGB; drm_object_attach_property(&amdgpu_connector->base.base, @@ -1841,11 +1865,15 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_connector_init(dev, &amdgpu_connector->base, &amdgpu_connector_edp_funcs, connector_type); drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs); if (i2c_bus->valid) { - amdgpu_connector->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); - if (amdgpu_connector->ddc_bus) + struct amdgpu_connector *acn = amdgpu_connector; + + acn->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); + if (acn->ddc_bus) { has_aux = true; - else + connector->ddc = &acn->ddc_bus->adapter; + } else { DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + } } drm_object_attach_property(&amdgpu_connector->base.base, dev->mode_config.scaling_mode_property, @@ -1862,9 +1890,13 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_connector_init(dev, &amdgpu_connector->base, &amdgpu_connector_lvds_funcs, connector_type); drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_lvds_helper_funcs); if (i2c_bus->valid) { - amdgpu_connector->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); - if (!amdgpu_connector->ddc_bus) + struct amdgpu_connector *acn = amdgpu_connector; + + acn->ddc_bus = amdgpu_i2c_lookup(adev, i2c_bus); + if (!acn->ddc_bus) DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); + else + connector->ddc = &acn->ddc_bus->adapter; } drm_object_attach_property(&amdgpu_connector->base.base, dev->mode_config.scaling_mode_property,