omapfb: copy omapdss & displays for omapfb
This patch makes a copy of the omapdss driver and the omap panel &
encoder drivers for omapfb. The purpose is to separate omapdrm and
omapfb drivers from each other.
Note that this patch only does a direct copy of the files without any
other modifications. The files are not yet used.
The original files are in:
drivers/video/fbdev/omap2/dss/
drivers/video/fbdev/omap2/displays-new/
Here's a more detailed explanation about this and the following patches,
from the introduction mail of the patch series:
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.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
2015-12-09 16:28:28 +00:00
|
|
|
/*
|
|
|
|
* Analog TV Connector driver
|
|
|
|
*
|
|
|
|
* Copyright (C) 2013 Texas Instruments
|
|
|
|
* Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License version 2 as published by
|
|
|
|
* the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <linux/of.h>
|
|
|
|
|
2016-05-31 08:43:12 +00:00
|
|
|
#include <video/omapfb_dss.h>
|
omapfb: copy omapdss & displays for omapfb
This patch makes a copy of the omapdss driver and the omap panel &
encoder drivers for omapfb. The purpose is to separate omapdrm and
omapfb drivers from each other.
Note that this patch only does a direct copy of the files without any
other modifications. The files are not yet used.
The original files are in:
drivers/video/fbdev/omap2/dss/
drivers/video/fbdev/omap2/displays-new/
Here's a more detailed explanation about this and the following patches,
from the introduction mail of the patch series:
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.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
2015-12-09 16:28:28 +00:00
|
|
|
#include <video/omap-panel-data.h>
|
|
|
|
|
|
|
|
struct panel_drv_data {
|
|
|
|
struct omap_dss_device dssdev;
|
|
|
|
struct omap_dss_device *in;
|
|
|
|
|
|
|
|
struct device *dev;
|
|
|
|
|
|
|
|
struct omap_video_timings timings;
|
|
|
|
|
|
|
|
bool invert_polarity;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct omap_video_timings tvc_pal_timings = {
|
|
|
|
.x_res = 720,
|
|
|
|
.y_res = 574,
|
|
|
|
.pixelclock = 13500000,
|
|
|
|
.hsw = 64,
|
|
|
|
.hfp = 12,
|
|
|
|
.hbp = 68,
|
|
|
|
.vsw = 5,
|
|
|
|
.vfp = 5,
|
|
|
|
.vbp = 41,
|
|
|
|
|
|
|
|
.interlace = true,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct of_device_id tvc_of_match[];
|
|
|
|
|
|
|
|
#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
|
|
|
|
|
|
|
|
static int tvc_connect(struct omap_dss_device *dssdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
dev_dbg(ddata->dev, "connect\n");
|
|
|
|
|
|
|
|
if (omapdss_device_is_connected(dssdev))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
r = in->ops.atv->connect(in, dssdev);
|
|
|
|
if (r)
|
|
|
|
return r;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tvc_disconnect(struct omap_dss_device *dssdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
|
|
|
|
dev_dbg(ddata->dev, "disconnect\n");
|
|
|
|
|
|
|
|
if (!omapdss_device_is_connected(dssdev))
|
|
|
|
return;
|
|
|
|
|
|
|
|
in->ops.atv->disconnect(in, dssdev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tvc_enable(struct omap_dss_device *dssdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
dev_dbg(ddata->dev, "enable\n");
|
|
|
|
|
|
|
|
if (!omapdss_device_is_connected(dssdev))
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
if (omapdss_device_is_enabled(dssdev))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
in->ops.atv->set_timings(in, &ddata->timings);
|
|
|
|
|
|
|
|
if (!ddata->dev->of_node) {
|
2016-05-30 10:21:21 +00:00
|
|
|
in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
|
omapfb: copy omapdss & displays for omapfb
This patch makes a copy of the omapdss driver and the omap panel &
encoder drivers for omapfb. The purpose is to separate omapdrm and
omapfb drivers from each other.
Note that this patch only does a direct copy of the files without any
other modifications. The files are not yet used.
The original files are in:
drivers/video/fbdev/omap2/dss/
drivers/video/fbdev/omap2/displays-new/
Here's a more detailed explanation about this and the following patches,
from the introduction mail of the patch series:
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.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
2015-12-09 16:28:28 +00:00
|
|
|
|
|
|
|
in->ops.atv->invert_vid_out_polarity(in,
|
|
|
|
ddata->invert_polarity);
|
|
|
|
}
|
|
|
|
|
|
|
|
r = in->ops.atv->enable(in);
|
|
|
|
if (r)
|
|
|
|
return r;
|
|
|
|
|
|
|
|
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tvc_disable(struct omap_dss_device *dssdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
|
|
|
|
dev_dbg(ddata->dev, "disable\n");
|
|
|
|
|
|
|
|
if (!omapdss_device_is_enabled(dssdev))
|
|
|
|
return;
|
|
|
|
|
|
|
|
in->ops.atv->disable(in);
|
|
|
|
|
|
|
|
dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tvc_set_timings(struct omap_dss_device *dssdev,
|
|
|
|
struct omap_video_timings *timings)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
|
|
|
|
ddata->timings = *timings;
|
|
|
|
dssdev->panel.timings = *timings;
|
|
|
|
|
|
|
|
in->ops.atv->set_timings(in, timings);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tvc_get_timings(struct omap_dss_device *dssdev,
|
|
|
|
struct omap_video_timings *timings)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
|
|
|
|
*timings = ddata->timings;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tvc_check_timings(struct omap_dss_device *dssdev,
|
|
|
|
struct omap_video_timings *timings)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
|
|
|
|
return in->ops.atv->check_timings(in, timings);
|
|
|
|
}
|
|
|
|
|
|
|
|
static u32 tvc_get_wss(struct omap_dss_device *dssdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
|
|
|
|
return in->ops.atv->get_wss(in);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tvc_set_wss(struct omap_dss_device *dssdev, u32 wss)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = to_panel_data(dssdev);
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
|
|
|
|
return in->ops.atv->set_wss(in, wss);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct omap_dss_driver tvc_driver = {
|
|
|
|
.connect = tvc_connect,
|
|
|
|
.disconnect = tvc_disconnect,
|
|
|
|
|
|
|
|
.enable = tvc_enable,
|
|
|
|
.disable = tvc_disable,
|
|
|
|
|
|
|
|
.set_timings = tvc_set_timings,
|
|
|
|
.get_timings = tvc_get_timings,
|
|
|
|
.check_timings = tvc_check_timings,
|
|
|
|
|
|
|
|
.get_resolution = omapdss_default_get_resolution,
|
|
|
|
|
|
|
|
.get_wss = tvc_get_wss,
|
|
|
|
.set_wss = tvc_set_wss,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int tvc_probe_pdata(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
|
|
|
|
struct connector_atv_platform_data *pdata;
|
|
|
|
struct omap_dss_device *in, *dssdev;
|
|
|
|
|
|
|
|
pdata = dev_get_platdata(&pdev->dev);
|
|
|
|
|
|
|
|
in = omap_dss_find_output(pdata->source);
|
|
|
|
if (in == NULL) {
|
|
|
|
dev_err(&pdev->dev, "Failed to find video source\n");
|
|
|
|
return -EPROBE_DEFER;
|
|
|
|
}
|
|
|
|
|
|
|
|
ddata->in = in;
|
|
|
|
|
|
|
|
ddata->invert_polarity = pdata->invert_polarity;
|
|
|
|
|
|
|
|
dssdev = &ddata->dssdev;
|
|
|
|
dssdev->name = pdata->name;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tvc_probe_of(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
|
|
|
|
struct device_node *node = pdev->dev.of_node;
|
|
|
|
struct omap_dss_device *in;
|
|
|
|
|
|
|
|
in = omapdss_of_find_source_for_first_ep(node);
|
|
|
|
if (IS_ERR(in)) {
|
|
|
|
dev_err(&pdev->dev, "failed to find video source\n");
|
|
|
|
return PTR_ERR(in);
|
|
|
|
}
|
|
|
|
|
|
|
|
ddata->in = in;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tvc_probe(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata;
|
|
|
|
struct omap_dss_device *dssdev;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
|
|
|
|
if (!ddata)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
platform_set_drvdata(pdev, ddata);
|
|
|
|
ddata->dev = &pdev->dev;
|
|
|
|
|
|
|
|
if (dev_get_platdata(&pdev->dev)) {
|
|
|
|
r = tvc_probe_pdata(pdev);
|
|
|
|
if (r)
|
|
|
|
return r;
|
|
|
|
} else if (pdev->dev.of_node) {
|
|
|
|
r = tvc_probe_of(pdev);
|
|
|
|
if (r)
|
|
|
|
return r;
|
|
|
|
} else {
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
ddata->timings = tvc_pal_timings;
|
|
|
|
|
|
|
|
dssdev = &ddata->dssdev;
|
|
|
|
dssdev->driver = &tvc_driver;
|
|
|
|
dssdev->dev = &pdev->dev;
|
|
|
|
dssdev->type = OMAP_DISPLAY_TYPE_VENC;
|
|
|
|
dssdev->owner = THIS_MODULE;
|
|
|
|
dssdev->panel.timings = tvc_pal_timings;
|
|
|
|
|
|
|
|
r = omapdss_register_display(dssdev);
|
|
|
|
if (r) {
|
|
|
|
dev_err(&pdev->dev, "Failed to register panel\n");
|
|
|
|
goto err_reg;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
err_reg:
|
|
|
|
omap_dss_put_device(ddata->in);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __exit tvc_remove(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
|
|
|
|
struct omap_dss_device *dssdev = &ddata->dssdev;
|
|
|
|
struct omap_dss_device *in = ddata->in;
|
|
|
|
|
|
|
|
omapdss_unregister_display(&ddata->dssdev);
|
|
|
|
|
|
|
|
tvc_disable(dssdev);
|
|
|
|
tvc_disconnect(dssdev);
|
|
|
|
|
|
|
|
omap_dss_put_device(in);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct of_device_id tvc_of_match[] = {
|
|
|
|
{ .compatible = "omapdss,svideo-connector", },
|
|
|
|
{ .compatible = "omapdss,composite-video-connector", },
|
|
|
|
{},
|
|
|
|
};
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(of, tvc_of_match);
|
|
|
|
|
|
|
|
static struct platform_driver tvc_connector_driver = {
|
|
|
|
.probe = tvc_probe,
|
|
|
|
.remove = __exit_p(tvc_remove),
|
|
|
|
.driver = {
|
|
|
|
.name = "connector-analog-tv",
|
|
|
|
.of_match_table = tvc_of_match,
|
|
|
|
.suppress_bind_attrs = true,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
module_platform_driver(tvc_connector_driver);
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
|
|
|
|
MODULE_DESCRIPTION("Analog TV Connector driver");
|
|
|
|
MODULE_LICENSE("GPL");
|