From patchwork Wed Dec 15 10:15:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1828 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 1AB413F18E for ; Wed, 15 Dec 2021 11:15:53 +0100 (CET) Received: by mail-pf1-f197.google.com with SMTP id q82-20020a627555000000b004a4f8cadb6fsf13327381pfc.20 for ; Wed, 15 Dec 2021 02:15:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639563352; cv=pass; d=google.com; s=arc-20160816; b=C3O/e7Ov26o9roiQkWl3y6iXQWzaoj8rUc3Ad9xtA6NYvTC94+4L+hWO4sgxs6qn0p YTdBafuGR+YjHag/Jp2/GJpWhjQ9f+mJ/WqyAT0rOAu/xLcm5FdrcD050gXpyIAiof7P xSIk16KtcfMXZ3mzZjHGc8LMs9ooL4+dN+jv2bX+kxdbOuFQULf+s9dP+55eelvJLzcN 2gB5e8ff885X7UoZ/7ceAKx7LvCK8RqZ1Z+pqlG3aL+j+KXSO5LFvQKPPh54fDVQfGq/ evpU3lmW1m0w/Ej5GVI+wgkpV8tSutjCMTHQEyc75SytbXRDYolGMKI2esCQZhzCMFF9 /3gg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=YuL5nN76Bsm9xS2I+sb5qyqb0r1sd8MAihN789YGshs=; b=m/+5Sg7q5HaUoka4DleUT4Sl6otx+D29xNjKr8KfT+NmXvIti/8gEm5KAEUHQh+McQ KjitatuATR8PaMGCjjnAOShzRsiNCFhVX4/SW9hPoKi5qRSmYN/iUHLEWpbilrf6n2/m lJWVA91hYA9Vj40ZDhjg0wKOHNZ6Ek2NhgEnAensLo+GdQpoG1NbOgnWG21X/04A5zc6 2qV5JVcp8Q2ccEUxheNnrQBOCERnoz7MdE63jYUVL1f8vA3AGmB1M3dPRqJk+sIR2sHk bTwPp30hh758cIDie8rW9q7Ik0Vn4gJMNt1m/mRdGmZs40Od3vcpqHv64RXeooA6Aj8K DADQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=h2E5KmgP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=YuL5nN76Bsm9xS2I+sb5qyqb0r1sd8MAihN789YGshs=; b=WGI/aKa5jd+l1iN1wpkIwA16ae3JDEnBS9H7Xg8N9aQsq82YOI5PykB80oMAuf3az7 e/z3zR+q1LmJkOPT7tuLJLslx9haC9wOrlML9Yx995Aj0ybOB+VNadYqo8JzfeLfSJ3A CDp5zrRY2t26FZLIJnF73es44MFvU1JD3TQMg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=YuL5nN76Bsm9xS2I+sb5qyqb0r1sd8MAihN789YGshs=; b=j0e8Chzbi2+KbxBzCrtiklcfP2d1+qMEgk0lGdw6GdDUQDW3yB9s6KIXOqG/tBcgs8 z8YXqu2fYAb8qcbSMfVblzXA3Xcr7N83fTINDOGVMCg422egricSgSTnoZAGNjraZAqk vP5igLiOHxctmg/fIjSXMkVxk5bXITfclZ8jTQrKUfbrBXt7qwpE+eBkjkog2LjsrJ4s oFjLI+eU2Z+MQQtyT5TN209qCuzUfdKdn3J3oJqti9Nq+LSykpG3oBHQtEA7AQICvjll fVF2a4BCqjJ5T5ydZM2/iAF+5ZWIcKdcJsKVubQMyq6YuVocVXaVn1udgsPVMDQr9Qeq g6RA== X-Gm-Message-State: AOAM5323v2oVw6fVzpOrPF2mH/g6qtaT79lLcvAuvysyVsL69V3oJl70 LcPLhpgFPrltsv90nlkkFVk95YVz X-Google-Smtp-Source: ABdhPJzNyq8+EQjpJTSrKc8wcbGAbLQuL1RDNYnm1neZXNVWLjgLPwCzPHXobAQ73wW7nkucjVkTcw== X-Received: by 2002:a17:902:eccb:b0:148:a3f4:1ec5 with SMTP id a11-20020a170902eccb00b00148a3f41ec5mr3240436plh.123.1639563351871; Wed, 15 Dec 2021 02:15:51 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:f20c:: with SMTP id m12ls1208672plc.3.gmail; Wed, 15 Dec 2021 02:15:51 -0800 (PST) X-Received: by 2002:a17:902:ee95:b0:148:a2f7:9d80 with SMTP id a21-20020a170902ee9500b00148a2f79d80mr3590085pld.159.1639563351118; Wed, 15 Dec 2021 02:15:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639563351; cv=none; d=google.com; s=arc-20160816; b=vcvBYXdlF1IB8JBrhSQ6vIv2yuLP8bdXDRsECY90Ot4jr+ye5bDtfazr8YsfGLl/Qz OEmrpcmpGQWIGoSxe0NXRpIVumN+t2REVpGQIW7K9bJwzZ71Ga/j74czRswneBvcfN+j wSB7IZtCxzriJ60p0A6+DKiyiiWSsw2NQaqMNvvb5Q3N/dEWu6Yw/4V6o1cxKxMCB0tO +YPiWU7CIDIVtpfrbqQXtNHKVnHovNEBBT4pSDg9pPzuYtM8rNCAZLhqq5mFRbIi74uT T2K+oaHpvdkdmcdrhpPi48kaU/a5aW7vqxIvJ15R/+/qtaJtFDp9F+W09BvPKFh0yoFe 1u5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=tASggvKbD+8kubIbPYJcEas91o6vPtNnVuuBr/gmYOg=; b=rUo6A62ubg0xn36mZ8SERnnJACHKxW9dV2x8+kngdfqXkvtU9D7uxRG/9v3QFBSnuf jXOQW1GGttyxT7HB9KzpZa9N7GHR74XhZS5j6SJ5vKV8K+BAQhkTW9fCrqWz3cOy1D12 iJUBkiGJKsOH07VyVecDh+a5vxEd5ueRqr0uDvmvBchvgfi7sfdjopNDicbADa6DJKFm 2tzFnvaKOXoKlf3V4VDjH6BlB/2dKRdOFLjonwoNM53kyStHyxuA0YeSSfKcM+frC52S P7Nbo4ndxUyrRbexdVvTB/C5t4uAbUuRFRnUX5C1vd5Pg1Imlu1vSfvXe7U/6LbGl3Kw pVOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=h2E5KmgP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 15sor719973pgs.33.2021.12.15.02.15.51 for (Google Transport Security); Wed, 15 Dec 2021 02:15:51 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a63:6b81:: with SMTP id g123mr7548179pgc.140.1639563350772; Wed, 15 Dec 2021 02:15:50 -0800 (PST) Received: from localhost.localdomain ([2405:201:c00a:a0a9:a7:8328:d9c4:5bc9]) by smtp.gmail.com with ESMTPSA id v11sm2408149pfu.184.2021.12.15.02.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 02:15:50 -0800 (PST) From: Jagan Teki To: Marek Szyprowski , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Sam Ravnborg , Michael Nazzareno Trimarchi , Inki Dae Cc: dri-devel@lists.freedesktop.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v4 2/6] drm: exynos: dsi: Use drm panel_bridge API Date: Wed, 15 Dec 2021 15:45:30 +0530 Message-Id: <20211215101534.45003-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211215101534.45003-1-jagan@amarulasolutions.com> References: <20211215101534.45003-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=h2E5KmgP; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Replace the manual panel handling code by a drm panel_bridge via devm_drm_of_get_bridge(). Adding panel_bridge handling, - Drops drm_connector and related operations as drm_bridge_attach creates connector during attachment. - Drops panel pointer and iterate the bridge, so-that it can operate the normal bridge and panel_bridge in constitutive callbacks. This simplifies the driver and allows all components in the display pipeline to be treated as bridges. Signed-off-by: Jagan Teki --- Changes for v4: - drop unneeded headers Changes for v3: - fix port number - add print for attached device Changes for v2: - new patch drivers/gpu/drm/exynos/exynos_drm_dsi.c | 167 ++++-------------------- 1 file changed, 28 insertions(+), 139 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 8d137857818c..14e16f2d594b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -25,9 +25,7 @@ #include #include -#include #include -#include #include #include #include @@ -221,6 +219,11 @@ enum exynos_dsi_transfer_type { EXYNOS_DSI_RX, }; +enum { + DSI_PORT_IN, + DSI_PORT_OUT +}; + struct exynos_dsi_transfer { struct list_head list; struct completion completed; @@ -254,8 +257,6 @@ struct exynos_dsi_driver_data { struct exynos_dsi { struct drm_encoder encoder; struct mipi_dsi_host dsi_host; - struct drm_connector connector; - struct drm_panel *panel; struct list_head bridge_chain; struct drm_bridge *out_bridge; struct device *dev; @@ -285,7 +286,6 @@ struct exynos_dsi { }; #define host_to_dsi(host) container_of(host, struct exynos_dsi, dsi_host) -#define connector_to_dsi(c) container_of(c, struct exynos_dsi, connector) static inline struct exynos_dsi *encoder_to_dsi(struct drm_encoder *e) { @@ -1391,42 +1391,21 @@ static void exynos_dsi_enable(struct drm_encoder *encoder) dsi->state |= DSIM_STATE_ENABLED; - if (dsi->panel) { - ret = drm_panel_prepare(dsi->panel); - if (ret < 0) - goto err_put_sync; - } else { - list_for_each_entry_reverse(iter, &dsi->bridge_chain, - chain_node) { - if (iter->funcs->pre_enable) - iter->funcs->pre_enable(iter); - } + list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) { + if (iter->funcs->pre_enable) + iter->funcs->pre_enable(iter); } exynos_dsi_set_display_mode(dsi); exynos_dsi_set_display_enable(dsi, true); - if (dsi->panel) { - ret = drm_panel_enable(dsi->panel); - if (ret < 0) - goto err_display_disable; - } else { - list_for_each_entry(iter, &dsi->bridge_chain, chain_node) { - if (iter->funcs->enable) - iter->funcs->enable(iter); - } + list_for_each_entry(iter, &dsi->bridge_chain, chain_node) { + if (iter->funcs->enable) + iter->funcs->enable(iter); } dsi->state |= DSIM_STATE_VIDOUT_AVAILABLE; return; - -err_display_disable: - exynos_dsi_set_display_enable(dsi, false); - drm_panel_unprepare(dsi->panel); - -err_put_sync: - dsi->state &= ~DSIM_STATE_ENABLED; - pm_runtime_put(dsi->dev); } static void exynos_dsi_disable(struct drm_encoder *encoder) @@ -1439,15 +1418,12 @@ static void exynos_dsi_disable(struct drm_encoder *encoder) dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE; - drm_panel_disable(dsi->panel); - list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) { if (iter->funcs->disable) iter->funcs->disable(iter); } exynos_dsi_set_display_enable(dsi, false); - drm_panel_unprepare(dsi->panel); list_for_each_entry(iter, &dsi->bridge_chain, chain_node) { if (iter->funcs->post_disable) @@ -1458,70 +1434,6 @@ static void exynos_dsi_disable(struct drm_encoder *encoder) pm_runtime_put_sync(dsi->dev); } -static enum drm_connector_status -exynos_dsi_detect(struct drm_connector *connector, bool force) -{ - return connector->status; -} - -static void exynos_dsi_connector_destroy(struct drm_connector *connector) -{ - drm_connector_unregister(connector); - drm_connector_cleanup(connector); - connector->dev = NULL; -} - -static const struct drm_connector_funcs exynos_dsi_connector_funcs = { - .detect = exynos_dsi_detect, - .fill_modes = drm_helper_probe_single_connector_modes, - .destroy = exynos_dsi_connector_destroy, - .reset = drm_atomic_helper_connector_reset, - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, -}; - -static int exynos_dsi_get_modes(struct drm_connector *connector) -{ - struct exynos_dsi *dsi = connector_to_dsi(connector); - - if (dsi->panel) - return drm_panel_get_modes(dsi->panel, connector); - - return 0; -} - -static const struct drm_connector_helper_funcs exynos_dsi_connector_helper_funcs = { - .get_modes = exynos_dsi_get_modes, -}; - -static int exynos_dsi_create_connector(struct drm_encoder *encoder) -{ - struct exynos_dsi *dsi = encoder_to_dsi(encoder); - struct drm_connector *connector = &dsi->connector; - struct drm_device *drm = encoder->dev; - int ret; - - connector->polled = DRM_CONNECTOR_POLL_HPD; - - ret = drm_connector_init(drm, connector, &exynos_dsi_connector_funcs, - DRM_MODE_CONNECTOR_DSI); - if (ret) { - DRM_DEV_ERROR(dsi->dev, - "Failed to initialize connector with drm\n"); - return ret; - } - - connector->status = connector_status_disconnected; - drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs); - drm_connector_attach_encoder(connector, encoder); - if (!drm->registered) - return 0; - - connector->funcs->reset(connector); - drm_connector_register(connector); - return 0; -} - static const struct drm_encoder_helper_funcs exynos_dsi_encoder_helper_funcs = { .enable = exynos_dsi_enable, .disable = exynos_dsi_disable, @@ -1533,33 +1445,23 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *device) { struct exynos_dsi *dsi = host_to_dsi(host); + struct device *dev = dsi->dev; struct drm_encoder *encoder = &dsi->encoder; struct drm_device *drm = encoder->dev; - struct drm_bridge *out_bridge; - - out_bridge = of_drm_find_bridge(device->dev.of_node); - if (out_bridge) { - drm_bridge_attach(encoder, out_bridge, NULL, 0); - dsi->out_bridge = out_bridge; - list_splice_init(&encoder->bridge_chain, &dsi->bridge_chain); - } else { - int ret = exynos_dsi_create_connector(encoder); - - if (ret) { - DRM_DEV_ERROR(dsi->dev, - "failed to create connector ret = %d\n", - ret); - drm_encoder_cleanup(encoder); - return ret; - } + int ret; - dsi->panel = of_drm_find_panel(device->dev.of_node); - if (IS_ERR(dsi->panel)) - dsi->panel = NULL; - else - dsi->connector.status = connector_status_connected; + dsi->out_bridge = devm_drm_of_get_bridge(dev, dev->of_node, DSI_PORT_OUT, 0); + if (IS_ERR(dsi->out_bridge)) { + ret = PTR_ERR(dsi->out_bridge); + DRM_DEV_ERROR(dev, "failed to find the bridge: %d\n", ret); + return ret; } + DRM_DEV_INFO(dev, "Attached %s device\n", device->name); + + drm_bridge_attach(encoder, dsi->out_bridge, NULL, 0); + list_splice_init(&encoder->bridge_chain, &dsi->bridge_chain); + /* * This is a temporary solution and should be made by more generic way. * @@ -1567,7 +1469,7 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, * TE interrupt handler. */ if (!(device->mode_flags & MIPI_DSI_MODE_VIDEO)) { - int ret = exynos_dsi_register_te_irq(dsi, &device->dev); + ret = exynos_dsi_register_te_irq(dsi, &device->dev); if (ret) return ret; } @@ -1594,18 +1496,10 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host, struct exynos_dsi *dsi = host_to_dsi(host); struct drm_device *drm = dsi->encoder.dev; - if (dsi->panel) { - mutex_lock(&drm->mode_config.mutex); - exynos_dsi_disable(&dsi->encoder); - dsi->panel = NULL; - dsi->connector.status = connector_status_disconnected; - mutex_unlock(&drm->mode_config.mutex); - } else { - if (dsi->out_bridge->funcs->detach) - dsi->out_bridge->funcs->detach(dsi->out_bridge); - dsi->out_bridge = NULL; - INIT_LIST_HEAD(&dsi->bridge_chain); - } + if (dsi->out_bridge->funcs->detach) + dsi->out_bridge->funcs->detach(dsi->out_bridge); + dsi->out_bridge = NULL; + INIT_LIST_HEAD(&dsi->bridge_chain); if (drm->mode_config.poll_enabled) drm_kms_helper_hotplug_event(drm); @@ -1661,11 +1555,6 @@ static int exynos_dsi_of_read_u32(const struct device_node *np, return ret; } -enum { - DSI_PORT_IN, - DSI_PORT_OUT -}; - static int exynos_dsi_parse_dt(struct exynos_dsi *dsi) { struct device *dev = dsi->dev;