Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CCE2C7C822 for ; Mon, 27 Apr 2020 08:20:06 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11C432087E for ; Mon, 27 Apr 2020 08:20:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L/1pHaJo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11C432087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5AF876E0EA; Mon, 27 Apr 2020 08:20:05 +0000 (UTC) Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 816CA6E0A1 for ; Mon, 27 Apr 2020 08:19:18 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id a21so13707041ljj.11 for ; Mon, 27 Apr 2020 01:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vjzXQBVoXNlOPYoRpuXxrwu9NjBWZwX5wQQr4dUxZ/0=; b=L/1pHaJo+y7Pf9RDiaOmD5KWDnMF3o4aB16KZWanEL+C/Zxr+95Cqw0vzzRuFYRNZJ bYsMLE/oR9DClpsvtJyjJnGHXlR0puAk09u4fayX/+KPPOjnLcncvsgQOntXRLeuSnUi Z1JCgzeyhwT25qVmzOXpkc64/qqz4W7mt+QdW2fUnbY8J5oM0KWnykFptf3EnQr+EDnB HgmsvHxKydRgKBWMOAp2ot1uKof07NxMmS5GieLlSPauhIOiJJ7d1EBAoa+EbzeY0ega 97U5S9QD5hqHK5gcorxqd9MOFUU2vZwN11VYIBz87p1w/tg7W/TClDIT6ynPdazc8eys QzUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vjzXQBVoXNlOPYoRpuXxrwu9NjBWZwX5wQQr4dUxZ/0=; b=AN0PcaNVTRlQLjxVpSQBG412FHwIvWgae0Lhvkd0dlROgvFMpAoKzF63D97HHWns6K WadbX007OBqStDTk8/yGBONVOSNIts9nydKpg5TgnDPs3QqrKuM1BCRxkHQIkppbVWk8 7nvEmFh7Vpbb49DAMLSxokkeJqDVfNu6uyePbXLsW7vm1mAGc1tzdxXQf5ke/RWUf6j/ 6oBvZkqtVuK6FiicrJyzvPCYK2J0ISz3d8/gnqOpAqXwlmOWZTqWVg4elqkL5jD6787P iYAbAiVoicPs9TNYzTMVca9oXwqhAEu5gOIQFvq/T2STBTYZ6WYWNYmXVvqHyjMWTCJ6 i/WQ== X-Gm-Message-State: AGi0PuYuxgrH8GueUN/SU6+j80xTDej64AHr2vdhRel6VZBnBX9WmoI0 HS+8RJ8sab7J/GpEJmkP2R2CLOlB X-Google-Smtp-Source: APiQypKtH0Sl5WCbPnb9Iw9oGOxXpFXQzfTpzpOym+yhQgzy/HkoZqbZ0ZJyKAk/KssSlEAenagb+A== X-Received: by 2002:a2e:8549:: with SMTP id u9mr12631452ljj.24.1587975556609; Mon, 27 Apr 2020 01:19:16 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:16 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 13/21] drm/bridge: megachips: add helper to create connector Date: Mon, 27 Apr 2020 10:18:42 +0200 Message-Id: <20200427081850.17512-14-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Factor out connector creation to a small helper function. Signed-off-by: Sam Ravnborg Cc: Peter Senna Tschudin Cc: Martin Donnelly Cc: Martyn Welch Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index 6200f12a37e6..258e0525cdcc 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -191,6 +191,32 @@ static const struct drm_connector_funcs ge_b850v3_lvds_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; +static int ge_b850v3_lvds_create_connector(struct drm_bridge *bridge) +{ + struct drm_connector *connector = &ge_b850v3_lvds_ptr->connector; + int ret; + + if (!bridge->encoder) { + DRM_ERROR("Parent encoder object not found"); + return -ENODEV; + } + + connector->polled = DRM_CONNECTOR_POLL_HPD; + + drm_connector_helper_add(connector, + &ge_b850v3_lvds_connector_helper_funcs); + + ret = drm_connector_init(bridge->dev, connector, + &ge_b850v3_lvds_connector_funcs, + DRM_MODE_CONNECTOR_DisplayPort); + if (ret) { + DRM_ERROR("Failed to initialize connector with drm\n"); + return ret; + } + + return drm_connector_attach_encoder(connector, bridge->encoder); +} + static irqreturn_t ge_b850v3_lvds_irq_handler(int irq, void *dev_id) { struct i2c_client *stdp4028_i2c @@ -209,7 +235,6 @@ static irqreturn_t ge_b850v3_lvds_irq_handler(int irq, void *dev_id) static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, enum drm_bridge_attach_flags flags) { - struct drm_connector *connector = &ge_b850v3_lvds_ptr->connector; struct i2c_client *stdp4028_i2c = ge_b850v3_lvds_ptr->stdp4028_i2c; int ret; @@ -219,25 +244,7 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, return -EINVAL; } - if (!bridge->encoder) { - DRM_ERROR("Parent encoder object not found"); - return -ENODEV; - } - - connector->polled = DRM_CONNECTOR_POLL_HPD; - - drm_connector_helper_add(connector, - &ge_b850v3_lvds_connector_helper_funcs); - - ret = drm_connector_init(bridge->dev, connector, - &ge_b850v3_lvds_connector_funcs, - DRM_MODE_CONNECTOR_DisplayPort); - if (ret) { - DRM_ERROR("Failed to initialize connector with drm\n"); - return ret; - } - - ret = drm_connector_attach_encoder(connector, bridge->encoder); + ret = ge_b850v3_lvds_create_connector(bridge); if (ret) return ret; -- 2.20.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel