d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Rename hdmi_if.m to crtc_if.m

Browse Source 
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
This commit is contained in:
Emmanuel Vadot 2023-03-16 10:48:06 +01:00
parent 3bcb469c61
commit 00e84f52f0
9 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/arm/conf/GENERIC
View File

@ -244,7 +244,6 @@ device vt
device kbdmux
device ums
device videomode
device hdmi
device vchiq
# IMX6 HDMI Controller

8
sys/arm/freescale/imx/imx6_hdmi.c
View File

@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <dev/hdmi/dwc_hdmi.h>
#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
};

6
sys/arm/freescale/imx/imx6_ipu.c
View File

@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
#include <arm/freescale/imx/imx_ccmvar.h>
#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

6
sys/arm/ti/am335x/am335x_lcd.c
View File

@ -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

8
sys/arm/ti/am335x/tda19988.c
View File

@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <dev/videomode/edidvar.h>
#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},
};

2
sys/conf/files.arm
View File

@ -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

2
sys/dev/hdmi/dwc_hdmi.c
View File

@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
#include <dev/hdmi/dwc_hdmi.h>
#include <dev/hdmi/dwc_hdmireg.h>
#include "hdmi_if.h"
#include "crtc_if.h"
#define I2C_DDC_ADDR (0x50 << 1)
#define I2C_DDC_SEGADDR (0x30 << 1)

2
sys/dev/hdmi/dwc_hdmi_fdt.c
View File

@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
#include <dev/hdmi/dwc_hdmi.h>
#include "hdmi_if.h"
#include "crtc_if.h"
struct dwc_hdmi_fdt_softc {
struct dwc_hdmi_softc base;

2
sys/dev/hdmi/hdmi_if.m → sys/dev/video/crtc_if.m
View File

@ -30,7 +30,7 @@
#include <dev/videomode/videomode.h>
#include <dev/videomode/edidvar.h>
INTERFACE hdmi;
INTERFACE crtc;
HEADER {
#include <sys/eventhandler.h>