From patchwork Fri Nov 24 10:44:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengyang Chen X-Patchwork-Id: 169389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1072642vqx; Fri, 24 Nov 2023 02:47:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFkAC3i7qZ1iHVAm9Gh54NPRC0gOMG0SShj8YGH+HONkh7YYR03mMQ83JP+I+oO///xX7rB X-Received: by 2002:a17:902:b281:b0:1cf:67e0:8904 with SMTP id u1-20020a170902b28100b001cf67e08904mr1743878plr.43.1700822872709; Fri, 24 Nov 2023 02:47:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700822872; cv=none; d=google.com; s=arc-20160816; b=iTXziCvll5zP6YRUnN9tZYM39fl9VUavHv1hfHxZxqPS+3GgHV56e5urCkYzhQ+US5 hfMYbkZgRhyHaOmUsk/Wj8ts0wMwFjHxeCrkZJt4mTNxY7LYj+k2hSE5VsPXxjvcFJkK jsBCFLB9FSX/6Hi46dWLk3kThmCkBEoGxFIgOiIM4f4xz+dy+8ANgSvc7YUZTjUtE4WM IDKlDr+jhelvs3lb+3fz5rK6ZrTDypsgOOh9WhWmtW38u90unZch2euaoOitSdjC+zHe uQBeVmjugAMs/qn23WegfvdPhaksMjIzFlbFo9AZ5MN/Tjqegzs3RSHIzfUYV5MrH4F8 KWAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=jmVTqShxX40iFIDL2clcZhlcFJbH1jZtWTTqn+cH4Mo=; fh=HdKC1Y26FhBgoGJ8HMU+IavW3w3oWEnuTkb2R7hprvA=; b=L9RPpZx0ZmkFeo8V3PCVxqsnbUKBzl4ZVvWYpdvljfoCPAPOzC9O4R0tJocLto7kAl n9ReQaXkhhfd5nZKvyxH5ryoZjRUKy7XoCBZ4I9hAJyXNbwbCvISV36Bsx1Snjjz6qaR Aa3qsDUZgDBP+NTwUNWXp+94TdCU4p7M0R7gyP3iF32l8uVGNgQ/NhEOqphZBcVdbC3S JwlZIMTZH5s0lJVLgUWmVE62m1ZQuTHQNeL+1bTrlJpUO8bDgtNxK47LDQBl+ivkH9Vs poL2dtK6eyA4R7m0iMBSSvbQpIbB/Ih2PaextVOwLrTOFRxSLw0OnbBZ+w3Px2TQrX0t hafw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id b13-20020a170903228d00b001cc54873f98si3369194plh.149.2023.11.24.02.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 02:47:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2FA9E80ABFC8; Fri, 24 Nov 2023 02:45:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345693AbjKXKpF (ORCPT + 99 others); Fri, 24 Nov 2023 05:45:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345641AbjKXKo5 (ORCPT ); Fri, 24 Nov 2023 05:44:57 -0500 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A00E810FA; Fri, 24 Nov 2023 02:45:01 -0800 (PST) Received: from EXMBX165.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX165", Issuer "EXMBX165" (not verified)) by ex01.ufhost.com (Postfix) with ESMTP id 1D0B124E2EE; Fri, 24 Nov 2023 18:44:55 +0800 (CST) Received: from EXMBX171.cuchost.com (172.16.6.91) by EXMBX165.cuchost.com (172.16.6.75) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Nov 2023 18:44:55 +0800 Received: from yang-virtual-machine.localdomain (113.72.144.198) by EXMBX171.cuchost.com (172.16.6.91) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Nov 2023 18:44:53 +0800 From: Shengyang Chen To: , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v1 2/2] gpu: drm: panel: raspberrypi: add new display mode and new probing process Date: Fri, 24 Nov 2023 18:44:51 +0800 Message-ID: <20231124104451.44271-3-shengyang.chen@starfivetech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231124104451.44271-1-shengyang.chen@starfivetech.com> References: <20231124104451.44271-1-shengyang.chen@starfivetech.com> MIME-Version: 1.0 X-Originating-IP: [113.72.144.198] X-ClientProxiedBy: EXCAS062.cuchost.com (172.16.6.22) To EXMBX171.cuchost.com (172.16.6.91) X-YovoleRuleAgent: yovoleflag X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 24 Nov 2023 02:45:23 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783442044831260669 X-GMAIL-MSGID: 1783442044831260669 The waveshare 7inch touchscreen panel is a kind of raspberrypi pi panel and it can be drived by panel-raspberrypi-touchscreen.c. Add new display mode for it. In order to fit CDNS DSI driver which used by StarFive SoCs like JH7110, add new probing process for it. The compatible is used to distinguishing. Signed-off-by: Keith Zhao Signed-off-by: Shengyang Chen --- .../drm/panel/panel-raspberrypi-touchscreen.c | 99 ++++++++++++++++--- 1 file changed, 88 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c index 4618c892cdd6..4478f1568205 100644 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c @@ -194,6 +194,13 @@ struct rpi_touchscreen { struct i2c_client *i2c; }; +struct touchscreen_info { + const struct drm_display_mode *display_mode; + u32 display_mode_size; + int (*touchscreen_post_probe)(struct rpi_touchscreen *ts, struct mipi_dsi_host *host, + struct mipi_dsi_device_info *info); +}; + static const struct drm_display_mode rpi_touchscreen_modes[] = { { /* Modeline comes from the Raspberry Pi firmware, with HFP=1 @@ -211,6 +218,20 @@ static const struct drm_display_mode rpi_touchscreen_modes[] = { }, }; +static const struct drm_display_mode ws_touchscreen_modes[] = { + { + .clock = 29700000 / 1000, + .hdisplay = 800, + .hsync_start = 800 + 90, + .hsync_end = 800 + 90 + 5, + .htotal = 800 + 90 + 5 + 5, + .vdisplay = 480, + .vsync_start = 480 + 60, + .vsync_end = 480 + 60 + 5, + .vtotal = 480 + 60 + 5 + 5, + }, +}; + static struct rpi_touchscreen *panel_to_ts(struct drm_panel *panel) { return container_of(panel, struct rpi_touchscreen, base); @@ -319,9 +340,13 @@ static int rpi_touchscreen_get_modes(struct drm_panel *panel, { unsigned int i, num = 0; static const u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24; + const struct touchscreen_info *screen_info; + + screen_info = of_device_get_match_data(panel->dev); + + for (i = 0; i < screen_info->display_mode_size; i++) { + const struct drm_display_mode *m = &screen_info->display_mode[i]; - for (i = 0; i < ARRAY_SIZE(rpi_touchscreen_modes); i++) { - const struct drm_display_mode *m = &rpi_touchscreen_modes[i]; struct drm_display_mode *mode; mode = drm_mode_duplicate(connector->dev, m); @@ -360,12 +385,13 @@ static const struct drm_panel_funcs rpi_touchscreen_funcs = { .get_modes = rpi_touchscreen_get_modes, }; -static int rpi_touchscreen_probe(struct i2c_client *i2c) +static int touchscreen_probe(struct i2c_client *i2c) { struct device *dev = &i2c->dev; struct rpi_touchscreen *ts; struct device_node *endpoint, *dsi_host_node; struct mipi_dsi_host *host; + const struct touchscreen_info *screen_info; int ver; struct mipi_dsi_device_info info = { .type = RPI_DSI_DRIVER_NAME, @@ -421,14 +447,29 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c) of_node_put(endpoint); - ts->dsi = mipi_dsi_device_register_full(host, &info); + screen_info = of_device_get_match_data(&i2c->dev); + if (!screen_info->touchscreen_post_probe) + return -ENODEV; + + return screen_info->touchscreen_post_probe(ts, host, &info); + +error: + of_node_put(endpoint); + + return -ENODEV; +} + +static int rpi_touchscreen_probe(struct rpi_touchscreen *ts, struct mipi_dsi_host *host, + struct mipi_dsi_device_info *info) +{ + ts->dsi = mipi_dsi_device_register_full(host, info); if (IS_ERR(ts->dsi)) { - dev_err(dev, "DSI device registration failed: %ld\n", + dev_err(&ts->i2c->dev, "DSI device registration failed: %ld\n", PTR_ERR(ts->dsi)); return PTR_ERR(ts->dsi); } - drm_panel_init(&ts->base, dev, &rpi_touchscreen_funcs, + drm_panel_init(&ts->base, &ts->i2c->dev, &rpi_touchscreen_funcs, DRM_MODE_CONNECTOR_DSI); /* This appears last, as it's what will unblock the DSI host @@ -437,10 +478,33 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c) drm_panel_add(&ts->base); return 0; +} -error: - of_node_put(endpoint); - return -ENODEV; +static int ws_touchscreen_probe(struct rpi_touchscreen *ts, struct mipi_dsi_host *host, + struct mipi_dsi_device_info *info) + +{ + /* in order to match CDNS DSI driver , it is nessary + * to ensure drm_panel_init() & drm_panel_add() before + * mipi_dsi_device_register_full() + * + * after mipi_dsi_device_register_full finished , it will + * run rpi_touchscreen_dsi_probe -> mipi_dsi_attach() + * the CDNS DSI attach helper fun need to find the panel by + * of_drm_find_panel( ). so need add panel before the register. + */ + drm_panel_init(&ts->base, &ts->i2c->dev, &rpi_touchscreen_funcs, + DRM_MODE_CONNECTOR_DSI); + drm_panel_add(&ts->base); + + ts->dsi = mipi_dsi_device_register_full(host, info); + if (IS_ERR(ts->dsi)) { + dev_err(&ts->i2c->dev, "DSI device registration failed: %ld\n", + PTR_ERR(ts->dsi)); + return PTR_ERR(ts->dsi); + } + + return 0; } static void rpi_touchscreen_remove(struct i2c_client *i2c) @@ -477,8 +541,21 @@ static struct mipi_dsi_driver rpi_touchscreen_dsi_driver = { .probe = rpi_touchscreen_dsi_probe, }; +static const struct touchscreen_info rpi_touchscreen_info = { + .display_mode = rpi_touchscreen_modes, + .display_mode_size = ARRAY_SIZE(rpi_touchscreen_modes), + .touchscreen_post_probe = rpi_touchscreen_probe, +}; + +static const struct touchscreen_info ws_touchscreen_info = { + .display_mode = ws_touchscreen_modes, + .display_mode_size = ARRAY_SIZE(ws_touchscreen_modes), + .touchscreen_post_probe = ws_touchscreen_probe, +}; + static const struct of_device_id rpi_touchscreen_of_ids[] = { - { .compatible = "raspberrypi,7inch-touchscreen-panel" }, + { .compatible = "raspberrypi,7inch-touchscreen-panel", .data = &rpi_touchscreen_info,}, + { .compatible = "waveshare,7inch-touchscreen-panel", .data = &ws_touchscreen_info,}, { } /* sentinel */ }; MODULE_DEVICE_TABLE(of, rpi_touchscreen_of_ids); @@ -488,7 +565,7 @@ static struct i2c_driver rpi_touchscreen_driver = { .name = "rpi_touchscreen", .of_match_table = rpi_touchscreen_of_ids, }, - .probe = rpi_touchscreen_probe, + .probe = touchscreen_probe, .remove = rpi_touchscreen_remove, };