* [PATCH 20/23] OMAPDSS: remove extra EXPORT_SYMBOLs
From: Tomi Valkeinen @ 2015-12-09 15:59 UTC (permalink / raw)
To: linux-fbdev
The functions dispc_ovl_set_fifo_threshold and
dispc_ovl_compute_fifo_thresholds are exported, but not declared in
public headers, and thus are not used outside omapdss. So we can remove
the EXPORT_SYMBOL()s.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/dss/dispc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index c3ba555737b8..822add50f92e 100644
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -1270,7 +1270,6 @@ void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high)
plane != OMAP_DSS_WB)
dispc_write_reg(DISPC_OVL_PRELOAD(plane), min(high, 0xfffu));
}
-EXPORT_SYMBOL(dispc_ovl_set_fifo_threshold);
void dispc_enable_fifomerge(bool enable)
{
@@ -1329,7 +1328,6 @@ void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,
*fifo_high = total_fifo_size - buf_unit;
}
}
-EXPORT_SYMBOL(dispc_ovl_compute_fifo_thresholds);
static void dispc_ovl_set_mflag(enum omap_plane plane, bool enable)
{
--
2.5.0
^ permalink raw reply related
* [PATCH 21/23] OMAPDSS: make a two dss feat funcs internal to omapdss
From: Tomi Valkeinen @ 2015-12-09 15:59 UTC (permalink / raw)
To: linux-fbdev
dss_feat_get_supported_displays() and dss_feat_get_supported_outputs()
are not used outside omapdss, but are exported. We can thus remove the
export and move the declarations to the omapdss internal header.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/dss/dss_features.c | 2 --
drivers/video/fbdev/omap2/dss/dss_features.h | 4 ++++
include/video/omapdss.h | 2 --
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/omap2/dss/dss_features.c b/drivers/video/fbdev/omap2/dss/dss_features.c
index 48951c5cb352..c886a2927f73 100644
--- a/drivers/video/fbdev/omap2/dss/dss_features.c
+++ b/drivers/video/fbdev/omap2/dss/dss_features.c
@@ -835,13 +835,11 @@ enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel
{
return omap_current_dss_features->supported_displays[channel];
}
-EXPORT_SYMBOL(dss_feat_get_supported_displays);
enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel)
{
return omap_current_dss_features->supported_outputs[channel];
}
-EXPORT_SYMBOL(dss_feat_get_supported_outputs);
enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane)
{
diff --git a/drivers/video/fbdev/omap2/dss/dss_features.h b/drivers/video/fbdev/omap2/dss/dss_features.h
index 0e75927339c7..3d67d39f192f 100644
--- a/drivers/video/fbdev/omap2/dss/dss_features.h
+++ b/drivers/video/fbdev/omap2/dss/dss_features.h
@@ -101,4 +101,8 @@ bool dss_feat_rotation_type_supported(enum omap_dss_rotation_type rot_type);
bool dss_has_feature(enum dss_feat_id id);
void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end);
void dss_features_init(enum omapdss_version version);
+
+enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel);
+enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel);
+
#endif
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 0fedd93a639d..bbf942ebdd28 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -867,8 +867,6 @@ void omap_video_timings_to_videomode(const struct omap_video_timings *ovt,
int dss_feat_get_num_mgrs(void);
int dss_feat_get_num_ovls(void);
-enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel);
-enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel);
enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane);
--
2.5.0
^ permalink raw reply related
* [PATCH 22/23] OMAPDSS: change internal dispc functions to static
From: Tomi Valkeinen @ 2015-12-09 15:59 UTC (permalink / raw)
To: linux-fbdev
A bunch of dispc functions are only used inside dispc, so we can make
them static.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/dss/dispc.c | 15 ++++++++++-----
drivers/video/fbdev/omap2/dss/dss.h | 5 -----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index 822add50f92e..346822b55947 100644
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -251,6 +251,11 @@ struct color_conv_coef {
int full_range;
};
+static unsigned long dispc_fclk_rate(void);
+static unsigned long dispc_core_clk_rate(void);
+static unsigned long dispc_mgr_lclk_rate(enum omap_channel channel);
+static unsigned long dispc_mgr_pclk_rate(enum omap_channel channel);
+
static unsigned long dispc_plane_pclk_rate(enum omap_plane plane);
static unsigned long dispc_plane_lclk_rate(enum omap_plane plane);
@@ -2952,7 +2957,7 @@ static void dispc_mgr_set_lcd_type_tft(enum omap_channel channel)
mgr_fld_write(channel, DISPC_MGR_FLD_STNTFT, 1);
}
-void dispc_set_loadmode(enum omap_dss_load_mode mode)
+static void dispc_set_loadmode(enum omap_dss_load_mode mode)
{
REG_FLD_MOD(DISPC_CONFIG, mode, 2, 1);
}
@@ -3311,7 +3316,7 @@ static void dispc_mgr_get_lcd_divisor(enum omap_channel channel, int *lck_div,
*pck_div = FLD_GET(l, 7, 0);
}
-unsigned long dispc_fclk_rate(void)
+static unsigned long dispc_fclk_rate(void)
{
struct dss_pll *pll;
unsigned long r = 0;
@@ -3342,7 +3347,7 @@ unsigned long dispc_fclk_rate(void)
return r;
}
-unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
+static unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
{
struct dss_pll *pll;
int lcd;
@@ -3383,7 +3388,7 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
}
}
-unsigned long dispc_mgr_pclk_rate(enum omap_channel channel)
+static unsigned long dispc_mgr_pclk_rate(enum omap_channel channel)
{
unsigned long r;
@@ -3408,7 +3413,7 @@ void dispc_set_tv_pclk(unsigned long pclk)
dispc.tv_pclk_rate = pclk;
}
-unsigned long dispc_core_clk_rate(void)
+static unsigned long dispc_core_clk_rate(void)
{
return dispc.core_clk_rate;
}
diff --git a/drivers/video/fbdev/omap2/dss/dss.h b/drivers/video/fbdev/omap2/dss/dss.h
index 2406bcdb831a..fec68d8939bc 100644
--- a/drivers/video/fbdev/omap2/dss/dss.h
+++ b/drivers/video/fbdev/omap2/dss/dss.h
@@ -378,7 +378,6 @@ void dispc_lcd_enable_signal(bool enable);
void dispc_pck_free_enable(bool enable);
void dispc_enable_fifomerge(bool enable);
void dispc_enable_gamma_table(bool enable);
-void dispc_set_loadmode(enum omap_dss_load_mode mode);
typedef bool (*dispc_div_calc_func)(int lckd, int pckd, unsigned long lck,
unsigned long pck, void *data);
@@ -388,7 +387,6 @@ bool dispc_div_calc(unsigned long dispc,
bool dispc_mgr_timings_ok(enum omap_channel channel,
const struct omap_video_timings *timings);
-unsigned long dispc_fclk_rate(void);
int dispc_calc_clock_rates(unsigned long dispc_fclk_rate,
struct dispc_clock_info *cinfo);
@@ -398,9 +396,6 @@ void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,
u32 *fifo_low, u32 *fifo_high, bool use_fifomerge,
bool manual_update);
-unsigned long dispc_mgr_lclk_rate(enum omap_channel channel);
-unsigned long dispc_mgr_pclk_rate(enum omap_channel channel);
-unsigned long dispc_core_clk_rate(void);
void dispc_mgr_set_clock_div(enum omap_channel channel,
const struct dispc_clock_info *cinfo);
int dispc_mgr_get_clock_div(enum omap_channel channel,
--
2.5.0
^ permalink raw reply related
* [PATCH 23/23] OMAPDSS: remove extra out == NULL checks
From: Tomi Valkeinen @ 2015-12-09 15:59 UTC (permalink / raw)
To: linux-fbdev
All the output drivers check for 'out' being NULL, but it can never be
NULL. Remove the check.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/dss/dpi.c | 2 +-
drivers/video/fbdev/omap2/dss/dsi.c | 2 +-
drivers/video/fbdev/omap2/dss/hdmi4.c | 2 +-
drivers/video/fbdev/omap2/dss/hdmi5.c | 2 +-
drivers/video/fbdev/omap2/dss/rfbi.c | 2 +-
drivers/video/fbdev/omap2/dss/sdi.c | 2 +-
drivers/video/fbdev/omap2/dss/venc.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/video/fbdev/omap2/dss/dpi.c b/drivers/video/fbdev/omap2/dss/dpi.c
index fb45b6432968..7953e6a52346 100644
--- a/drivers/video/fbdev/omap2/dss/dpi.c
+++ b/drivers/video/fbdev/omap2/dss/dpi.c
@@ -395,7 +395,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
goto err_no_reg;
}
- if (out = NULL || out->manager = NULL) {
+ if (out->manager = NULL) {
DSSERR("failed to enable display: no output/manager\n");
r = -ENODEV;
goto err_no_out_mgr;
diff --git a/drivers/video/fbdev/omap2/dss/dsi.c b/drivers/video/fbdev/omap2/dss/dsi.c
index b3606def5b7b..59065e18444d 100644
--- a/drivers/video/fbdev/omap2/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/dss/dsi.c
@@ -3833,7 +3833,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
u16 word_count;
int r;
- if (out = NULL || out->manager = NULL) {
+ if (out->manager = NULL) {
DSSERR("failed to enable display: no output/manager\n");
return -ENODEV;
}
diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c
index 94c8d5549b4c..7103c659a534 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi4.c
@@ -343,7 +343,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
mutex_lock(&hdmi.lock);
- if (out = NULL || out->manager = NULL) {
+ if (out->manager = NULL) {
DSSERR("failed to enable display: no output/manager\n");
r = -ENODEV;
goto err0;
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c
index b59ba7902be1..a955a2c4c061 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi5.c
@@ -373,7 +373,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev)
mutex_lock(&hdmi.lock);
- if (out = NULL || out->manager = NULL) {
+ if (out->manager = NULL) {
DSSERR("failed to enable display: no output/manager\n");
r = -ENODEV;
goto err0;
diff --git a/drivers/video/fbdev/omap2/dss/rfbi.c b/drivers/video/fbdev/omap2/dss/rfbi.c
index 1525a494d057..aea6a1d0fb20 100644
--- a/drivers/video/fbdev/omap2/dss/rfbi.c
+++ b/drivers/video/fbdev/omap2/dss/rfbi.c
@@ -880,7 +880,7 @@ static int rfbi_display_enable(struct omap_dss_device *dssdev)
struct omap_dss_device *out = &rfbi.output;
int r;
- if (out = NULL || out->manager = NULL) {
+ if (out->manager = NULL) {
DSSERR("failed to enable display: no output/manager\n");
return -ENODEV;
}
diff --git a/drivers/video/fbdev/omap2/dss/sdi.c b/drivers/video/fbdev/omap2/dss/sdi.c
index 5843580a1deb..d747cc6b59e1 100644
--- a/drivers/video/fbdev/omap2/dss/sdi.c
+++ b/drivers/video/fbdev/omap2/dss/sdi.c
@@ -136,7 +136,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
unsigned long pck;
int r;
- if (out = NULL || out->manager = NULL) {
+ if (out->manager = NULL) {
DSSERR("failed to enable display: no output/manager\n");
return -ENODEV;
}
diff --git a/drivers/video/fbdev/omap2/dss/venc.c b/drivers/video/fbdev/omap2/dss/venc.c
index 99ca268c1cdd..c9260a451ca6 100644
--- a/drivers/video/fbdev/omap2/dss/venc.c
+++ b/drivers/video/fbdev/omap2/dss/venc.c
@@ -503,7 +503,7 @@ static int venc_display_enable(struct omap_dss_device *dssdev)
mutex_lock(&venc.venc_lock);
- if (out = NULL || out->manager = NULL) {
+ if (out->manager = NULL) {
DSSERR("Failed to enable display: no output/manager\n");
r = -ENODEV;
goto err0;
--
2.5.0
^ permalink raw reply related
* [PATCH 1/5] fbdev: omap2: panel-dpi: in .disable first disable backlight then display
From: Uwe Kleine-König @ 2015-12-10 13:11 UTC (permalink / raw)
To: linux-fbdev
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This makes .disable operate in reverse order compared to .enable.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
index f7be3489f744..06b6e611e4b2 100644
--- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
@@ -102,12 +102,12 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev)
if (!omapdss_device_is_enabled(dssdev))
return;
- if (ddata->enable_gpio)
- gpiod_set_value_cansleep(ddata->enable_gpio, 0);
-
if (gpio_is_valid(ddata->backlight_gpio))
gpio_set_value_cansleep(ddata->backlight_gpio, 0);
+ if (ddata->enable_gpio)
+ gpiod_set_value_cansleep(ddata->enable_gpio, 0);
+
in->ops.dpi->disable(in);
dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
--
2.6.2
^ permalink raw reply related
* [PATCH 2/5] fbdev: omap2: panel-dpi: simplify gpio setting
From: Uwe Kleine-König @ 2015-12-10 13:11 UTC (permalink / raw)
To: linux-fbdev
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
gpiod_set_value_cansleep is a noop when the passed descriptor is NULL.
So there is no need to duplicate the check for NULL; just call the
function unconditionally instead.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
index 06b6e611e4b2..e780fd4f8b46 100644
--- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
@@ -83,8 +83,7 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
if (r)
return r;
- if (ddata->enable_gpio)
- gpiod_set_value_cansleep(ddata->enable_gpio, 1);
+ gpiod_set_value_cansleep(ddata->enable_gpio, 1);
if (gpio_is_valid(ddata->backlight_gpio))
gpio_set_value_cansleep(ddata->backlight_gpio, 1);
@@ -105,8 +104,7 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev)
if (gpio_is_valid(ddata->backlight_gpio))
gpio_set_value_cansleep(ddata->backlight_gpio, 0);
- if (ddata->enable_gpio)
- gpiod_set_value_cansleep(ddata->enable_gpio, 0);
+ gpiod_set_value_cansleep(ddata->enable_gpio, 0);
in->ops.dpi->disable(in);
--
2.6.2
^ permalink raw reply related
* [PATCH 3/5] fbdev: omap2: panel-dpi: drop assignment to local variable
From: Uwe Kleine-König @ 2015-12-10 13:11 UTC (permalink / raw)
To: linux-fbdev
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
The variable gpio is only used to store the return value of
devm_gpiod_get_optional just to assign it to a member of the driver
data.
Get rid of this local variable and assign to driver data directly.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
index e780fd4f8b46..1216341a0d19 100644
--- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
@@ -205,13 +205,11 @@ static int panel_dpi_probe_of(struct platform_device *pdev)
int r;
struct display_timing timing;
struct videomode vm;
- struct gpio_desc *gpio;
- gpio = devm_gpiod_get_optional(&pdev->dev, "enable", GPIOD_OUT_LOW);
- if (IS_ERR(gpio))
- return PTR_ERR(gpio);
-
- ddata->enable_gpio = gpio;
+ ddata->enable_gpio = devm_gpiod_get_optional(&pdev->dev,
+ "enable", GPIOD_OUT_LOW);
+ if (IS_ERR(ddata->enable_gpio))
+ return PTR_ERR(ddata->enable_gpio);
ddata->backlight_gpio = -ENOENT;
--
2.6.2
^ permalink raw reply related
* [PATCH 4/5] fbdev: omap2: panel-dpi: allow specification of a reset gpio
From: Uwe Kleine-König @ 2015-12-10 13:11 UTC (permalink / raw)
To: linux-fbdev
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Some displays have a reset input. To assert that the display is
functional the reset gpio must be deasserted.
Teach the driver to get and drive such a gpio accordingly.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Documentation/devicetree/bindings/video/panel-dpi.txt | 1 +
drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/video/panel-dpi.txt b/Documentation/devicetree/bindings/video/panel-dpi.txt
index a40180b05bab..1a1d8f6f884f 100644
--- a/Documentation/devicetree/bindings/video/panel-dpi.txt
+++ b/Documentation/devicetree/bindings/video/panel-dpi.txt
@@ -7,6 +7,7 @@ Required properties:
Optional properties:
- label: a symbolic name for the panel
- enable-gpios: panel enable gpio
+- reset-gpios: GPIO to control the RESET pin
Required nodes:
- "panel-timing" containing video timings
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
index 1216341a0d19..7e2f9e0813dc 100644
--- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
@@ -32,6 +32,7 @@ struct panel_drv_data {
int backlight_gpio;
struct gpio_desc *enable_gpio;
+ struct gpio_desc *reset_gpio;
};
#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
@@ -83,6 +84,7 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
if (r)
return r;
+ gpiod_set_value_cansleep(ddata->reset_gpio, 0);
gpiod_set_value_cansleep(ddata->enable_gpio, 1);
if (gpio_is_valid(ddata->backlight_gpio))
@@ -211,6 +213,11 @@ static int panel_dpi_probe_of(struct platform_device *pdev)
if (IS_ERR(ddata->enable_gpio))
return PTR_ERR(ddata->enable_gpio);
+ ddata->reset_gpio = devm_gpiod_get_optional(&pdev->dev,
+ "reset", GPIOD_OUT_HIGH);
+ if (IS_ERR(ddata->reset_gpio))
+ return PTR_ERR(ddata->reset_gpio);
+
ddata->backlight_gpio = -ENOENT;
r = of_get_display_timing(node, "panel-timing", &timing);
--
2.6.2
^ permalink raw reply related
* [PATCH 5/5] fbdev: omap2: panel-dpi: allow specification of a vcc regulator
From: Uwe Kleine-König @ 2015-12-10 13:11 UTC (permalink / raw)
To: linux-fbdev
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
To allow supporting displays that need some logic to enable power to the
display add support for a vcc-supply property to drive a regulator.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Documentation/devicetree/bindings/video/panel-dpi.txt | 1 +
drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/Documentation/devicetree/bindings/video/panel-dpi.txt b/Documentation/devicetree/bindings/video/panel-dpi.txt
index 1a1d8f6f884f..eaa39d1b1279 100644
--- a/Documentation/devicetree/bindings/video/panel-dpi.txt
+++ b/Documentation/devicetree/bindings/video/panel-dpi.txt
@@ -8,6 +8,7 @@ Optional properties:
- label: a symbolic name for the panel
- enable-gpios: panel enable gpio
- reset-gpios: GPIO to control the RESET pin
+- vcc-supply: phandle of regulator that will be used to enable power to the display
Required nodes:
- "panel-timing" containing video timings
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
index 7e2f9e0813dc..65c6d9e6862b 100644
--- a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-dpi.c
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
+#include <linux/regulator/consumer.h>
#include <video/omapdss.h>
#include <video/omap-panel-data.h>
@@ -33,6 +34,7 @@ struct panel_drv_data {
struct gpio_desc *enable_gpio;
struct gpio_desc *reset_gpio;
+ struct regulator *vcc_supply;
};
#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)
@@ -84,6 +86,12 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
if (r)
return r;
+ r = regulator_enable(ddata->vcc_supply);
+ if (r) {
+ in->ops.dpi->disable(in);
+ return r;
+ }
+
gpiod_set_value_cansleep(ddata->reset_gpio, 0);
gpiod_set_value_cansleep(ddata->enable_gpio, 1);
@@ -107,6 +115,7 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev)
gpio_set_value_cansleep(ddata->backlight_gpio, 0);
gpiod_set_value_cansleep(ddata->enable_gpio, 0);
+ regulator_disable(ddata->vcc_supply);
in->ops.dpi->disable(in);
@@ -218,6 +227,10 @@ static int panel_dpi_probe_of(struct platform_device *pdev)
if (IS_ERR(ddata->reset_gpio))
return PTR_ERR(ddata->reset_gpio);
+ ddata->vcc_supply = devm_regulator_get(&pdev->dev, "vcc");
+ if (IS_ERR(ddata->vcc_supply))
+ return PTR_ERR(ddata->vcc_supply);
+
ddata->backlight_gpio = -ENOENT;
r = of_get_display_timing(node, "panel-timing", &timing);
--
2.6.2
^ permalink raw reply related
* [PATCH RFC 0/9] omapdrm/omapfb/omapdss split
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
Hi,
Here's an RFC series to fix the mess we have at the moment with
omapdrm/omapfb/omapdss.
First, a short background on the current status. We have the following
entities:
* omapdss, located in drivers/video/fbdev/omap2/dss/. This is a driver for the
display subsystem IPs used on OMAP (and related) SoCs. It offers only a
kernel internal API, and does not implement anything for fbdev or drm.
* omapdss panels and encoders, located in
drivers/video/fbdev/omap2/displays-new/. These are panel and external encoder
drivers, which use APIs offered by omapdss driver. These also don't implement
anything for fbdev or drm.
* omapdrm, located in drivers/gpu/drm/omapdrm/. This is a drm driver, which
uses omapdss and the panel/encoder drivers to operate the hardware.
* omapfb, located in drivers/video/fbdev/omap2/omapfb/. This is an fbdev
driver, which uses omapdss and the panel/encoder drivers to operate the
hardware.
* omap_vout, located in drivers/media/platform/omap/. This is a v4l2 driver,
which uses omapdss and omapfb to implement a v4l2 API for the video overlays.
So, on the top level, we have either omapdrm, or omapfb+omap_vout. Both of
those use the same low level drivers. Without going to the historical details
why the architecture is like that, I think it's finally time to change that.
The situation with omapfb+omap_vout is that it still works, but no new features
have been added for a long time, and I want to keep it working as it's still
being used. At some point in the future I'd like to remove omapfb and
omap_vout altogether.
Omapdrm, on the other hand, is being actively developed. Sharing the low level
parts with omapfb makes that development more difficult than it should be. It
also "hides" half of the development, as everything happening in the low level
parts resides under fbdev directory, not in the drm directory.
I've been wanting to clean this up for a long time, but I haven't figured out a
very good way to do it. I still haven't, but here's the best way I have come up
with.
This series makes a full copy of the low level parts, omapdss and panel/encoder
drivers. Both omapfb+omap_vout and omapdrm will have their own versions. The
copy omapfb+omap_vout get is a new copy, and the copy that omapdrm gets is just
the current files moved. This way git will associate the omapdrm version with
the old files.
The omapfb+omap_vout versions won't be touched unless there are some big issues
there.
The omapdrm versions can be refactored and cleaned up, as the omapfb support
code is no longer needed. We can perhaps also merge omapdss and omapdrm into
the same kernel module.
This series only does the copy, and the absolutely necessary parts. No further
cleanups are done yet.
Tomi
Tomi Valkeinen (9):
omapfb: allow compilation only if DRM_OMAP is disabled
omapfb: copy omapdss & displays for omapfb
omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h
omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP*
omapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_*
omapfb: take omapfb's prive omapdss into use
omapfb: move vrfb into omapfb
drm/omap: move omapdss & displays under omapdrm
drm/omap: make omapdrm select OMAP2_DSS
drivers/gpu/drm/Makefile | 2 +-
drivers/gpu/drm/omapdrm/Kconfig | 10 +-
drivers/gpu/drm/omapdrm/Makefile | 3 +
.../drm/omapdrm/displays}/Kconfig | 3 +-
.../drm/omapdrm/displays}/Makefile | 0
.../drm/omapdrm/displays}/connector-analog-tv.c | 0
.../drm/omapdrm/displays}/connector-dvi.c | 0
.../drm/omapdrm/displays}/connector-hdmi.c | 0
.../drm/omapdrm/displays}/encoder-opa362.c | 0
.../drm/omapdrm/displays}/encoder-tfp410.c | 0
.../drm/omapdrm/displays}/encoder-tpd12s015.c | 0
.../drm/omapdrm/displays}/panel-dpi.c | 0
.../drm/omapdrm/displays}/panel-dsi-cm.c | 0
.../omapdrm/displays}/panel-lgphilips-lb035q02.c | 0
.../drm/omapdrm/displays}/panel-nec-nl8048hl11.c | 0
.../omapdrm/displays}/panel-sharp-ls037v7dw01.c | 0
.../drm/omapdrm/displays}/panel-sony-acx565akm.c | 0
.../drm/omapdrm/displays}/panel-tpo-td028ttec1.c | 0
.../drm/omapdrm/displays}/panel-tpo-td043mtea1.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h | 0
.../omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h | 0
.../omap2 => gpu/drm/omapdrm}/dss/dss_features.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/dss_features.h | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h | 0
.../omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c | 0
.../drm/omapdrm}/dss/omapdss-boot-init.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c | 0
.../fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c | 0
.../omap2 => gpu/drm/omapdrm}/dss/video-pll.c | 0
drivers/media/platform/omap/Kconfig | 2 +-
drivers/video/fbdev/omap2/Kconfig | 5 -
drivers/video/fbdev/omap2/Makefile | 6 +-
drivers/video/fbdev/omap2/omapfb/Kconfig | 14 +-
drivers/video/fbdev/omap2/omapfb/Makefile | 3 +
drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 86 +
drivers/video/fbdev/omap2/omapfb/displays/Makefile | 14 +
.../omap2/omapfb/displays/connector-analog-tv.c | 320 ++
.../fbdev/omap2/omapfb/displays/connector-dvi.c | 398 ++
.../fbdev/omap2/omapfb/displays/connector-hdmi.c | 348 ++
.../fbdev/omap2/omapfb/displays/encoder-opa362.c | 278 +
.../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 320 ++
.../omap2/omapfb/displays/encoder-tpd12s015.c | 379 ++
.../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 330 ++
.../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 1388 +++++
.../omapfb/displays/panel-lgphilips-lb035q02.c | 404 ++
.../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 437 ++
.../omapfb/displays/panel-sharp-ls037v7dw01.c | 415 ++
.../omap2/omapfb/displays/panel-sony-acx565akm.c | 917 ++++
.../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 511 ++
.../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 686 +++
drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 129 +
drivers/video/fbdev/omap2/omapfb/dss/Makefile | 18 +
drivers/video/fbdev/omap2/omapfb/dss/apply.c | 1702 ++++++
drivers/video/fbdev/omap2/omapfb/dss/core.c | 343 ++
.../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 667 +++
.../video/fbdev/omap2/omapfb/dss/dispc-compat.h | 30 +
drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4135 +++++++++++++++
drivers/video/fbdev/omap2/omapfb/dss/dispc.h | 916 ++++
drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c | 325 ++
.../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 356 ++
drivers/video/fbdev/omap2/omapfb/dss/display.c | 338 ++
drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 899 ++++
drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 5607 ++++++++++++++++++++
drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 183 +
drivers/video/fbdev/omap2/omapfb/dss/dss.c | 1323 +++++
drivers/video/fbdev/omap2/omapfb/dss/dss.h | 472 ++
.../video/fbdev/omap2/omapfb/dss/dss_features.c | 962 ++++
.../video/fbdev/omap2/omapfb/dss/dss_features.h | 105 +
drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 370 ++
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 839 +++
drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 904 ++++
drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h | 273 +
drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 876 +++
drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 916 ++++
drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h | 304 ++
drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | 148 +
drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 247 +
drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 255 +
drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 282 +
.../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 531 ++
drivers/video/fbdev/omap2/omapfb/dss/manager.c | 263 +
.../fbdev/omap2/omapfb/dss/omapdss-boot-init.c | 227 +
drivers/video/fbdev/omap2/omapfb/dss/output.c | 267 +
.../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 456 ++
drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 202 +
drivers/video/fbdev/omap2/omapfb/dss/pll.c | 389 ++
drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 1078 ++++
drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 454 ++
drivers/video/fbdev/omap2/omapfb/dss/venc.c | 997 ++++
drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 211 +
drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c | 0
include/video/omapdss.h | 2 -
122 files changed, 36260 insertions(+), 20 deletions(-)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Kconfig (96%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Makefile (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-analog-tv.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-dvi.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-hdmi.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-opa362.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tfp410.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tpd12s015.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dpi.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dsi-cm.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-lgphilips-lb035q02.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-nec-nl8048hl11.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sharp-ls037v7dw01.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sony-acx565akm.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td028ttec1.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td043mtea1.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/omapdss-boot-init.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/video-pll.c (100%)
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/Kconfig
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/Makefile
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/Kconfig
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/Makefile
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/apply.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/core.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.h
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc.h
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/display.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dpi.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dsi.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss.h
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss_features.h
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/manager.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/output.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/overlay.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/pll.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/sdi.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/venc.c
create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
rename drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c (100%)
--
2.5.0
^ permalink raw reply
* [PATCH RFC 1/9] omapfb: allow compilation only if DRM_OMAP is disabled
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
At the moment omapfb and omapdrm can be compiled at the same time, if
both are modules. However, they can't be both loaded, as they use the
same hardware. This has been mostly for compile testing.
To make it clear that omapfb and omapdrm are mutually exclusive drivers,
this patch makes omapfb available only if omapdrm is disabled.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/omapfb/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/Kconfig b/drivers/video/fbdev/omap2/omapfb/Kconfig
index 4cb12ce68855..7ba1a22199b8 100644
--- a/drivers/video/fbdev/omap2/omapfb/Kconfig
+++ b/drivers/video/fbdev/omap2/omapfb/Kconfig
@@ -1,6 +1,7 @@
menuconfig FB_OMAP2
tristate "OMAP2+ frame buffer support"
- depends on FB && OMAP2_DSS && !DRM_OMAP
+ depends on FB
+ depends on DRM_OMAP = n
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select FB_CFB_FILLRECT
--
2.5.0
^ permalink raw reply related
* [PATCH RFC 3/9] omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
We are about to make a private copy of omapdss for omapfb and for
omapdrm. The omapdss.h file will still be shared for the time being. The
copy will need to change the config symbols, and we happen to have one
use of these config symbols in omapdss.h which needs to be removed.
Luckily we can just delete the use of CONFIG_OMAP2_DSS_VENC from
omapdss, as it's used only to hide extern declarations, and there's no
harm to have those declarations even if CONFIG_OMAP2_DSS_VENC is not
set.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
include/video/omapdss.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index f001a356fd98..67f0d67001dc 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -367,14 +367,12 @@ struct omap_video_timings {
enum omap_dss_signal_edge sync_pclk_edge;
};
-#ifdef CONFIG_OMAP2_DSS_VENC
/* Hardcoded timings for tv modes. Venc only uses these to
* identify the mode, and does not actually use the configs
* itself. However, the configs should be something that
* a normal monitor can also show */
extern const struct omap_video_timings omap_dss_pal_timings;
extern const struct omap_video_timings omap_dss_ntsc_timings;
-#endif
struct omap_dss_cpr_coefs {
s16 rr, rg, rb;
--
2.5.0
^ permalink raw reply related
* [PATCH RFC 4/9] omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP*
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
We need to change the config symbols of omapfb's private copy of
omapdss so that we won't have config symbol conflicts.
This patch changes the symbols from omapdss using simple replacement of
CONFIG_OMAP* to CONFIG_FB_OMAP*.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 46 ++++++++++------------
drivers/video/fbdev/omap2/omapfb/dss/Makefile | 22 +++++------
drivers/video/fbdev/omap2/omapfb/dss/core.c | 34 ++++++++--------
.../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 8 ++--
drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4 +-
.../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 2 +-
drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 10 ++---
drivers/video/fbdev/omap2/omapfb/dss/dss.c | 6 +--
drivers/video/fbdev/omap2/omapfb/dss/dss.h | 10 ++---
drivers/video/fbdev/omap2/omapfb/dss/venc.c | 2 +-
10 files changed, 69 insertions(+), 75 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
index d1fa730c7d54..27d220212870 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
+++ b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
@@ -1,17 +1,13 @@
-config OMAP2_DSS_INIT
+config FB_OMAP2_DSS_INIT
bool
-menuconfig OMAP2_DSS
- tristate "OMAP2+ Display Subsystem support"
+config FB_OMAP2_DSS
+ tristate
select VIDEOMODE_HELPERS
- select OMAP2_DSS_INIT
+ select FB_OMAP2_DSS_INIT
select HDMI
- help
- OMAP2+ Display Subsystem support.
-if OMAP2_DSS
-
-config OMAP2_DSS_DEBUG
+config FB_OMAP2_DSS_DEBUG
bool "Debug support"
default n
help
@@ -19,7 +15,7 @@ config OMAP2_DSS_DEBUG
can also be enabled by setting CONFIG_DYNAMIC_DEBUG and then setting
appropriate flags in <debugfs>/dynamic_debug/control.
-config OMAP2_DSS_DEBUGFS
+config FB_OMAP2_DSS_DEBUGFS
bool "Debugfs filesystem support"
depends on DEBUG_FS
default n
@@ -28,9 +24,9 @@ config OMAP2_DSS_DEBUGFS
querying about clock configuration and register configuration of dss,
dispc, dsi, hdmi and rfbi.
-config OMAP2_DSS_COLLECT_IRQ_STATS
+config FB_OMAP2_DSS_COLLECT_IRQ_STATS
bool "Collect DSS IRQ statistics"
- depends on OMAP2_DSS_DEBUGFS
+ depends on FB_OMAP2_DSS_DEBUGFS
default n
help
Collect DSS IRQ statistics, printable via debugfs.
@@ -39,13 +35,13 @@ config OMAP2_DSS_COLLECT_IRQ_STATS
<debugfs>/omapdss/dispc_irq for DISPC interrupts, and
<debugfs>/omapdss/dsi_irq for DSI interrupts.
-config OMAP2_DSS_DPI
+config FB_OMAP2_DSS_DPI
bool "DPI support"
default y
help
DPI Interface. This is the Parallel Display Interface.
-config OMAP2_DSS_RFBI
+config FB_OMAP2_DSS_RFBI
bool "RFBI support"
depends on BROKEN
default n
@@ -58,32 +54,32 @@ config OMAP2_DSS_RFBI
See http://www.mipi.org/ for DBI specifications.
-config OMAP2_DSS_VENC
+config FB_OMAP2_DSS_VENC
bool "VENC support"
default y
help
OMAP Video Encoder support for S-Video and composite TV-out.
-config OMAP2_DSS_HDMI_COMMON
+config FB_OMAP2_DSS_HDMI_COMMON
bool
-config OMAP4_DSS_HDMI
+config FB_OMAP4_DSS_HDMI
bool "HDMI support for OMAP4"
default y
- select OMAP2_DSS_HDMI_COMMON
+ select FB_OMAP2_DSS_HDMI_COMMON
help
HDMI support for OMAP4 based SoCs.
-config OMAP5_DSS_HDMI
+config FB_OMAP5_DSS_HDMI
bool "HDMI support for OMAP5"
default n
- select OMAP2_DSS_HDMI_COMMON
+ select FB_OMAP2_DSS_HDMI_COMMON
help
HDMI Interface for OMAP5 and similar cores. This adds the High
Definition Multimedia Interface. See http://www.hdmi.org/ for HDMI
specification.
-config OMAP2_DSS_SDI
+config FB_OMAP2_DSS_SDI
bool "SDI support"
default n
help
@@ -92,7 +88,7 @@ config OMAP2_DSS_SDI
SDI is a high speed one-way display serial bus between the host
processor and a display.
-config OMAP2_DSS_DSI
+config FB_OMAP2_DSS_DSI
bool "DSI support"
default n
help
@@ -103,7 +99,7 @@ config OMAP2_DSS_DSI
See http://www.mipi.org/ for DSI specifications.
-config OMAP2_DSS_MIN_FCK_PER_PCK
+config FB_OMAP2_DSS_MIN_FCK_PER_PCK
int "Minimum FCK/PCK ratio (for scaling)"
range 0 32
default 0
@@ -121,7 +117,7 @@ config OMAP2_DSS_MIN_FCK_PER_PCK
Max FCK is 173MHz, so this doesn't work if your PCK
is very high.
-config OMAP2_DSS_SLEEP_AFTER_VENC_RESET
+config FB_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
bool "Sleep 20ms after VENC reset"
default y
help
@@ -131,5 +127,3 @@ config OMAP2_DSS_SLEEP_AFTER_VENC_RESET
This option enables the sleep, and is enabled by default. You can
disable the sleep if it doesn't cause problems on your platform.
-
-endif
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/Makefile b/drivers/video/fbdev/omap2/omapfb/dss/Makefile
index b5136d3d4b77..02308e24f3ef 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile
+++ b/drivers/video/fbdev/omap2/omapfb/dss/Makefile
@@ -1,18 +1,18 @@
-obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o
-obj-$(CONFIG_OMAP2_DSS) += omapdss.o
+obj-$(CONFIG_FB_OMAP2_DSS_INIT) += omapdss-boot-init.o
+obj-$(CONFIG_FB_OMAP2_DSS) += omapdss.o
# Core DSS files
omapdss-y := core.o dss.o dss_features.o dispc.o dispc_coefs.o display.o \
output.o dss-of.o pll.o video-pll.o
# DSS compat layer files
omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \
dispc-compat.o display-sysfs.o
-omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o
-omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
-omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
-omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
-omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o
-omapdss-$(CONFIG_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \
+omapdss-$(CONFIG_FB_OMAP2_DSS_DPI) += dpi.o
+omapdss-$(CONFIG_FB_OMAP2_DSS_RFBI) += rfbi.o
+omapdss-$(CONFIG_FB_OMAP2_DSS_VENC) += venc.o
+omapdss-$(CONFIG_FB_OMAP2_DSS_SDI) += sdi.o
+omapdss-$(CONFIG_FB_OMAP2_DSS_DSI) += dsi.o
+omapdss-$(CONFIG_FB_OMAP2_DSS_HDMI_COMMON) += hdmi_common.o hdmi_wp.o hdmi_pll.o \
hdmi_phy.o
-omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o
-omapdss-$(CONFIG_OMAP5_DSS_HDMI) += hdmi5.o hdmi5_core.o
-ccflags-$(CONFIG_OMAP2_DSS_DEBUG) += -DDEBUG
+omapdss-$(CONFIG_FB_OMAP4_DSS_HDMI) += hdmi4.o hdmi4_core.o
+omapdss-$(CONFIG_FB_OMAP5_DSS_HDMI) += hdmi5.o hdmi5_core.o
+ccflags-$(CONFIG_FB_OMAP2_DSS_DEBUG) += -DDEBUG
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c
index 54eeb507f9b3..5a87179b7312 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
@@ -98,7 +98,7 @@ int dss_set_min_bus_tput(struct device *dev, unsigned long tput)
return 0;
}
-#if defined(CONFIG_OMAP2_DSS_DEBUGFS)
+#if defined(CONFIG_FB_OMAP2_DSS_DEBUGFS)
static int dss_debug_show(struct seq_file *s, void *unused)
{
void (*func)(struct seq_file *) = s->private;
@@ -150,7 +150,7 @@ int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))
return PTR_ERR_OR_ZERO(d);
}
-#else /* CONFIG_OMAP2_DSS_DEBUGFS */
+#else /* CONFIG_FB_OMAP2_DSS_DEBUGFS */
static inline int dss_initialize_debugfs(void)
{
return 0;
@@ -162,7 +162,7 @@ int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))
{
return 0;
}
-#endif /* CONFIG_OMAP2_DSS_DEBUGFS */
+#endif /* CONFIG_FB_OMAP2_DSS_DEBUGFS */
/* PLATFORM DEVICE */
static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d)
@@ -247,49 +247,49 @@ static struct platform_driver omap_dss_driver = {
static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
dss_init_platform_driver,
dispc_init_platform_driver,
-#ifdef CONFIG_OMAP2_DSS_DSI
+#ifdef CONFIG_FB_OMAP2_DSS_DSI
dsi_init_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_DPI
+#ifdef CONFIG_FB_OMAP2_DSS_DPI
dpi_init_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_SDI
+#ifdef CONFIG_FB_OMAP2_DSS_SDI
sdi_init_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_RFBI
+#ifdef CONFIG_FB_OMAP2_DSS_RFBI
rfbi_init_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_VENC
+#ifdef CONFIG_FB_OMAP2_DSS_VENC
venc_init_platform_driver,
#endif
-#ifdef CONFIG_OMAP4_DSS_HDMI
+#ifdef CONFIG_FB_OMAP4_DSS_HDMI
hdmi4_init_platform_driver,
#endif
-#ifdef CONFIG_OMAP5_DSS_HDMI
+#ifdef CONFIG_FB_OMAP5_DSS_HDMI
hdmi5_init_platform_driver,
#endif
};
static void (*dss_output_drv_unreg_funcs[])(void) = {
-#ifdef CONFIG_OMAP5_DSS_HDMI
+#ifdef CONFIG_FB_OMAP5_DSS_HDMI
hdmi5_uninit_platform_driver,
#endif
-#ifdef CONFIG_OMAP4_DSS_HDMI
+#ifdef CONFIG_FB_OMAP4_DSS_HDMI
hdmi4_uninit_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_VENC
+#ifdef CONFIG_FB_OMAP2_DSS_VENC
venc_uninit_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_RFBI
+#ifdef CONFIG_FB_OMAP2_DSS_RFBI
rfbi_uninit_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_SDI
+#ifdef CONFIG_FB_OMAP2_DSS_SDI
sdi_uninit_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_DPI
+#ifdef CONFIG_FB_OMAP2_DSS_DPI
dpi_uninit_platform_driver,
#endif
-#ifdef CONFIG_OMAP2_DSS_DSI
+#ifdef CONFIG_FB_OMAP2_DSS_DSI
dsi_uninit_platform_driver,
#endif
dispc_uninit_platform_driver,
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
index 633c461fbc6e..262e3eeb2724 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
@@ -60,14 +60,14 @@ static struct {
u32 error_irqs;
struct work_struct error_work;
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
spinlock_t irq_stats_lock;
struct dispc_irq_stats irq_stats;
#endif
} dispc_compat;
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
static void dispc_dump_irqs(struct seq_file *s)
{
unsigned long flags;
@@ -279,7 +279,7 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *arg)
return IRQ_NONE;
}
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
spin_lock(&dispc_compat.irq_stats_lock);
dispc_compat.irq_stats.irq_count++;
dss_collect_irq_stats(irqstatus, dispc_compat.irq_stats.irqs);
@@ -416,7 +416,7 @@ int dss_dispc_initialize_irq(void)
{
int r;
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
spin_lock_init(&dispc_compat.irq_stats_lock);
dispc_compat.irq_stats.last_reset = jiffies;
dss_debugfs_create_file("dispc_irq", dispc_dump_irqs);
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
index be716c9ffb88..10f060ecd9cb 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
@@ -3626,8 +3626,8 @@ bool dispc_div_calc(unsigned long dispc,
unsigned min_fck_per_pck;
unsigned long fck;
-#ifdef CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK
- min_fck_per_pck = CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK;
+#ifdef CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK
+ min_fck_per_pck = CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK;
#else
min_fck_per_pck = 0;
#endif
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c b/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
index 6ad0991f8259..75b5286029ee 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
@@ -120,7 +120,7 @@ static ssize_t display_timings_store(struct omap_dss_device *dssdev,
return -ENOENT;
found = 0;
-#ifdef CONFIG_OMAP2_DSS_VENC
+#ifdef CONFIG_FB_OMAP2_DSS_VENC
if (strncmp("pal", buf, 3) = 0) {
t = omap_dss_pal_timings;
found = 1;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index b3606def5b7b..c0b3e82a15b8 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -369,7 +369,7 @@ struct dsi_data {
int debug_read;
int debug_write;
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
spinlock_t irq_stats_lock;
struct dsi_irq_stats irq_stats;
#endif
@@ -698,7 +698,7 @@ static void print_irq_status_cio(u32 status)
#undef PIS
}
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
static void dsi_collect_irq_stats(struct platform_device *dsidev, u32 irqstatus,
u32 *vcstatus, u32 ciostatus)
{
@@ -1551,7 +1551,7 @@ void dsi_dump_clocks(struct seq_file *s)
}
}
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
static void dsi_dump_dsidev_irqs(struct platform_device *dsidev,
struct seq_file *s)
{
@@ -5296,7 +5296,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
spin_lock_init(&dsi->errors_lock);
dsi->errors = 0;
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
spin_lock_init(&dsi->irq_stats_lock);
dsi->irq_stats.last_reset = jiffies;
#endif
@@ -5468,7 +5468,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
else if (dsi->module_id = 1)
dss_debugfs_create_file("dsi2_regs", dsi2_dump_regs);
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
if (dsi->module_id = 0)
dss_debugfs_create_file("dsi1_irqs", dsi1_dump_irqs);
else if (dsi->module_id = 1)
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
index 9200a8668b49..1ff4ec997ebf 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
@@ -793,12 +793,12 @@ void dss_runtime_put(void)
}
/* DEBUGFS */
-#if defined(CONFIG_OMAP2_DSS_DEBUGFS)
+#if defined(CONFIG_FB_OMAP2_DSS_DEBUGFS)
void dss_debug_dump_clocks(struct seq_file *s)
{
dss_dump_clocks(s);
dispc_dump_clocks(s);
-#ifdef CONFIG_OMAP2_DSS_DSI
+#ifdef CONFIG_FB_OMAP2_DSS_DSI
dsi_dump_clocks(s);
#endif
}
@@ -1144,7 +1144,7 @@ static int dss_bind(struct device *dev)
dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
-#ifdef CONFIG_OMAP2_DSS_VENC
+#ifdef CONFIG_FB_OMAP2_DSS_VENC
REG_FLD_MOD(DSS_CONTROL, 1, 4, 4); /* venc dac demen */
REG_FLD_MOD(DSS_CONTROL, 1, 3, 3); /* venc clock 4x enable */
REG_FLD_MOD(DSS_CONTROL, 0, 2, 2); /* venc clock mode = normal */
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.h b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
index 2406bcdb831a..eea33a5cd3ce 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
@@ -278,7 +278,7 @@ void dss_video_pll_uninit(struct dss_pll *pll);
struct device_node *dss_of_port_get_parent_device(struct device_node *port);
u32 dss_of_port_get_port_number(struct device_node *port);
-#if defined(CONFIG_OMAP2_DSS_DEBUGFS)
+#if defined(CONFIG_FB_OMAP2_DSS_DEBUGFS)
void dss_debug_dump_clocks(struct seq_file *s);
#endif
@@ -311,7 +311,7 @@ bool dss_div_calc(unsigned long pck, unsigned long fck_min,
int sdi_init_platform_driver(void) __init;
void sdi_uninit_platform_driver(void);
-#ifdef CONFIG_OMAP2_DSS_SDI
+#ifdef CONFIG_FB_OMAP2_DSS_SDI
int sdi_init_port(struct platform_device *pdev, struct device_node *port);
void sdi_uninit_port(struct device_node *port);
#else
@@ -327,7 +327,7 @@ static inline void sdi_uninit_port(struct device_node *port)
/* DSI */
-#ifdef CONFIG_OMAP2_DSS_DSI
+#ifdef CONFIG_FB_OMAP2_DSS_DSI
struct dentry;
struct file_operations;
@@ -352,7 +352,7 @@ static inline u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt)
int dpi_init_platform_driver(void) __init;
void dpi_uninit_platform_driver(void);
-#ifdef CONFIG_OMAP2_DSS_DPI
+#ifdef CONFIG_FB_OMAP2_DSS_DPI
int dpi_init_port(struct platform_device *pdev, struct device_node *port);
void dpi_uninit_port(struct device_node *port);
#else
@@ -432,7 +432,7 @@ int rfbi_init_platform_driver(void) __init;
void rfbi_uninit_platform_driver(void);
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr)
{
int b;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
index 99ca268c1cdd..dd72281cf926 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
@@ -388,7 +388,7 @@ static void venc_reset(void)
}
}
-#ifdef CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
+#ifdef CONFIG_FB_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
/* the magical sleep that makes things work */
/* XXX more info? What bug this circumvents? */
msleep(20);
--
2.5.0
^ permalink raw reply related
* [PATCH RFC 5/9] omapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_*
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
We need to change the config symbols of omapfb's private copy of the
panel and encoder drivers so that we won't have config symbol conflicts.
This patch changes the symbols from the panel and encoder drivers using
simple replacement of DISPLAY_* to FB_OMAP2*.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 32 +++++++++++-----------
drivers/video/fbdev/omap2/omapfb/displays/Makefile | 28 +++++++++----------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/Kconfig b/drivers/video/fbdev/omap2/omapfb/displays/Kconfig
index 574710141a61..08f12039dd02 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/Kconfig
+++ b/drivers/video/fbdev/omap2/omapfb/displays/Kconfig
@@ -1,81 +1,81 @@
-menu "OMAP Display Device Drivers (new device model)"
- depends on OMAP2_DSS
+menu "OMAPFB Panel and Encoder Drivers"
+ depends on FB_OMAP2_DSS
-config DISPLAY_ENCODER_OPA362
+config FB_OMAP2_ENCODER_OPA362
tristate "OPA362 external analog amplifier"
help
Driver for OPA362 external analog TV amplifier controlled
through a GPIO.
-config DISPLAY_ENCODER_TFP410
+config FB_OMAP2_ENCODER_TFP410
tristate "TFP410 DPI to DVI Encoder"
help
Driver for TFP410 DPI to DVI encoder.
-config DISPLAY_ENCODER_TPD12S015
+config FB_OMAP2_ENCODER_TPD12S015
tristate "TPD12S015 HDMI ESD protection and level shifter"
help
Driver for TPD12S015, which offers HDMI ESD protection and level
shifting.
-config DISPLAY_CONNECTOR_DVI
+config FB_OMAP2_CONNECTOR_DVI
tristate "DVI Connector"
depends on I2C
help
Driver for a generic DVI connector.
-config DISPLAY_CONNECTOR_HDMI
+config FB_OMAP2_CONNECTOR_HDMI
tristate "HDMI Connector"
help
Driver for a generic HDMI connector.
-config DISPLAY_CONNECTOR_ANALOG_TV
+config FB_OMAP2_CONNECTOR_ANALOG_TV
tristate "Analog TV Connector"
help
Driver for a generic analog TV connector.
-config DISPLAY_PANEL_DPI
+config FB_OMAP2_PANEL_DPI
tristate "Generic DPI panel"
help
Driver for generic DPI panels.
-config DISPLAY_PANEL_DSI_CM
+config FB_OMAP2_PANEL_DSI_CM
tristate "Generic DSI Command Mode Panel"
depends on BACKLIGHT_CLASS_DEVICE
help
Driver for generic DSI command mode panels.
-config DISPLAY_PANEL_SONY_ACX565AKM
+config FB_OMAP2_PANEL_SONY_ACX565AKM
tristate "ACX565AKM Panel"
depends on SPI && BACKLIGHT_CLASS_DEVICE
help
This is the LCD panel used on Nokia N900
-config DISPLAY_PANEL_LGPHILIPS_LB035Q02
+config FB_OMAP2_PANEL_LGPHILIPS_LB035Q02
tristate "LG.Philips LB035Q02 LCD Panel"
depends on SPI
help
LCD Panel used on the Gumstix Overo Palo35
-config DISPLAY_PANEL_SHARP_LS037V7DW01
+config FB_OMAP2_PANEL_SHARP_LS037V7DW01
tristate "Sharp LS037V7DW01 LCD Panel"
depends on BACKLIGHT_CLASS_DEVICE
help
LCD Panel used in TI's SDP3430 and EVM boards
-config DISPLAY_PANEL_TPO_TD028TTEC1
+config FB_OMAP2_PANEL_TPO_TD028TTEC1
tristate "TPO TD028TTEC1 LCD Panel"
depends on SPI
help
LCD panel used in Openmoko.
-config DISPLAY_PANEL_TPO_TD043MTEA1
+config FB_OMAP2_PANEL_TPO_TD043MTEA1
tristate "TPO TD043MTEA1 LCD Panel"
depends on SPI
help
LCD Panel used in OMAP3 Pandora
-config DISPLAY_PANEL_NEC_NL8048HL11
+config FB_OMAP2_PANEL_NEC_NL8048HL11
tristate "NEC NL8048HL11 Panel"
depends on SPI
depends on BACKLIGHT_CLASS_DEVICE
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/Makefile b/drivers/video/fbdev/omap2/omapfb/displays/Makefile
index 9aa176bfbf2e..4f7459272256 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/Makefile
+++ b/drivers/video/fbdev/omap2/omapfb/displays/Makefile
@@ -1,14 +1,14 @@
-obj-$(CONFIG_DISPLAY_ENCODER_OPA362) += encoder-opa362.o
-obj-$(CONFIG_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o
-obj-$(CONFIG_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o
-obj-$(CONFIG_DISPLAY_CONNECTOR_DVI) += connector-dvi.o
-obj-$(CONFIG_DISPLAY_CONNECTOR_HDMI) += connector-hdmi.o
-obj-$(CONFIG_DISPLAY_CONNECTOR_ANALOG_TV) += connector-analog-tv.o
-obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o
-obj-$(CONFIG_DISPLAY_PANEL_DSI_CM) += panel-dsi-cm.o
-obj-$(CONFIG_DISPLAY_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
-obj-$(CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o
-obj-$(CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
-obj-$(CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
-obj-$(CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
-obj-$(CONFIG_DISPLAY_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o
+obj-$(CONFIG_FB_OMAP2_ENCODER_OPA362) += encoder-opa362.o
+obj-$(CONFIG_FB_OMAP2_ENCODER_TFP410) += encoder-tfp410.o
+obj-$(CONFIG_FB_OMAP2_ENCODER_TPD12S015) += encoder-tpd12s015.o
+obj-$(CONFIG_FB_OMAP2_CONNECTOR_DVI) += connector-dvi.o
+obj-$(CONFIG_FB_OMAP2_CONNECTOR_HDMI) += connector-hdmi.o
+obj-$(CONFIG_FB_OMAP2_CONNECTOR_ANALOG_TV) += connector-analog-tv.o
+obj-$(CONFIG_FB_OMAP2_PANEL_DPI) += panel-dpi.o
+obj-$(CONFIG_FB_OMAP2_PANEL_DSI_CM) += panel-dsi-cm.o
+obj-$(CONFIG_FB_OMAP2_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
+obj-$(CONFIG_FB_OMAP2_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o
+obj-$(CONFIG_FB_OMAP2_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
+obj-$(CONFIG_FB_OMAP2_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
+obj-$(CONFIG_FB_OMAP2_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
+obj-$(CONFIG_FB_OMAP2_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o
--
2.5.0
^ permalink raw reply related
* [PATCH RFC 6/9] omapfb: take omapfb's prive omapdss into use
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
omapfb's private copy of omapdss is now ready to be used.
This patch makes omapfb use its private omapdss and display drivers, and
also makes omap_vout (which uses omapfb) to depend on omapfb.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/media/platform/omap/Kconfig | 2 +-
drivers/video/fbdev/omap2/Makefile | 2 +-
drivers/video/fbdev/omap2/omapfb/Kconfig | 8 ++++++++
drivers/video/fbdev/omap2/omapfb/Makefile | 2 ++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig
index 217d613b0fe7..e8e2db181a7a 100644
--- a/drivers/media/platform/omap/Kconfig
+++ b/drivers/media/platform/omap/Kconfig
@@ -5,9 +5,9 @@ config VIDEO_OMAP2_VOUT
tristate "OMAP2/OMAP3 V4L2-Display driver"
depends on MMU
depends on ARCH_OMAP2 || ARCH_OMAP3
+ depends on FB_OMAP2
select VIDEOBUF_GEN
select VIDEOBUF_DMA_CONTIG
- select OMAP2_DSS if HAS_IOMEM && ARCH_OMAP2PLUS
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select VIDEO_OMAP2_VOUT_VRFB if VIDEO_OMAP2_VOUT && OMAP2_VRFB
select FRAME_VECTOR
diff --git a/drivers/video/fbdev/omap2/Makefile b/drivers/video/fbdev/omap2/Makefile
index f8745ec369cc..c73a1e864ae8 100644
--- a/drivers/video/fbdev/omap2/Makefile
+++ b/drivers/video/fbdev/omap2/Makefile
@@ -2,4 +2,4 @@ obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
obj-y += dss/
obj-y += displays-new/
-obj-$(CONFIG_FB_OMAP2) += omapfb/
+obj-y += omapfb/
diff --git a/drivers/video/fbdev/omap2/omapfb/Kconfig b/drivers/video/fbdev/omap2/omapfb/Kconfig
index 7ba1a22199b8..13d99a9e6198 100644
--- a/drivers/video/fbdev/omap2/omapfb/Kconfig
+++ b/drivers/video/fbdev/omap2/omapfb/Kconfig
@@ -3,6 +3,7 @@ menuconfig FB_OMAP2
depends on FB
depends on DRM_OMAP = n
+ select FB_OMAP2_DSS
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
@@ -10,6 +11,8 @@ menuconfig FB_OMAP2
help
Frame buffer driver for OMAP2+ based boards.
+if FB_OMAP2
+
config FB_OMAP2_DEBUG_SUPPORT
bool "Debug support for OMAP2+ FB"
default y
@@ -26,3 +29,8 @@ config FB_OMAP2_NUM_FBS
help
Select the number of framebuffers created. OMAP2/3 has 3 overlays
so normally this would be 3.
+
+source "drivers/video/fbdev/omap2/omapfb/dss/Kconfig"
+source "drivers/video/fbdev/omap2/omapfb/displays/Kconfig"
+
+endif
diff --git a/drivers/video/fbdev/omap2/omapfb/Makefile b/drivers/video/fbdev/omap2/omapfb/Makefile
index 51c2e00d9bf8..0490951f95b3 100644
--- a/drivers/video/fbdev/omap2/omapfb/Makefile
+++ b/drivers/video/fbdev/omap2/omapfb/Makefile
@@ -1,2 +1,4 @@
+obj-y += dss/
+obj-y += displays/
obj-$(CONFIG_FB_OMAP2) += omapfb.o
omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o
--
2.5.0
^ permalink raw reply related
* [PATCH RFC 7/9] omapfb: move vrfb into omapfb
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
VRFB is only used by omapfb, so we can move it under omapfb's directory.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/Kconfig | 3 ---
drivers/video/fbdev/omap2/Makefile | 2 --
drivers/video/fbdev/omap2/omapfb/Kconfig | 3 +++
drivers/video/fbdev/omap2/omapfb/Makefile | 1 +
drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c | 0
5 files changed, 4 insertions(+), 5 deletions(-)
rename drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c (100%)
diff --git a/drivers/video/fbdev/omap2/Kconfig b/drivers/video/fbdev/omap2/Kconfig
index c22955d2de9a..7fbdb583de8c 100644
--- a/drivers/video/fbdev/omap2/Kconfig
+++ b/drivers/video/fbdev/omap2/Kconfig
@@ -1,6 +1,3 @@
-config OMAP2_VRFB
- bool
-
if ARCH_OMAP2PLUS
source "drivers/video/fbdev/omap2/dss/Kconfig"
diff --git a/drivers/video/fbdev/omap2/Makefile b/drivers/video/fbdev/omap2/Makefile
index c73a1e864ae8..a52b716a40c1 100644
--- a/drivers/video/fbdev/omap2/Makefile
+++ b/drivers/video/fbdev/omap2/Makefile
@@ -1,5 +1,3 @@
-obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
-
obj-y += dss/
obj-y += displays-new/
obj-y += omapfb/
diff --git a/drivers/video/fbdev/omap2/omapfb/Kconfig b/drivers/video/fbdev/omap2/omapfb/Kconfig
index 13d99a9e6198..e6226aeed17e 100644
--- a/drivers/video/fbdev/omap2/omapfb/Kconfig
+++ b/drivers/video/fbdev/omap2/omapfb/Kconfig
@@ -1,3 +1,6 @@
+config OMAP2_VRFB
+ bool
+
menuconfig FB_OMAP2
tristate "OMAP2+ frame buffer support"
depends on FB
diff --git a/drivers/video/fbdev/omap2/omapfb/Makefile b/drivers/video/fbdev/omap2/omapfb/Makefile
index 0490951f95b3..ad68ecf141af 100644
--- a/drivers/video/fbdev/omap2/omapfb/Makefile
+++ b/drivers/video/fbdev/omap2/omapfb/Makefile
@@ -1,3 +1,4 @@
+obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
obj-y += dss/
obj-y += displays/
obj-$(CONFIG_FB_OMAP2) += omapfb.o
diff --git a/drivers/video/fbdev/omap2/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
similarity index 100%
rename from drivers/video/fbdev/omap2/vrfb.c
rename to drivers/video/fbdev/omap2/omapfb/vrfb.c
--
2.5.0
^ permalink raw reply related
* [PATCH RFC 8/9] drm/omap: move omapdss & displays under omapdrm
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
Now that omapfb has its own copy of omapdss and display drivers, we can
move omapdss and display drivers which omapdrm uses to omapdrm's
directory.
We also need to change the main drm Makefile so that omapdrm directory
is always entered, because omapdss has a file that always needs to be
built-in.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/gpu/drm/Makefile | 2 +-
drivers/gpu/drm/omapdrm/Kconfig | 3 ++-
drivers/gpu/drm/omapdrm/Makefile | 3 +++
.../fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Kconfig | 0
.../fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Makefile | 0
.../displays-new => gpu/drm/omapdrm/displays}/connector-analog-tv.c | 0
.../omap2/displays-new => gpu/drm/omapdrm/displays}/connector-dvi.c | 0
.../omap2/displays-new => gpu/drm/omapdrm/displays}/connector-hdmi.c | 0
.../omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-opa362.c | 0
.../omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tfp410.c | 0
.../displays-new => gpu/drm/omapdrm/displays}/encoder-tpd12s015.c | 0
.../fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dpi.c | 0
.../omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dsi-cm.c | 0
.../drm/omapdrm/displays}/panel-lgphilips-lb035q02.c | 0
.../displays-new => gpu/drm/omapdrm/displays}/panel-nec-nl8048hl11.c | 0
.../drm/omapdrm/displays}/panel-sharp-ls037v7dw01.c | 0
.../displays-new => gpu/drm/omapdrm/displays}/panel-sony-acx565akm.c | 0
.../displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td028ttec1.c | 0
.../displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td043mtea1.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.h | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/omapdss-boot-init.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c | 0
drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/video-pll.c | 0
drivers/video/fbdev/omap2/Kconfig | 2 --
drivers/video/fbdev/omap2/Makefile | 2 --
61 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Kconfig (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Makefile (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-analog-tv.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-dvi.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-hdmi.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-opa362.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tfp410.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tpd12s015.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dpi.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dsi-cm.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-lgphilips-lb035q02.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-nec-nl8048hl11.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sharp-ls037v7dw01.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sony-acx565akm.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td028ttec1.c (100%)
rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td043mtea1.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/omapdss-boot-init.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c (100%)
rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/video-pll.c (100%)
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 1e9ff4c3e3db..db6245f4b961 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
-obj-$(CONFIG_DRM_OMAP) += omapdrm/
+obj-y += omapdrm/
obj-y += tilcdc/
obj-$(CONFIG_DRM_QXL) += qxl/
obj-$(CONFIG_DRM_BOCHS) += bochs/
diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
index 6c220cd3497a..49b5b7df6ba4 100644
--- a/drivers/gpu/drm/omapdrm/Kconfig
+++ b/drivers/gpu/drm/omapdrm/Kconfig
@@ -1,4 +1,3 @@
-
config DRM_OMAP
tristate "OMAP DRM"
depends on DRM
@@ -24,3 +23,5 @@ config DRM_OMAP_NUM_CRTCS
Select the number of video overlays which can be used as framebuffers.
The remaining overlays are reserved for video.
+source "drivers/gpu/drm/omapdrm/dss/Kconfig"
+source "drivers/gpu/drm/omapdrm/displays/Kconfig"
diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile
index 778372b062ad..d48d97f80e8c 100644
--- a/drivers/gpu/drm/omapdrm/Makefile
+++ b/drivers/gpu/drm/omapdrm/Makefile
@@ -3,6 +3,9 @@
# Direct Rendering Infrastructure (DRI)
#
+obj-y += dss/
+obj-y += displays/
+
ccflags-y := -Iinclude/drm -Werror
omapdrm-y := omap_drv.o \
omap_irq.o \
diff --git a/drivers/video/fbdev/omap2/displays-new/Kconfig b/drivers/gpu/drm/omapdrm/displays/Kconfig
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/Kconfig
rename to drivers/gpu/drm/omapdrm/displays/Kconfig
diff --git a/drivers/video/fbdev/omap2/displays-new/Makefile b/drivers/gpu/drm/omapdrm/displays/Makefile
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/Makefile
rename to drivers/gpu/drm/omapdrm/displays/Makefile
diff --git a/drivers/video/fbdev/omap2/displays-new/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/connector-analog-tv.c
rename to drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
diff --git a/drivers/video/fbdev/omap2/displays-new/connector-dvi.c b/drivers/gpu/drm/omapdrm/displays/connector-dvi.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/connector-dvi.c
rename to drivers/gpu/drm/omapdrm/displays/connector-dvi.c
diff --git a/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
rename to drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/encoder-opa362.c
rename to drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c
rename to drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
rename to drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/panel-dpi.c
rename to drivers/gpu/drm/omapdrm/displays/panel-dpi.c
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/panel-dsi-cm.c
rename to drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c
rename to drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/panel-nec-nl8048hl11.c
rename to drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c
rename to drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c
rename to drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/panel-tpo-td028ttec1.c
rename to drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
similarity index 100%
rename from drivers/video/fbdev/omap2/displays-new/panel-tpo-td043mtea1.c
rename to drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
diff --git a/drivers/video/fbdev/omap2/dss/Kconfig b/drivers/gpu/drm/omapdrm/dss/Kconfig
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/Kconfig
rename to drivers/gpu/drm/omapdrm/dss/Kconfig
diff --git a/drivers/video/fbdev/omap2/dss/Makefile b/drivers/gpu/drm/omapdrm/dss/Makefile
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/Makefile
rename to drivers/gpu/drm/omapdrm/dss/Makefile
diff --git a/drivers/video/fbdev/omap2/dss/apply.c b/drivers/gpu/drm/omapdrm/dss/apply.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/apply.c
rename to drivers/gpu/drm/omapdrm/dss/apply.c
diff --git a/drivers/video/fbdev/omap2/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/core.c
rename to drivers/gpu/drm/omapdrm/dss/core.c
diff --git a/drivers/video/fbdev/omap2/dss/dispc-compat.c b/drivers/gpu/drm/omapdrm/dss/dispc-compat.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dispc-compat.c
rename to drivers/gpu/drm/omapdrm/dss/dispc-compat.c
diff --git a/drivers/video/fbdev/omap2/dss/dispc-compat.h b/drivers/gpu/drm/omapdrm/dss/dispc-compat.h
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dispc-compat.h
rename to drivers/gpu/drm/omapdrm/dss/dispc-compat.h
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dispc.c
rename to drivers/gpu/drm/omapdrm/dss/dispc.c
diff --git a/drivers/video/fbdev/omap2/dss/dispc.h b/drivers/gpu/drm/omapdrm/dss/dispc.h
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dispc.h
rename to drivers/gpu/drm/omapdrm/dss/dispc.h
diff --git a/drivers/video/fbdev/omap2/dss/dispc_coefs.c b/drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dispc_coefs.c
rename to drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
diff --git a/drivers/video/fbdev/omap2/dss/display-sysfs.c b/drivers/gpu/drm/omapdrm/dss/display-sysfs.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/display-sysfs.c
rename to drivers/gpu/drm/omapdrm/dss/display-sysfs.c
diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/display.c
rename to drivers/gpu/drm/omapdrm/dss/display.c
diff --git a/drivers/video/fbdev/omap2/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dpi.c
rename to drivers/gpu/drm/omapdrm/dss/dpi.c
diff --git a/drivers/video/fbdev/omap2/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dsi.c
rename to drivers/gpu/drm/omapdrm/dss/dsi.c
diff --git a/drivers/video/fbdev/omap2/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dss-of.c
rename to drivers/gpu/drm/omapdrm/dss/dss-of.c
diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dss.c
rename to drivers/gpu/drm/omapdrm/dss/dss.c
diff --git a/drivers/video/fbdev/omap2/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dss.h
rename to drivers/gpu/drm/omapdrm/dss/dss.h
diff --git a/drivers/video/fbdev/omap2/dss/dss_features.c b/drivers/gpu/drm/omapdrm/dss/dss_features.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dss_features.c
rename to drivers/gpu/drm/omapdrm/dss/dss_features.c
diff --git a/drivers/video/fbdev/omap2/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/dss_features.h
rename to drivers/gpu/drm/omapdrm/dss/dss_features.h
diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/gpu/drm/omapdrm/dss/hdmi.h
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi.h
rename to drivers/gpu/drm/omapdrm/dss/hdmi.h
diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi4.c
rename to drivers/gpu/drm/omapdrm/dss/hdmi4.c
diff --git a/drivers/video/fbdev/omap2/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi4_core.c
rename to drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
diff --git a/drivers/video/fbdev/omap2/dss/hdmi4_core.h b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.h
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi4_core.h
rename to drivers/gpu/drm/omapdrm/dss/hdmi4_core.h
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi5.c
rename to drivers/gpu/drm/omapdrm/dss/hdmi5.c
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi5_core.c
rename to drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5_core.h b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.h
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi5_core.h
rename to drivers/gpu/drm/omapdrm/dss/hdmi5_core.h
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_common.c b/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi_common.c
rename to drivers/gpu/drm/omapdrm/dss/hdmi_common.c
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi_phy.c
rename to drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_pll.c b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi_pll.c
rename to drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_wp.c b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/hdmi_wp.c
rename to drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
diff --git a/drivers/video/fbdev/omap2/dss/manager-sysfs.c b/drivers/gpu/drm/omapdrm/dss/manager-sysfs.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/manager-sysfs.c
rename to drivers/gpu/drm/omapdrm/dss/manager-sysfs.c
diff --git a/drivers/video/fbdev/omap2/dss/manager.c b/drivers/gpu/drm/omapdrm/dss/manager.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/manager.c
rename to drivers/gpu/drm/omapdrm/dss/manager.c
diff --git a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c b/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
rename to drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c
diff --git a/drivers/video/fbdev/omap2/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/output.c
rename to drivers/gpu/drm/omapdrm/dss/output.c
diff --git a/drivers/video/fbdev/omap2/dss/overlay-sysfs.c b/drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/overlay-sysfs.c
rename to drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c
diff --git a/drivers/video/fbdev/omap2/dss/overlay.c b/drivers/gpu/drm/omapdrm/dss/overlay.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/overlay.c
rename to drivers/gpu/drm/omapdrm/dss/overlay.c
diff --git a/drivers/video/fbdev/omap2/dss/pll.c b/drivers/gpu/drm/omapdrm/dss/pll.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/pll.c
rename to drivers/gpu/drm/omapdrm/dss/pll.c
diff --git a/drivers/video/fbdev/omap2/dss/rfbi.c b/drivers/gpu/drm/omapdrm/dss/rfbi.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/rfbi.c
rename to drivers/gpu/drm/omapdrm/dss/rfbi.c
diff --git a/drivers/video/fbdev/omap2/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/sdi.c
rename to drivers/gpu/drm/omapdrm/dss/sdi.c
diff --git a/drivers/video/fbdev/omap2/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/venc.c
rename to drivers/gpu/drm/omapdrm/dss/venc.c
diff --git a/drivers/video/fbdev/omap2/dss/video-pll.c b/drivers/gpu/drm/omapdrm/dss/video-pll.c
similarity index 100%
rename from drivers/video/fbdev/omap2/dss/video-pll.c
rename to drivers/gpu/drm/omapdrm/dss/video-pll.c
diff --git a/drivers/video/fbdev/omap2/Kconfig b/drivers/video/fbdev/omap2/Kconfig
index 7fbdb583de8c..0921c4de8407 100644
--- a/drivers/video/fbdev/omap2/Kconfig
+++ b/drivers/video/fbdev/omap2/Kconfig
@@ -1,7 +1,5 @@
if ARCH_OMAP2PLUS
-source "drivers/video/fbdev/omap2/dss/Kconfig"
source "drivers/video/fbdev/omap2/omapfb/Kconfig"
-source "drivers/video/fbdev/omap2/displays-new/Kconfig"
endif
diff --git a/drivers/video/fbdev/omap2/Makefile b/drivers/video/fbdev/omap2/Makefile
index a52b716a40c1..71ab5ac91106 100644
--- a/drivers/video/fbdev/omap2/Makefile
+++ b/drivers/video/fbdev/omap2/Makefile
@@ -1,3 +1 @@
-obj-y += dss/
-obj-y += displays-new/
obj-y += omapfb/
--
2.5.0
^ permalink raw reply related
* [PATCH RFC 9/9] drm/omap: make omapdrm select OMAP2_DSS
From: Tomi Valkeinen @ 2015-12-10 14:25 UTC (permalink / raw)
To: dri-devel, linux-fbdev, Laurent Pinchart; +Cc: Tomi Valkeinen
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
Now that omapdss is only for omapdrm, we can change omapdrm to select
OMAP2_DSS to enable omapdss if omapdrm is enabled, instead of omapdrm
depending on omapdss.
We can also change omapdss and the display drivers to depend on
DRM_OMAP, so that they are only visible under omapdrm in menuconfig.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/gpu/drm/omapdrm/Kconfig | 7 +++++--
drivers/gpu/drm/omapdrm/displays/Kconfig | 3 +--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
index 49b5b7df6ba4..336ad4de9981 100644
--- a/drivers/gpu/drm/omapdrm/Kconfig
+++ b/drivers/gpu/drm/omapdrm/Kconfig
@@ -2,7 +2,7 @@ config DRM_OMAP
tristate "OMAP DRM"
depends on DRM
depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
- depends on OMAP2_DSS
+ select OMAP2_DSS
select DRM_KMS_HELPER
select DRM_KMS_FB_HELPER
select FB_SYS_FILLRECT
@@ -13,15 +13,18 @@ config DRM_OMAP
help
DRM display driver for OMAP2/3/4 based boards.
+if DRM_OMAP
+
config DRM_OMAP_NUM_CRTCS
int "Number of CRTCs"
range 1 10
default 1 if ARCH_OMAP2 || ARCH_OMAP3
default 2 if ARCH_OMAP4
- depends on DRM_OMAP
help
Select the number of video overlays which can be used as framebuffers.
The remaining overlays are reserved for video.
source "drivers/gpu/drm/omapdrm/dss/Kconfig"
source "drivers/gpu/drm/omapdrm/displays/Kconfig"
+
+endif
diff --git a/drivers/gpu/drm/omapdrm/displays/Kconfig b/drivers/gpu/drm/omapdrm/displays/Kconfig
index 574710141a61..2a618afe0f53 100644
--- a/drivers/gpu/drm/omapdrm/displays/Kconfig
+++ b/drivers/gpu/drm/omapdrm/displays/Kconfig
@@ -1,5 +1,4 @@
-menu "OMAP Display Device Drivers (new device model)"
- depends on OMAP2_DSS
+menu "OMAPDRM External Display Device Drivers"
config DISPLAY_ENCODER_OPA362
tristate "OPA362 external analog amplifier"
--
2.5.0
^ permalink raw reply related
* Re: [PATCH RFC 0/9] omapdrm/omapfb/omapdss split
From: Rob Clark @ 2015-12-10 14:53 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Linux Fbdev development list, Laurent Pinchart,
dri-devel@lists.freedesktop.org
In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com>
On Thu, Dec 10, 2015 at 9:25 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
> Hi,
>
> Here's an RFC series to fix the mess we have at the moment with
> omapdrm/omapfb/omapdss.
>
> First, a short background on the current status. We have the following
> entities:
>
> * omapdss, located in drivers/video/fbdev/omap2/dss/. This is a driver for the
> display subsystem IPs used on OMAP (and related) SoCs. It offers only a
> kernel internal API, and does not implement anything for fbdev or drm.
>
> * omapdss panels and encoders, located in
> drivers/video/fbdev/omap2/displays-new/. These are panel and external encoder
> drivers, which use APIs offered by omapdss driver. These also don't implement
> anything for fbdev or drm.
>
> * omapdrm, located in drivers/gpu/drm/omapdrm/. This is a drm driver, which
> uses omapdss and the panel/encoder drivers to operate the hardware.
>
> * omapfb, located in drivers/video/fbdev/omap2/omapfb/. This is an fbdev
> driver, which uses omapdss and the panel/encoder drivers to operate the
> hardware.
>
> * omap_vout, located in drivers/media/platform/omap/. This is a v4l2 driver,
> which uses omapdss and omapfb to implement a v4l2 API for the video overlays.
>
> So, on the top level, we have either omapdrm, or omapfb+omap_vout. Both of
> those use the same low level drivers. Without going to the historical details
> why the architecture is like that, I think it's finally time to change that.
>
> The situation with omapfb+omap_vout is that it still works, but no new features
> have been added for a long time, and I want to keep it working as it's still
> being used. At some point in the future I'd like to remove omapfb and
> omap_vout altogether.
>
> Omapdrm, on the other hand, is being actively developed. Sharing the low level
> parts with omapfb makes that development more difficult than it should be. It
> also "hides" half of the development, as everything happening in the low level
> parts resides under fbdev directory, not in the drm directory.
>
> I've been wanting to clean this up for a long time, but I haven't figured out a
> very good way to do it. I still haven't, but here's the best way I have come up
> with.
>
> This series makes a full copy of the low level parts, omapdss and panel/encoder
> drivers. Both omapfb+omap_vout and omapdrm will have their own versions. The
> copy omapfb+omap_vout get is a new copy, and the copy that omapdrm gets is just
> the current files moved. This way git will associate the omapdrm version with
> the old files.
>
> The omapfb+omap_vout versions won't be touched unless there are some big issues
> there.
>
> The omapdrm versions can be refactored and cleaned up, as the omapfb support
> code is no longer needed. We can perhaps also merge omapdss and omapdrm into
> the same kernel module.
>
> This series only does the copy, and the absolutely necessary parts. No further
> cleanups are done yet.
It would be nice to see omapdrm eventually using the panel framework,
etc. But I think copy/paste to decouple omapdrm from omapfb/vout as
the first step makes sense.
BR,
-R
> Tomi
>
> Tomi Valkeinen (9):
> omapfb: allow compilation only if DRM_OMAP is disabled
> omapfb: copy omapdss & displays for omapfb
> omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h
> omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP*
> omapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_*
> omapfb: take omapfb's prive omapdss into use
> omapfb: move vrfb into omapfb
> drm/omap: move omapdss & displays under omapdrm
> drm/omap: make omapdrm select OMAP2_DSS
>
> drivers/gpu/drm/Makefile | 2 +-
> drivers/gpu/drm/omapdrm/Kconfig | 10 +-
> drivers/gpu/drm/omapdrm/Makefile | 3 +
> .../drm/omapdrm/displays}/Kconfig | 3 +-
> .../drm/omapdrm/displays}/Makefile | 0
> .../drm/omapdrm/displays}/connector-analog-tv.c | 0
> .../drm/omapdrm/displays}/connector-dvi.c | 0
> .../drm/omapdrm/displays}/connector-hdmi.c | 0
> .../drm/omapdrm/displays}/encoder-opa362.c | 0
> .../drm/omapdrm/displays}/encoder-tfp410.c | 0
> .../drm/omapdrm/displays}/encoder-tpd12s015.c | 0
> .../drm/omapdrm/displays}/panel-dpi.c | 0
> .../drm/omapdrm/displays}/panel-dsi-cm.c | 0
> .../omapdrm/displays}/panel-lgphilips-lb035q02.c | 0
> .../drm/omapdrm/displays}/panel-nec-nl8048hl11.c | 0
> .../omapdrm/displays}/panel-sharp-ls037v7dw01.c | 0
> .../drm/omapdrm/displays}/panel-sony-acx565akm.c | 0
> .../drm/omapdrm/displays}/panel-tpo-td028ttec1.c | 0
> .../drm/omapdrm/displays}/panel-tpo-td043mtea1.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h | 0
> .../omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h | 0
> .../omap2 => gpu/drm/omapdrm}/dss/dss_features.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/dss_features.h | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h | 0
> .../omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c | 0
> .../drm/omapdrm}/dss/omapdss-boot-init.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c | 0
> .../fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c | 0
> .../omap2 => gpu/drm/omapdrm}/dss/video-pll.c | 0
> drivers/media/platform/omap/Kconfig | 2 +-
> drivers/video/fbdev/omap2/Kconfig | 5 -
> drivers/video/fbdev/omap2/Makefile | 6 +-
> drivers/video/fbdev/omap2/omapfb/Kconfig | 14 +-
> drivers/video/fbdev/omap2/omapfb/Makefile | 3 +
> drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 86 +
> drivers/video/fbdev/omap2/omapfb/displays/Makefile | 14 +
> .../omap2/omapfb/displays/connector-analog-tv.c | 320 ++
> .../fbdev/omap2/omapfb/displays/connector-dvi.c | 398 ++
> .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 348 ++
> .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 278 +
> .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 320 ++
> .../omap2/omapfb/displays/encoder-tpd12s015.c | 379 ++
> .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 330 ++
> .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 1388 +++++
> .../omapfb/displays/panel-lgphilips-lb035q02.c | 404 ++
> .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 437 ++
> .../omapfb/displays/panel-sharp-ls037v7dw01.c | 415 ++
> .../omap2/omapfb/displays/panel-sony-acx565akm.c | 917 ++++
> .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 511 ++
> .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 686 +++
> drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 129 +
> drivers/video/fbdev/omap2/omapfb/dss/Makefile | 18 +
> drivers/video/fbdev/omap2/omapfb/dss/apply.c | 1702 ++++++
> drivers/video/fbdev/omap2/omapfb/dss/core.c | 343 ++
> .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 667 +++
> .../video/fbdev/omap2/omapfb/dss/dispc-compat.h | 30 +
> drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4135 +++++++++++++++
> drivers/video/fbdev/omap2/omapfb/dss/dispc.h | 916 ++++
> drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c | 325 ++
> .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 356 ++
> drivers/video/fbdev/omap2/omapfb/dss/display.c | 338 ++
> drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 899 ++++
> drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 5607 ++++++++++++++++++++
> drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 183 +
> drivers/video/fbdev/omap2/omapfb/dss/dss.c | 1323 +++++
> drivers/video/fbdev/omap2/omapfb/dss/dss.h | 472 ++
> .../video/fbdev/omap2/omapfb/dss/dss_features.c | 962 ++++
> .../video/fbdev/omap2/omapfb/dss/dss_features.h | 105 +
> drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 370 ++
> drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 839 +++
> drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 904 ++++
> drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h | 273 +
> drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 876 +++
> drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 916 ++++
> drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h | 304 ++
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | 148 +
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 247 +
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 255 +
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 282 +
> .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 531 ++
> drivers/video/fbdev/omap2/omapfb/dss/manager.c | 263 +
> .../fbdev/omap2/omapfb/dss/omapdss-boot-init.c | 227 +
> drivers/video/fbdev/omap2/omapfb/dss/output.c | 267 +
> .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 456 ++
> drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 202 +
> drivers/video/fbdev/omap2/omapfb/dss/pll.c | 389 ++
> drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 1078 ++++
> drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 454 ++
> drivers/video/fbdev/omap2/omapfb/dss/venc.c | 997 ++++
> drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 211 +
> drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c | 0
> include/video/omapdss.h | 2 -
> 122 files changed, 36260 insertions(+), 20 deletions(-)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Kconfig (96%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Makefile (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-analog-tv.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-dvi.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-hdmi.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-opa362.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tfp410.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tpd12s015.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dpi.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dsi-cm.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-lgphilips-lb035q02.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-nec-nl8048hl11.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sharp-ls037v7dw01.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sony-acx565akm.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td028ttec1.c (100%)
> rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td043mtea1.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.h (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/omapdss-boot-init.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c (100%)
> rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/video-pll.c (100%)
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/Kconfig
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/Makefile
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/Kconfig
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/Makefile
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/apply.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/core.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.h
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc.h
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/display.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dpi.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dsi.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss.h
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss_features.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss_features.h
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi.h
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/manager.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/output.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/overlay.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/pll.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/sdi.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/venc.c
> create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/video-pll.c
> rename drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c (100%)
>
> --
> 2.5.0
>
^ permalink raw reply
* Re: [PATCH RFC 0/9] omapdrm/omapfb/omapdss split
From: Tomi Valkeinen @ 2015-12-10 14:58 UTC (permalink / raw)
To: Rob Clark
Cc: Linux Fbdev development list, Laurent Pinchart,
dri-devel@lists.freedesktop.org
In-Reply-To: <CAF6AEGsCi_-YwQHYjfO_ao7Fg8QmQ=Gka1rG+OgkNqNaRsA5vw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
On 10/12/15 16:53, Rob Clark wrote:
> It would be nice to see omapdrm eventually using the panel framework,
> etc. But I think copy/paste to decouple omapdrm from omapfb/vout as
> the first step makes sense.
Yes, long term plans include getting rid of the omap specific
panel/encoder drivers. But I can't do that as long as omapfb/vout is
there, preventing any bigger refactorings.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH RESEND] fbdev: Make fb-notify a no-op if CONFIG_FB=n
From: Tomi Valkeinen @ 2015-12-10 15:24 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1448421108-3437-1-git-send-email-ezequiel@vanguardiasur.com.ar>
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
On 07/12/15 18:14, Ezequiel Garcia wrote:
>> Actually, looks like fb_notify.c was originally made to solve the same
>> problem as your patch solves, but by separating the notify code from the
>> main fbdev code. So I still wonder, was there some reason to keep the
>> notification code built instead of having stub functions.
>>
>> Any thoughts?
>>
>
> I can't see any valid reason to keep the code around, since there's no
> way it can be used.
> Let's see if Ccing Antonino and Andrew -as per that commit- helps.
Ok. This looks fine to me, so I'll queue it for 4.5.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH v5 2/2] video: fbdev: pxafb: initial devicetree conversion
From: Tomi Valkeinen @ 2015-12-10 15:29 UTC (permalink / raw)
To: Robert Jarzmik, Rob Herring
Cc: Jean-Christophe Plagniol-Villard, linux-fbdev, linux-kernel
In-Reply-To: <87bna2kmp7.fsf@belgarion.home>
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
On 07/12/15 22:50, Robert Jarzmik wrote:
>> It seems that at least "depth" is missing from the binding document.
> You're right.
>
> Actually depth is not a "hardware" caracteristic. Moreover it's just used as an
> overlay for pxafb_set_pixfmt() to superseed var->bits_per_pixel. I'm wondering
> if the right path for of_get_pxafb_mode_info() would be to remove completely
> depth, and leave it initialized at 0 for the DT case.
>
> What do you think of this approach ? The other one would be to modify the
> binding, and yet I feel this depth doesn't belong to the binding, it's my patch
> which requires another spin IMHO.
Yes, we should avoid non-hardware relate properties in the .dts files if
at all possible. If the driver works fine without the property, I think
it's fine to remove it. If it is required it needs to be added to the
binding document.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH RFC 0/9] omapdrm/omapfb/omapdss split
From: Emil Velikov @ 2015-12-10 17:00 UTC (permalink / raw)
To: Rob Clark
Cc: Linux Fbdev development list, Tomi Valkeinen, Laurent Pinchart,
dri-devel@lists.freedesktop.org
In-Reply-To: <CAF6AEGsCi_-YwQHYjfO_ao7Fg8QmQ=Gka1rG+OgkNqNaRsA5vw@mail.gmail.com>
On 10 December 2015 at 14:53, Rob Clark <robdclark@gmail.com> wrote:
> It would be nice to see omapdrm eventually using the panel framework,
> etc. But I think copy/paste to decouple omapdrm from omapfb/vout as
> the first step makes sense.
>
Moar panels/bridges :-P
But seriously, I think that this is the better idea, despite the
duplication that'll exist in the first place. Otherwise you'll end up
pulling your hairs out trying to balance everything drm and fbdev/vout
working.
A suggestion... do throw a big scary warning in the fbdev copy - "Here
be dragons... old, mostly maintained code, bugfixes only please".
Otherwise some poor soul might decide to port the drm patches back
into the fbdev copy, or try to de-duplicate things :-)
-Emil
^ permalink raw reply
* Re: [PATCH RFC 0/9] omapdrm/omapfb/omapdss split
From: Tomi Valkeinen @ 2015-12-10 17:15 UTC (permalink / raw)
To: Emil Velikov
Cc: Linux Fbdev development list, dri-devel@lists.freedesktop.org,
Laurent Pinchart
In-Reply-To: <CACvgo51Yezd4Rzcc8A1wrCUH4YX9gjhgpuYrt5dEPwhc=v03fA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]
On 10/12/15 19:00, Emil Velikov wrote:
> On 10 December 2015 at 14:53, Rob Clark <robdclark@gmail.com> wrote:
>
>> It would be nice to see omapdrm eventually using the panel framework,
>> etc. But I think copy/paste to decouple omapdrm from omapfb/vout as
>> the first step makes sense.
>>
> Moar panels/bridges :-P
I have a bunch more in my TI branch, which I have never upstreamed
because I haven't wanted to push too much into the omap specific
panel/encoder directory...
> But seriously, I think that this is the better idea, despite the
> duplication that'll exist in the first place. Otherwise you'll end up
> pulling your hairs out trying to balance everything drm and fbdev/vout
> working.
>
> A suggestion... do throw a big scary warning in the fbdev copy - "Here
> be dragons... old, mostly maintained code, bugfixes only please".
> Otherwise some poor soul might decide to port the drm patches back
> into the fbdev copy, or try to de-duplicate things :-)
The fbdev maintainer (me) will block any attempts to do so, but good
point, it doesn't harm to add a small README to the omapfb side.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH v5 2/2] video: fbdev: pxafb: initial devicetree conversion
From: Robert Jarzmik @ 2015-12-10 17:34 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Rob Herring, Jean-Christophe Plagniol-Villard, linux-fbdev,
linux-kernel
In-Reply-To: <56699A57.9030209@ti.com>
Tomi Valkeinen <tomi.valkeinen@ti.com> writes:
> On 07/12/15 22:50, Robert Jarzmik wrote:
>
>>> It seems that at least "depth" is missing from the binding document.
>> You're right.
>>
>> Actually depth is not a "hardware" caracteristic. Moreover it's just used as an
>> overlay for pxafb_set_pixfmt() to superseed var->bits_per_pixel. I'm wondering
>> if the right path for of_get_pxafb_mode_info() would be to remove completely
>> depth, and leave it initialized at 0 for the DT case.
>>
>> What do you think of this approach ? The other one would be to modify the
>> binding, and yet I feel this depth doesn't belong to the binding, it's my patch
>> which requires another spin IMHO.
>
> Yes, we should avoid non-hardware relate properties in the .dts files if
> at all possible. If the driver works fine without the property, I think
> it's fine to remove it. If it is required it needs to be added to the
> binding document.
Ok, agreed Tomi. That commits me for a v6, as the driver works fine on my
tests. I'll send it in the next couple of days.
Thanks for the review.
--
Robert
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).