Page MenuHomeFreeBSD
Files F167644789

D39120.id.diff
No OneTemporary
Actions

D39120.id.diff
View Options

diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -244,7 +244,6 @@
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
--- a/sys/arm/freescale/imx/imx6_hdmi.c
+++ b/sys/arm/freescale/imx/imx6_hdmi.c
@@ -53,7 +53,7 @@
#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 @@
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
--- a/sys/arm/freescale/imx/imx6_ipu.c
+++ b/sys/arm/freescale/imx/imx6_ipu.c
@@ -59,7 +59,7 @@
#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 @@
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_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
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -74,7 +74,7 @@
#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 @@
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 @@
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
--- a/sys/arm/ti/am335x/tda19988.c
+++ b/sys/arm/ti/am335x/tda19988.c
@@ -53,7 +53,7 @@
#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 @@
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
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -86,7 +86,7 @@
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
--- a/sys/dev/hdmi/dwc_hdmi.c
+++ b/sys/dev/hdmi/dwc_hdmi.c
@@ -51,7 +51,7 @@
#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)
diff --git a/sys/dev/hdmi/dwc_hdmi_fdt.c b/sys/dev/hdmi/dwc_hdmi_fdt.c
--- a/sys/dev/hdmi/dwc_hdmi_fdt.c
+++ b/sys/dev/hdmi/dwc_hdmi_fdt.c
@@ -51,7 +51,7 @@
#include <dev/hdmi/dwc_hdmi.h>
-#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
rename from sys/dev/hdmi/hdmi_if.m
rename to sys/dev/video/crtc_if.m
--- a/sys/dev/hdmi/hdmi_if.m
+++ b/sys/dev/video/crtc_if.m
@@ -30,7 +30,7 @@
#include <dev/videomode/videomode.h>
#include <dev/videomode/edidvar.h>
-INTERFACE hdmi;
+INTERFACE crtc;
HEADER {
#include <sys/eventhandler.h>

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 24, 11:28 AM (4 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37182515
Default Alt Text
D39120.id.diff (4 KB)

Event Timeline