From nobody Fri Mar 17 11:34:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PdMVN6mlKz3yFkf; Fri, 17 Mar 2023 11:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PdMVN4WJdz3R3w; Fri, 17 Mar 2023 11:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679052876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fj2OobpsETjCtaeKEtaX4non4hrOrEe0t5MFp1NKXvA=; b=hOHhafjK3XCr0jNwkmqiv+EEZYBfJuKHSQuBfWnEdVZ6JE+LrtCnBYUngGijBoDt1A86xm jcTT6MYjnQq/Cz2Dhyn+pDlECk6+XhPYl5GALVsp0UDMGblUpF7Gca7Bz0VeLOcKhZUoJx CLObpBrJ6H53zkA5vWdXEfvChc7WRf0sPHdaNQp/ym+lhf1A7PlafMH7VMNdy0qFBnvA5s elQ49AkdwOWCtpWEWSJVEA60f63iVXPzC7Vi0KioqGhB4tl+P9F6WaxmxIPkIx3nM+gIWJ oxDhkuamYjKe+GJNzr7GKnNFdKiKiUE0jKY5cv6LOGm4/VLT0GIMMBk6R7gPvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679052876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fj2OobpsETjCtaeKEtaX4non4hrOrEe0t5MFp1NKXvA=; b=bt7oZrpeJ2YZNyBZH5pWvxsbFc0eR3ksVAMSyeFGc6Xpssk63vELhESPdJlLThvmsO6xNQ sG4j41soCIxv8SO30iqjsXjz0qk0VK5giSy8le1eE4xz8ZLxYCnsUeoydpsYFrnh9DqXEE 2vhsYznfh/23WOFeGNEDlJDE6Yw74PIBY6axO3VNvJbAmFCFwQCiZRxEqH2X26UWce5CAC Ow6utxJbrRvNQA7GbemVufrffMgwujsIZ19v9e52CazJJgivHe4TGhfSE+2ffvafSu7tjc rpDeWPmQJQ9S5l8T2EVK4/3QenCRjaiNT3RL2i/NcIDg/aKOP3dh6e9y/XkXzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679052876; a=rsa-sha256; cv=none; b=il9O7gItsAP0G6Q2lqGyI/StKvxn36wSEY57+DNfShnIHhYvsWrgnLjokcAqnW8S94q03/ zSwNok32X/Hm64sJpMFV/lqSO0F88/pRd/hRUTwhNlywVGuGlxfMgdqlIyBdtDfbNzZ4kY b+OkrW9iV8w68D+sewVV+/ybKEp0/9+jnTNtlhsahge2tUFXDpoYfYVT+pKMwheTPn8djv Rn2KQQ72zFQLH5yNVLQebyHS5Hg7f4CIOrDRlO/b3WXa/cWpSgVOGd2p2xMnQZsP4mE8ki aoFA+8MQzxW1V3Qb/trdJo+Q+3jNFYXrUGosag44PbJIOJqMixhmlcqltBzsWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PdMVN3Lh6zP75; Fri, 17 Mar 2023 11:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32HBYa2q082153; Fri, 17 Mar 2023 11:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32HBYaUc082152; Fri, 17 Mar 2023 11:34:36 GMT (envelope-from git) Date: Fri, 17 Mar 2023 11:34:36 GMT Message-Id: <202303171134.32HBYaUc082152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 00e84f52f098 - main - arm: Rename hdmi_if.m to crtc_if.m List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00e84f52f0985e6b2fd73694aa5f4b50a5f957af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=00e84f52f0985e6b2fd73694aa5f4b50a5f957af commit 00e84f52f0985e6b2fd73694aa5f4b50a5f957af Author: Emmanuel Vadot AuthorDate: 2023-03-16 09:48:06 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-17 12:34:57 +0000 arm: Rename hdmi_if.m to crtc_if.m There is nothing hdmi related in this interface, it's just a generic interface for crt controller so rename it. This also remove the 'hdmi' device used in arm kernel config. 'vt' now controls if we build this interface (sc(4) isn't supported on arm). Sponsored by: Beckhoff Automation GmbH & Co. KG Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D39120 --- sys/arm/conf/GENERIC | 1 - sys/arm/freescale/imx/imx6_hdmi.c | 8 ++++---- sys/arm/freescale/imx/imx6_ipu.c | 6 +++--- sys/arm/ti/am335x/am335x_lcd.c | 6 +++--- sys/arm/ti/am335x/tda19988.c | 8 ++++---- sys/conf/files.arm | 2 +- sys/dev/hdmi/dwc_hdmi.c | 2 +- sys/dev/hdmi/dwc_hdmi_fdt.c | 2 +- sys/dev/{hdmi/hdmi_if.m => video/crtc_if.m} | 2 +- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 74958061be46..815fd2a1881e 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -244,7 +244,6 @@ device vt device kbdmux device ums device videomode -device hdmi device vchiq # IMX6 HDMI Controller diff --git a/sys/arm/freescale/imx/imx6_hdmi.c b/sys/arm/freescale/imx/imx6_hdmi.c index 28a62a66fd01..f5b4a2ab0ac5 100644 --- a/sys/arm/freescale/imx/imx6_hdmi.c +++ b/sys/arm/freescale/imx/imx6_hdmi.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include -#include "hdmi_if.h" +#include "crtc_if.h" struct imx_hdmi_softc { struct dwc_hdmi_softc base; @@ -200,9 +200,9 @@ static device_method_t imx_hdmi_methods[] = { DEVMETHOD(device_attach, imx_hdmi_attach), DEVMETHOD(device_detach, imx_hdmi_detach), - /* HDMI methods */ - DEVMETHOD(hdmi_get_edid, dwc_hdmi_get_edid), - DEVMETHOD(hdmi_set_videomode, dwc_hdmi_set_videomode), + /* CRTC methods */ + DEVMETHOD(crtc_get_edid, dwc_hdmi_get_edid), + DEVMETHOD(crtc_set_videomode, dwc_hdmi_set_videomode), DEVMETHOD_END }; diff --git a/sys/arm/freescale/imx/imx6_ipu.c b/sys/arm/freescale/imx/imx6_ipu.c index be9487620a06..02bfbe8e0049 100644 --- a/sys/arm/freescale/imx/imx6_ipu.c +++ b/sys/arm/freescale/imx/imx6_ipu.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include "fb_if.h" -#include "hdmi_if.h" +#include "crtc_if.h" static int have_ipu = 0; @@ -1120,7 +1120,7 @@ ipu_hdmi_event(void *arg, device_t hdmi_dev) edid = NULL; edid_len = 0; - if (HDMI_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) { + if (CRTC_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) { device_printf(sc->sc_dev, "failed to get EDID info from HDMI framer\n"); } @@ -1150,7 +1150,7 @@ ipu_hdmi_event(void *arg, device_t hdmi_dev) ipu_init(sc); - HDMI_SET_VIDEOMODE(hdmi_dev, sc->sc_mode); + CRTC_SET_VIDEOMODE(hdmi_dev, sc->sc_mode); } static int diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c index 06563a476a3c..34f46613afac 100644 --- a/sys/arm/ti/am335x/am335x_lcd.c +++ b/sys/arm/ti/am335x/am335x_lcd.c @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); #include "am335x_pwm.h" #include "fb_if.h" -#include "hdmi_if.h" +#include "crtc_if.h" #define LCD_PID 0x00 #define LCD_CTRL 0x04 @@ -871,7 +871,7 @@ am335x_lcd_hdmi_event(void *arg, device_t hdmi, int event) edid = NULL; edid_len = 0; - if (HDMI_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) { + if (CRTC_GET_EDID(hdmi_dev, &edid, &edid_len) != 0) { device_printf(sc->sc_dev, "failed to get EDID info from HDMI framer\n"); return; } @@ -925,7 +925,7 @@ am335x_lcd_hdmi_event(void *arg, device_t hdmi, int event) hdmi_mode.hskew = videomode->hsync_end - videomode->hsync_start; hdmi_mode.flags |= VID_HSKEW; - HDMI_SET_VIDEOMODE(hdmi_dev, &hdmi_mode); + CRTC_SET_VIDEOMODE(hdmi_dev, &hdmi_mode); } static int diff --git a/sys/arm/ti/am335x/tda19988.c b/sys/arm/ti/am335x/tda19988.c index 8f3a626b7c42..ff3f374a9bcd 100644 --- a/sys/arm/ti/am335x/tda19988.c +++ b/sys/arm/ti/am335x/tda19988.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include "iicbus_if.h" -#include "hdmi_if.h" +#include "crtc_if.h" #define MKREG(page, addr) (((page) << 8) | (addr)) @@ -782,9 +782,9 @@ static device_method_t tda_methods[] = { DEVMETHOD(device_attach, tda19988_attach), DEVMETHOD(device_detach, tda19988_detach), - /* HDMI methods */ - DEVMETHOD(hdmi_get_edid, tda19988_get_edid), - DEVMETHOD(hdmi_set_videomode, tda19988_set_videomode), + /* CRTC methods */ + DEVMETHOD(crtc_get_edid, tda19988_get_edid), + DEVMETHOD(crtc_set_videomode, tda19988_set_videomode), {0, 0}, }; diff --git a/sys/conf/files.arm b/sys/conf/files.arm index de7dfdffa591..d236c083cc43 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -86,7 +86,7 @@ dev/dwc/if_dwc.c optional dwc dev/dwc/if_dwc_if.m optional dwc dev/fb/fb.c optional sc dev/fdt/fdt_arm_platform.c optional platform fdt -dev/hdmi/hdmi_if.m optional hdmi +dev/video/crtc_if.m optional vt dev/hwpmc/hwpmc_arm.c optional hwpmc dev/hwpmc/hwpmc_armv7.c optional hwpmc dev/iicbus/twsi/twsi.c optional twsi diff --git a/sys/dev/hdmi/dwc_hdmi.c b/sys/dev/hdmi/dwc_hdmi.c index 0f1388874292..52b0045a00ee 100644 --- a/sys/dev/hdmi/dwc_hdmi.c +++ b/sys/dev/hdmi/dwc_hdmi.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "hdmi_if.h" +#include "crtc_if.h" #define I2C_DDC_ADDR (0x50 << 1) #define I2C_DDC_SEGADDR (0x30 << 1) diff --git a/sys/dev/hdmi/dwc_hdmi_fdt.c b/sys/dev/hdmi/dwc_hdmi_fdt.c index 4486e83f1a73..810a1f53e2dc 100644 --- a/sys/dev/hdmi/dwc_hdmi_fdt.c +++ b/sys/dev/hdmi/dwc_hdmi_fdt.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include -#include "hdmi_if.h" +#include "crtc_if.h" struct dwc_hdmi_fdt_softc { struct dwc_hdmi_softc base; diff --git a/sys/dev/hdmi/hdmi_if.m b/sys/dev/video/crtc_if.m similarity index 99% rename from sys/dev/hdmi/hdmi_if.m rename to sys/dev/video/crtc_if.m index 81dbfa2009bb..8cf81bccccf9 100644 --- a/sys/dev/hdmi/hdmi_if.m +++ b/sys/dev/video/crtc_if.m @@ -30,7 +30,7 @@ #include #include -INTERFACE hdmi; +INTERFACE crtc; HEADER { #include