From patchwork Sat Nov 19 03:48:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9437855 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4428160237 for ; Sat, 19 Nov 2016 03:48:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 357B82996C for ; Sat, 19 Nov 2016 03:48:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29CF3299B0; Sat, 19 Nov 2016 03:48:21 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4F062996C for ; Sat, 19 Nov 2016 03:48:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857AbcKSDsU (ORCPT ); Fri, 18 Nov 2016 22:48:20 -0500 Received: from galahad.ideasonboard.com ([185.26.127.97]:55231 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752778AbcKSDsT (ORCPT ); Fri, 18 Nov 2016 22:48:19 -0500 Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id 52E1F21133; Sat, 19 Nov 2016 04:48:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1479527295; bh=pYiGGyhHG96Ea2W3gpsYjtt75VPB2FEX+AWwVYIGJso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vjoONwdGDriQ/g2O2Nk6+dewNCz8VWwYbh/vntTCQjiPTiQfimQw1IpH1Vq5Tk/Oe 4Hg4vG38+6YBU9zz6kOLzcSvpM39cufE3Qerl3uA9McCzNf5bSgtpkMDr49EbOJKLw nSekPcPJpJm5t9xoSK9QeLzVi+DOlvWkSO67q2ow= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org Subject: [PATCH v2 6/9] drm: bridge: Set bridges' encoder type Date: Sat, 19 Nov 2016 05:48:19 +0200 Message-Id: <1479527302-7674-7-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1479527302-7674-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1479527302-7674-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Initialize the new drm_bridge::encoder_type field to the right value for all external bridge drivers. Signed-off-by: Laurent Pinchart --- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 + drivers/gpu/drm/bridge/analogix-anx78xx.c | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + drivers/gpu/drm/bridge/dw-hdmi.c | 2 ++ drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 ++ drivers/gpu/drm/bridge/parade-ps8622.c | 2 ++ drivers/gpu/drm/bridge/sii902x.c | 2 ++ drivers/gpu/drm/bridge/tc358767.c | 2 ++ 9 files changed, 14 insertions(+) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 8ed3906dd411..66bbd2073529 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -1030,6 +1030,7 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) adv7511->bridge.funcs = &adv7511_bridge_funcs; adv7511->bridge.of_node = dev->of_node; + adv7511->bridge.encoder_type = DRM_MODE_ENCODER_TMDS; ret = drm_bridge_add(&adv7511->bridge); if (ret) { diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c index a2a82366a771..62be93f7ffaa 100644 --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c @@ -1437,6 +1437,7 @@ static int anx78xx_i2c_probe(struct i2c_client *client, } anx78xx->bridge.funcs = &anx78xx_bridge_funcs; + anx78xx->bridge.encoder_type = DRM_MODE_ENCODER_TMDS; err = drm_bridge_add(&anx78xx->bridge); if (err < 0) { diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 6e0447f329a2..d7eda99e5b8a 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1231,6 +1231,7 @@ static int analogix_dp_create_bridge(struct drm_device *drm_dev, bridge->driver_private = dp; bridge->encoder = dp->encoder; bridge->funcs = &analogix_dp_bridge_funcs; + bridge->encoder_type = DRM_MODE_ENCODER_TMDS; ret = drm_bridge_attach(drm_dev, bridge); if (ret) { diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c index b33e3f829e4f..036c54c849e6 100644 --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c @@ -182,6 +182,7 @@ static int dumb_vga_probe(struct platform_device *pdev) vga->bridge.funcs = &dumb_vga_bridge_funcs; vga->bridge.of_node = pdev->dev.of_node; + vga->bridge.encoder_type = DRM_MODE_ENCODER_DAC; ret = drm_bridge_add(&vga->bridge); if (ret && !IS_ERR(vga->ddc)) diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index ab7023e5dfde..f6485885c4ff 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -1609,6 +1609,8 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) hdmi->bridge = bridge; bridge->driver_private = hdmi; bridge->funcs = &dw_hdmi_bridge_funcs; + bridge->encoder_type = DRM_MODE_ENCODER_TMDS; + ret = drm_bridge_attach(drm, bridge); if (ret) { DRM_ERROR("Failed to initialize bridge with drm\n"); diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c index f1a99938e924..8be117cc024f 100644 --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -349,6 +349,8 @@ static int ptn3460_probe(struct i2c_client *client, ptn_bridge->bridge.funcs = &ptn3460_bridge_funcs; ptn_bridge->bridge.of_node = dev->of_node; + ptn_bridge->bridge.encoder_type = DRM_MODE_ENCODER_LVDS; + ret = drm_bridge_add(&ptn_bridge->bridge); if (ret) { DRM_ERROR("Failed to add bridge\n"); diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index 6f7c2f9860d2..37ac7211139a 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -615,6 +615,8 @@ static int ps8622_probe(struct i2c_client *client, ps8622->bridge.funcs = &ps8622_bridge_funcs; ps8622->bridge.of_node = dev->of_node; + ps8622->bridge.encoder_type = DRM_MODE_ENCODER_LVDS; + ret = drm_bridge_add(&ps8622->bridge); if (ret) { DRM_ERROR("Failed to add bridge\n"); diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c index 9126d0306ab5..ad4663dea333 100644 --- a/drivers/gpu/drm/bridge/sii902x.c +++ b/drivers/gpu/drm/bridge/sii902x.c @@ -418,6 +418,8 @@ static int sii902x_probe(struct i2c_client *client, sii902x->bridge.funcs = &sii902x_bridge_funcs; sii902x->bridge.of_node = dev->of_node; + sii902x->bridge.encoder_type = DRM_MODE_ENCODER_TMDS; + ret = drm_bridge_add(&sii902x->bridge); if (ret) { dev_err(dev, "Failed to add drm_bridge\n"); diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 44d476ea6d2e..934333cb647b 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1353,6 +1353,8 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) tc->bridge.funcs = &tc_bridge_funcs; tc->bridge.of_node = dev->of_node; + tc->bridge.encoder_type = DRM_MODE_ENCODER_TMDS; + ret = drm_bridge_add(&tc->bridge); if (ret) { dev_err(dev, "Failed to add drm_bridge: %d\n", ret);