omapfb: Create new header file for omapfb DSS implementation

Copy the content of video/omapdss.h to a new (video/omapfb_dss.h) header file and convert the omapfb drivers to use this new file. The new header file is needed to complete the separation of omapdrm and omapfb implementation of DSS. Signed-off-by: Peter Ujfalusi <[email protected]>
2026-10-29 11:11:45 -04:00 · 2016-05-31 11:43:12 +03:00 · 2016-05-31 11:43:12 +03:00 · 62d9e44ee2
commit 62d9e44ee2
parent 32043da7dc
48 changed files with 927 additions and 47 deletions
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omap-panel-data.h>

 struct panel_drv_data {
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
@ -16,7 +16,7 @@

 #include <drm/drm_edid.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 static const struct omap_video_timings dvic_default_timings = {
 	.x_res		= 640,
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
@ -17,7 +17,7 @@

 #include <drm/drm_edid.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 static const struct omap_video_timings hdmic_default_timings = {
 	.x_res		= 640,
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
@ -20,7 +20,7 @@
 #include <linux/slab.h>
 #include <linux/of_gpio.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 struct panel_drv_data {
 	struct omap_dss_device dssdev;
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
@ -15,7 +15,7 @@
 #include <linux/slab.h>
 #include <linux/of_gpio.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 struct panel_drv_data {
 	struct omap_dss_device dssdev;
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio/consumer.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 struct panel_drv_data {
 	struct omap_dss_device dssdev;
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
@ -16,7 +16,7 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omap-panel-data.h>
 #include <video/of_display_timing.h>

--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
@ -25,7 +25,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/mipi_display.h>

 /* DSI Virtual channel. Hardcoded for now. */
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
@ -16,7 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/gpio.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 static struct omap_video_timings lb035q02_timings = {
 	.x_res = 320,
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
@ -18,7 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 struct panel_drv_data {
 	struct omap_dss_device	dssdev;
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 struct panel_drv_data {
 	struct omap_dss_device dssdev;
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c
@ -33,7 +33,7 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omap-panel-data.h>

 #define MIPID_CMD_READ_DISP_ID		0x04
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
@ -28,7 +28,7 @@
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
 #include <linux/gpio.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 struct panel_drv_data {
 	struct omap_dss_device dssdev;
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
@ -19,7 +19,7 @@
 #include <linux/slab.h>
 #include <linux/of_gpio.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #define TPO_R02_MODE(x)		((x) & 7)
 #define TPO_R02_MODE_800x480	7
--- a/drivers/video/fbdev/omap2/omapfb/dss/apply.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/apply.c
@ -23,7 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/jiffies.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
@ -35,7 +35,7 @@
 #include <linux/suspend.h>
 #include <linux/slab.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/seq_file.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
@ -41,7 +41,7 @@
 #include <linux/of.h>
 #include <linux/component.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
@ -18,7 +18,7 @@
 */

 #include <linux/kernel.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dispc.h"

--- a/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
@ -25,7 +25,7 @@
 #include <linux/platform_device.h>
 #include <linux/sysfs.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include "dss.h"

 static ssize_t display_name_show(struct omap_dss_device *dssdev, char *buf)
--- a/drivers/video/fbdev/omap2/omapfb/dss/display.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/display.c
@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include "dss.h"
 #include "dss_features.h"

--- a/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
@ -34,7 +34,7 @@
 #include <linux/clk.h>
 #include <linux/component.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@ -42,7 +42,7 @@
 #include <linux/of_platform.h>
 #include <linux/component.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/mipi_display.h>

 #include "dss.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
@ -18,7 +18,7 @@
 #include <linux/of.h>
 #include <linux/seq_file.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"

--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
@ -41,7 +41,7 @@
 #include <linux/suspend.h>
 #include <linux/component.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
@ -23,7 +23,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
@ -23,7 +23,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/hdmi.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <sound/omap-hdmi-audio.h>

 #include "dss.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
@ -33,7 +33,7 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/component.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <sound/omap-hdmi-audio.h>

 #include "hdmi4_core.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
@ -38,7 +38,7 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/component.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <sound/omap-hdmi-audio.h>

 #include "hdmi5_core.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
@ -4,7 +4,7 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/of.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "hdmi.h"

--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
@ -13,7 +13,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "hdmi.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "hdmi.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
@ -14,7 +14,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "hdmi.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
@ -26,7 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/jiffies.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/manager.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/manager.c
@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/jiffies.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/output.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/output.c
@ -21,7 +21,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"

--- a/drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
@ -26,7 +26,7 @@
 #include <linux/kobject.h>
 #include <linux/platform_device.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
@ -30,7 +30,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/pll.c
@ -22,7 +22,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/sched.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"

--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
@ -38,7 +38,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/component.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include "dss.h"

 struct rfbi_reg { u16 idx; };
--- a/drivers/video/fbdev/omap2/omapfb/dss/sdi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/sdi.c
@ -29,7 +29,7 @@
 #include <linux/of.h>
 #include <linux/component.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include "dss.h"

 static struct {
--- a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
@ -37,7 +37,7 @@
 #include <linux/of.h>
 #include <linux/component.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/sched.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #include "dss.h"
 #include "dss_features.h"
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
@ -30,7 +30,7 @@
 #include <linux/export.h>
 #include <linux/sizes.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omapvrfb.h>

 #include "omapfb.h"
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@ -30,7 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/omapfb.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omapvrfb.h>

 #include "omapfb.h"
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
@ -29,7 +29,7 @@
 #include <linux/mm.h>
 #include <linux/omapfb.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>
 #include <video/omapvrfb.h>

 #include "omapfb.h"
--- a/drivers/video/fbdev/omap2/omapfb/omapfb.h
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb.h
@ -31,7 +31,7 @@
 #include <linux/dma-attrs.h>
 #include <linux/dma-mapping.h>

-#include <video/omapdss.h>
+#include <video/omapfb_dss.h>

 #ifdef DEBUG
 extern bool omapfb_debug;