|
@@ -312,6 +312,7 @@ static int rfbi_transfer_area(struct omap_dss_device *dssdev,
|
|
|
{
|
|
|
u32 l;
|
|
|
int r;
|
|
|
+ struct omap_overlay_manager *mgr = dssdev->output->manager;
|
|
|
u16 width = rfbi.timings.x_res;
|
|
|
u16 height = rfbi.timings.y_res;
|
|
|
|
|
@@ -320,9 +321,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;
|
|
|
|
|
@@ -851,6 +852,7 @@ static void rfbi_dump_regs(struct seq_file *s)
|
|
|
|
|
|
static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
|
|
|
{
|
|
|
+ struct omap_overlay_manager *mgr = dssdev->output->manager;
|
|
|
struct dss_lcd_mgr_config mgr_config;
|
|
|
|
|
|
mgr_config.io_pad_mode = DSS_IO_PAD_MODE_RFBI;
|
|
@@ -862,7 +864,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(mgr, &mgr_config);
|
|
|
|
|
|
/*
|
|
|
* Set rfbi.timings with default values, the x_res and y_res fields
|
|
@@ -883,15 +885,16 @@ 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(mgr, &rfbi.timings);
|
|
|
}
|
|
|
|
|
|
int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev)
|
|
|
{
|
|
|
+ struct omap_dss_output *out = dssdev->output;
|
|
|
int r;
|
|
|
|
|
|
- if (dssdev->manager == NULL) {
|
|
|
- DSSERR("failed to enable display: no manager\n");
|
|
|
+ if (out == NULL || out->manager == NULL) {
|
|
|
+ DSSERR("failed to enable display: no output/manager\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
|