From: Archit Taneja <archit@ti.com>
To: tomi.valkeinen@ti.com
Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org,
rob@ti.com, sumit.semwal@ti.com, Archit Taneja <archit@ti.com>
Subject: [PATCH 14/23] OMAPDSS: RFBI: Pass outputs from panel driver to RFBI interface driver
Date: Tue, 21 Aug 2012 06:10:21 +0000 [thread overview]
Message-ID: <1345528711-27801-15-git-send-email-archit@ti.com> (raw)
In-Reply-To: <1345528711-27801-1-git-send-email-archit@ti.com>
With outputs introduces as new entities, we can now pass output pointer to
functions used to configure the connected interface. These functions currently
pass the omap_dss_device pointer, and extract output information via
omap_dss_device. This is unnecessary, and it doesn't make sense for interface
related functions to get the panel's/device's pointer, it should receive a
pointer related to the connected interface, which in our case is the output
entity.
With the addition of outputs. There is a possibility that an omap_dss_device
isn't connected to an output yet. Ensure that panel drivers call the interface
functions only if outputs are non NULL.
Modify DSI functions to pass omap_dss_output pointer instead of omap_dss_device
pointer. Modify the panel drivers to call the updated functions.
Signed-off-by: Archit Taneja <archit@ti.com>
---
drivers/video/omap2/displays/panel-n8x0.c | 38 +++++++++++++++++----------
drivers/video/omap2/dss/rfbi.c | 40 +++++++++++++++--------------
include/video/omapdss.h | 16 ++++++------
3 files changed, 53 insertions(+), 41 deletions(-)
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index 17ae85e..3601c59 100644
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -116,6 +116,7 @@ static void blizzard_ctrl_setup_update(struct omap_dss_device *dssdev,
int x, int y, int w, int h)
{
struct panel_drv_data *ddata = get_drv_data(dssdev);
+ struct omap_dss_output *out = dssdev->output;
u8 tmp[18];
int x_end, y_end;
@@ -150,17 +151,17 @@ static void blizzard_ctrl_setup_update(struct omap_dss_device *dssdev,
BLIZZARD_SRC_WRITE_LCD :
BLIZZARD_SRC_WRITE_LCD_DESTRUCTIVE;
- omapdss_rfbi_set_pixel_size(dssdev, 16);
- omapdss_rfbi_set_data_lines(dssdev, 8);
+ omapdss_rfbi_set_pixel_size(out, 16);
+ omapdss_rfbi_set_data_lines(out, 8);
- omap_rfbi_configure(dssdev);
+ omap_rfbi_configure(out);
blizzard_write(BLIZZARD_INPUT_WIN_X_START_0, tmp, 18);
- omapdss_rfbi_set_pixel_size(dssdev, 16);
- omapdss_rfbi_set_data_lines(dssdev, 16);
+ omapdss_rfbi_set_pixel_size(out, 16);
+ omapdss_rfbi_set_data_lines(out, 16);
- omap_rfbi_configure(dssdev);
+ omap_rfbi_configure(out);
}
static void mipid_transfer(struct spi_device *spi, int cmd, const u8 *wbuf,
@@ -288,10 +289,14 @@ static int n8x0_panel_power_on(struct omap_dss_device *dssdev)
struct panel_n8x0_data *bdata = get_board_data(dssdev);
struct panel_drv_data *ddata = get_drv_data(dssdev);
struct spi_device *spi = ddata->spidev;
+ struct omap_dss_output *out = dssdev->output;
u8 rev, conf;
u8 display_id[3];
const char *panel_name;
+ if (out = NULL)
+ return -ENODEV;
+
if (dssdev->state = OMAP_DSS_DISPLAY_ACTIVE)
return 0;
@@ -303,13 +308,13 @@ static int n8x0_panel_power_on(struct omap_dss_device *dssdev)
goto err_plat_en;
}
- omapdss_rfbi_set_size(dssdev, dssdev->panel.timings.x_res,
+ omapdss_rfbi_set_size(out, dssdev->panel.timings.x_res,
dssdev->panel.timings.y_res);
- omapdss_rfbi_set_pixel_size(dssdev, dssdev->ctrl.pixel_size);
- omapdss_rfbi_set_data_lines(dssdev, dssdev->phy.rfbi.data_lines);
- omapdss_rfbi_set_interface_timings(dssdev, &dssdev->ctrl.rfbi_timings);
+ omapdss_rfbi_set_pixel_size(out, dssdev->ctrl.pixel_size);
+ omapdss_rfbi_set_data_lines(out, dssdev->phy.rfbi.data_lines);
+ omapdss_rfbi_set_interface_timings(out, &dssdev->ctrl.rfbi_timings);
- r = omapdss_rfbi_display_enable(dssdev);
+ r = omapdss_rfbi_display_enable(out);
if (r)
goto err_rfbi_en;
@@ -373,7 +378,7 @@ err_inv_panel:
*/
/* gpio_direction_output(bdata->panel_reset, 0); */
err_inv_chip:
- omapdss_rfbi_display_disable(dssdev);
+ omapdss_rfbi_display_disable(out);
err_rfbi_en:
if (bdata->platform_disable)
bdata->platform_disable(dssdev);
@@ -386,6 +391,7 @@ static void n8x0_panel_power_off(struct omap_dss_device *dssdev)
{
struct panel_n8x0_data *bdata = get_board_data(dssdev);
struct panel_drv_data *ddata = get_drv_data(dssdev);
+ struct omap_dss_output *out = dssdev->output;
struct spi_device *spi = ddata->spidev;
if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
@@ -404,7 +410,7 @@ static void n8x0_panel_power_off(struct omap_dss_device *dssdev)
*/
/* gpio_direction_output(bdata->panel_reset, 0); */
gpio_direction_output(bdata->ctrl_pwrdown, 0);
- omapdss_rfbi_display_disable(dssdev);
+ omapdss_rfbi_display_disable(out);
}
static const struct rfbi_timings n8x0_panel_timings = {
@@ -637,10 +643,14 @@ static int n8x0_panel_update(struct omap_dss_device *dssdev,
u16 x, u16 y, u16 w, u16 h)
{
struct panel_drv_data *ddata = get_drv_data(dssdev);
+ struct omap_dss_output *out = dssdev->output;
u16 dw, dh;
dev_dbg(&dssdev->dev, "update\n");
+ if (out = NULL)
+ return -ENODEV;
+
dw = dssdev->panel.timings.x_res;
dh = dssdev->panel.timings.y_res;
@@ -655,7 +665,7 @@ static int n8x0_panel_update(struct omap_dss_device *dssdev,
blizzard_ctrl_setup_update(dssdev, x, y, w, h);
- omap_rfbi_update(dssdev, update_done, NULL);
+ omap_rfbi_update(out, update_done, NULL);
mutex_unlock(&ddata->lock);
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 9d9244c..ca264e8 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -305,11 +305,12 @@ void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width,
}
EXPORT_SYMBOL(omap_rfbi_write_pixels);
-static int rfbi_transfer_area(struct omap_dss_device *dssdev,
+static int rfbi_transfer_area(struct omap_dss_output *out,
void (*callback)(void *data), void *data)
{
u32 l;
int r;
+ struct omap_overlay_manager *mgr = out->manager;
u16 width = rfbi.timings.x_res;
u16 height = rfbi.timings.y_res;
@@ -318,9 +319,9 @@ static int rfbi_transfer_area(struct omap_dss_device *dssdev,
DSSDBG("rfbi_transfer_area %dx%d\n", width, height);
- dss_mgr_set_timings(dssdev->manager, &rfbi.timings);
+ dss_mgr_set_timings(mgr, &rfbi.timings);
- r = dss_mgr_enable(dssdev->manager);
+ r = dss_mgr_enable(mgr);
if (r)
return r;
@@ -767,40 +768,40 @@ static int rfbi_configure(int rfbi_module, int bpp, int lines)
return 0;
}
-int omap_rfbi_configure(struct omap_dss_device *dssdev)
+int omap_rfbi_configure(struct omap_dss_output *out)
{
- return rfbi_configure(dssdev->phy.rfbi.channel, rfbi.pixel_size,
+ return rfbi_configure(out->device->phy.rfbi.channel, rfbi.pixel_size,
rfbi.data_lines);
}
EXPORT_SYMBOL(omap_rfbi_configure);
-int omap_rfbi_update(struct omap_dss_device *dssdev, void (*callback)(void *),
+int omap_rfbi_update(struct omap_dss_output *out, void (*callback)(void *),
void *data)
{
- return rfbi_transfer_area(dssdev, callback, data);
+ return rfbi_transfer_area(out, callback, data);
}
EXPORT_SYMBOL(omap_rfbi_update);
-void omapdss_rfbi_set_size(struct omap_dss_device *dssdev, u16 w, u16 h)
+void omapdss_rfbi_set_size(struct omap_dss_output *out, u16 w, u16 h)
{
rfbi.timings.x_res = w;
rfbi.timings.y_res = h;
}
EXPORT_SYMBOL(omapdss_rfbi_set_size);
-void omapdss_rfbi_set_pixel_size(struct omap_dss_device *dssdev, int pixel_size)
+void omapdss_rfbi_set_pixel_size(struct omap_dss_output *out, int pixel_size)
{
rfbi.pixel_size = pixel_size;
}
EXPORT_SYMBOL(omapdss_rfbi_set_pixel_size);
-void omapdss_rfbi_set_data_lines(struct omap_dss_device *dssdev, int data_lines)
+void omapdss_rfbi_set_data_lines(struct omap_dss_output *out, int data_lines)
{
rfbi.data_lines = data_lines;
}
EXPORT_SYMBOL(omapdss_rfbi_set_data_lines);
-void omapdss_rfbi_set_interface_timings(struct omap_dss_device *dssdev,
+void omapdss_rfbi_set_interface_timings(struct omap_dss_output *out,
struct rfbi_timings *timings)
{
rfbi.intf_timings = *timings;
@@ -847,7 +848,7 @@ static void rfbi_dump_regs(struct seq_file *s)
#undef DUMPREG
}
-static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
+static void rfbi_config_lcd_manager(struct omap_dss_output *out)
{
struct dss_lcd_mgr_config mgr_config;
@@ -860,7 +861,7 @@ static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
mgr_config.video_port_width = rfbi.pixel_size;
mgr_config.lcden_sig_polarity = 0;
- dss_mgr_set_lcd_config(dssdev->manager, &mgr_config);
+ dss_mgr_set_lcd_config(out->manager, &mgr_config);
/*
* Set rfbi.timings with default values, the x_res and y_res fields
@@ -881,14 +882,15 @@ static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
rfbi.timings.de_level = OMAPDSS_SIG_ACTIVE_HIGH;
rfbi.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES;
- dss_mgr_set_timings(dssdev->manager, &rfbi.timings);
+ dss_mgr_set_timings(out->manager, &rfbi.timings);
}
-int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev)
+int omapdss_rfbi_display_enable(struct omap_dss_output *out)
{
int r;
+ struct omap_dss_device *dssdev = out->device;
- if (dssdev->manager = NULL) {
+ if (out->manager = NULL) {
DSSERR("failed to enable display: no manager\n");
return -ENODEV;
}
@@ -910,7 +912,7 @@ int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev)
goto err1;
}
- rfbi_config_lcd_manager(dssdev);
+ rfbi_config_lcd_manager(out);
rfbi_configure(dssdev->phy.rfbi.channel, rfbi.pixel_size,
rfbi.data_lines);
@@ -926,11 +928,11 @@ err0:
}
EXPORT_SYMBOL(omapdss_rfbi_display_enable);
-void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev)
+void omapdss_rfbi_display_disable(struct omap_dss_output *out)
{
omap_dispc_unregister_isr(framedone_callback, NULL,
DISPC_IRQ_FRAMEDONE);
- omap_dss_stop_device(dssdev);
+ omap_dss_stop_device(out->device);
rfbi_runtime_put();
}
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index cf881c0..723f091 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -798,17 +798,17 @@ void omapdss_sdi_set_timings(struct omap_dss_output *out,
struct omap_video_timings *timings);
void omapdss_sdi_set_datapairs(struct omap_dss_output *out, int datapairs);
-int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev);
-void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev);
-int omap_rfbi_update(struct omap_dss_device *dssdev, void (*callback)(void *),
+int omapdss_rfbi_display_enable(struct omap_dss_output *out);
+void omapdss_rfbi_display_disable(struct omap_dss_output *out);
+int omap_rfbi_update(struct omap_dss_output *out, void (*callback)(void *),
void *data);
-int omap_rfbi_configure(struct omap_dss_device *dssdev);
-void omapdss_rfbi_set_size(struct omap_dss_device *dssdev, u16 w, u16 h);
-void omapdss_rfbi_set_pixel_size(struct omap_dss_device *dssdev,
+int omap_rfbi_configure(struct omap_dss_output *out);
+void omapdss_rfbi_set_size(struct omap_dss_output *out, u16 w, u16 h);
+void omapdss_rfbi_set_pixel_size(struct omap_dss_output *out,
int pixel_size);
-void omapdss_rfbi_set_data_lines(struct omap_dss_device *dssdev,
+void omapdss_rfbi_set_data_lines(struct omap_dss_output *out,
int data_lines);
-void omapdss_rfbi_set_interface_timings(struct omap_dss_device *dssdev,
+void omapdss_rfbi_set_interface_timings(struct omap_dss_output *out,
struct rfbi_timings *timings);
#endif
--
1.7.9.5
next prev parent reply other threads:[~2012-08-21 6:10 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-21 6:10 [PATCH 00/23] OMAPDSS: Create output entities Archit Taneja
2012-08-21 6:10 ` [PATCH 01/23] OMAPDSS: outputs: Create a new entity called outputs Archit Taneja
2012-08-24 12:41 ` Tomi Valkeinen
2012-08-24 12:53 ` Archit Taneja
2012-08-29 10:32 ` Tomi Valkeinen
2012-08-29 10:58 ` Archit Taneja
2012-08-21 6:10 ` [PATCH 02/23] OMAPDSS: outputs: Create and initialize output instances Archit Taneja
2012-08-24 13:14 ` Tomi Valkeinen
2012-08-27 6:31 ` Archit Taneja
2012-08-27 6:44 ` Tomi Valkeinen
2012-08-21 6:10 ` [PATCH 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Archit Taneja
2012-08-21 6:10 ` [PATCH 04/23] OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager Archit Taneja
2012-08-21 6:10 ` [PATCH 05/23] OMAPDSS: Remove manager->device references Archit Taneja
2012-08-21 6:10 ` [PATCH 06/23] OMAP_VOUT: " Archit Taneja
2012-08-21 6:10 ` [PATCH 07/23] OMAPFB: remove " Archit Taneja
2012-08-21 6:10 ` [PATCH 08/23] OMAPDRM: Remove " Archit Taneja
2012-08-21 6:10 ` [PATCH 09/23] OMAPDSS: Create links between managers, outputs and devices Archit Taneja
2012-08-21 6:10 ` [PATCH 10/23] OMAPDSS: DPI: Pass outputs from panel driver to DPI interface driver Archit Taneja
2012-08-21 6:10 ` [PATCH 11/23] OMAPDSS: DSI: Remove dsi_pdev_map global struct Archit Taneja
2012-08-21 6:10 ` [PATCH 12/23] OMAPDSS: DSI: Pass outputs from panel driver to DSI interface driver Archit Taneja
2012-08-21 6:10 ` [PATCH 13/23] OMAPDSS: SDI: Pass outputs from panel driver to SDI " Archit Taneja
2012-08-21 6:10 ` Archit Taneja [this message]
2012-08-21 6:10 ` [PATCH 15/23] OMAPDSS: RFBI: Add output pointers as arguments to all exported functions Archit Taneja
2012-08-21 6:10 ` [PATCH 16/23] OMAPDSS: VENC: Pass outputs from panel driver to VENC interface driver Archit Taneja
2012-08-21 6:10 ` [PATCH 17/23] OMAPDSS: HDMI: Pass outputs from panel driver to HDMI " Archit Taneja
2012-08-21 6:10 ` [PATCH 18/23] OMAPDSS: HDMI: Add output pointers as arguments to all functions used by hdmi panel dr Archit Taneja
2012-08-21 6:10 ` [PATCH 19/23] OMAPDSS/OMAPFB: Change dssdev->manager references Archit Taneja
2012-08-21 6:10 ` [PATCH 20/23] OMAPDSS: MANAGER: Update display sysfs store Archit Taneja
2012-08-21 6:10 ` [PATCH 21/23] OMAPDSS: MANAGER: Get device via output Archit Taneja
2012-08-21 6:10 ` [PATCH 22/23] OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable Archit Taneja
2012-08-21 6:10 ` [PATCH 23/23] OMAPDSS: Remove old way of setting manager and device links Archit Taneja
2012-08-30 11:52 ` [PATCH v2 00/23] OMAPDSS: Create output entities Archit Taneja
2012-08-30 11:52 ` [PATCH v2 01/23] OMAPDSS: outputs: Create a new entity called outputs Archit Taneja
2012-08-30 11:52 ` [PATCH v2 02/23] OMAPDSS: outputs: Create and register output instances Archit Taneja
2012-08-31 11:57 ` Tomi Valkeinen
2012-08-31 12:15 ` Archit Taneja
2012-08-30 11:52 ` [PATCH v2 03/23] OMAPDSS: output: Add set/unset device ops for omap_dss_output Archit Taneja
2012-08-31 12:03 ` Tomi Valkeinen
2012-08-31 12:36 ` Archit Taneja
2012-08-31 12:28 ` Tomi Valkeinen
2012-08-30 11:52 ` [PATCH v2 04/23] OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager Archit Taneja
2012-08-30 11:52 ` [PATCH v2 05/23] OMAPDSS: Remove manager->device references Archit Taneja
2012-08-30 11:52 ` [PATCH v2 06/23] OMAP_VOUT: " Archit Taneja
2012-08-31 12:11 ` Tomi Valkeinen
2012-08-31 12:46 ` Archit Taneja
2012-08-30 11:52 ` [PATCH v2 07/23] OMAPFB: remove " Archit Taneja
2012-08-30 11:52 ` [PATCH v2 08/23] OMAPDRM: Remove " Archit Taneja
2012-08-30 11:52 ` [PATCH v2 09/23] OMAPDSS: Create links between managers, outputs and devices Archit Taneja
2012-08-31 14:10 ` Tomi Valkeinen
2012-08-31 14:36 ` Archit Taneja
2012-08-31 14:45 ` Tomi Valkeinen
2012-08-31 15:08 ` Tomi Valkeinen
2012-09-03 9:38 ` Archit Taneja
2012-09-03 9:35 ` Tomi Valkeinen
2012-08-30 11:52 ` [PATCH v2 10/23] OMAPDSS: DPI: Pass omap_dss_output within the driver Archit Taneja
2012-08-31 13:48 ` Tomi Valkeinen
2012-08-31 13:59 ` Archit Taneja
2012-08-30 11:52 ` [PATCH v2 11/23] OMAPDSS: DSI: Remove dsi_pdev_map global struct Archit Taneja
2012-08-30 11:52 ` [PATCH v2 12/23] OMAPDSS: DSI: Pass omap_dss_output within the driver Archit Taneja
2012-08-30 11:52 ` [PATCH v2 13/23] OMAPDSS: SDI: " Archit Taneja
2012-08-30 11:52 ` [PATCH v2 14/23] OMAPDSS: RFBI: " Archit Taneja
2012-08-30 11:52 ` [PATCH v2 15/23] OMAPDSS: RFBI: Add dssdev pointers as arguments to all exported functions Archit Taneja
2012-08-31 14:20 ` Tomi Valkeinen
2012-08-31 14:42 ` Archit Taneja
2012-08-30 11:52 ` [PATCH v2 16/23] OMAPDSS: VENC: Pass omap_dss_output within the driver Archit Taneja
2012-08-30 11:52 ` [PATCH v2 17/23] OMAPDSS: HDMI: " Archit Taneja
2012-08-30 11:52 ` [PATCH v2 18/23] OMAPDSS: HDMI: Add dssdev pointer as an argument to all functions used by hdmi pane Archit Taneja
2012-08-30 11:52 ` [PATCH v2 19/23] OMAPDSS/OMAPFB: Change dssdev->manager references Archit Taneja
2012-08-30 11:52 ` [PATCH v2 20/23] OMAPDSS: MANAGER: Update display sysfs store Archit Taneja
2012-08-31 14:30 ` Tomi Valkeinen
2012-08-31 14:53 ` Archit Taneja
2012-08-30 11:52 ` [PATCH v2 21/23] OMAPDSS: MANAGER: Get device via output Archit Taneja
2012-08-30 11:52 ` [PATCH v2 22/23] OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disable Archit Taneja
2012-08-30 11:52 ` [PATCH v2 23/23] OMAPDSS: Remove old way of setting manager and device links Archit Taneja
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345528711-27801-15-git-send-email-archit@ti.com \
--to=archit@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=rob@ti.com \
--cc=sumit.semwal@ti.com \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).