Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 333508
b: refs/heads/master
c: 0b3ffe3
h: refs/heads/master
v: v3
  • Loading branch information
Archit Taneja committed Aug 16, 2012
1 parent a932022 commit cff38a8
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b84937577486a79cbc2196573ff7387a9f75cb0
refs/heads/master: 0b3ffe397ab2cfae526568880ab4621ff8f113c9
50 changes: 34 additions & 16 deletions trunk/drivers/video/omap2/dss/dsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ struct dsi_data {
struct omap_video_timings timings;
enum omap_dss_dsi_pixel_format pix_fmt;
enum omap_dss_dsi_mode mode;
struct omap_dss_dsi_videomode_timings vm_timings;
};

struct dsi_packet_sent_handler_data {
Expand Down Expand Up @@ -2366,7 +2367,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev)
if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) {
/* DDR_CLK_ALWAYS_ON */
REG_FLD_MOD(dsidev, DSI_CLK_CTRL,
dssdev->panel.dsi_vm_timings.ddr_clk_always_on, 13, 13);
dsi->vm_timings.ddr_clk_always_on, 13, 13);
}

dsi->ulps_enabled = false;
Expand Down Expand Up @@ -2688,6 +2689,7 @@ void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel,
bool enable)
{
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

DSSDBG("dsi_vc_enable_hs(%d, %d)\n", channel, enable);

Expand All @@ -2704,7 +2706,7 @@ void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel,
dsi_force_tx_stop_mode_io(dsidev);

/* start the DDR clock by sending a NULL packet */
if (dssdev->panel.dsi_vm_timings.ddr_clk_always_on && enable)
if (dsi->vm_timings.ddr_clk_always_on && enable)
dsi_vc_send_null(dssdev, channel);
}
EXPORT_SYMBOL(omapdss_dsi_vc_enable_hs);
Expand Down Expand Up @@ -3638,8 +3640,9 @@ static void dsi_config_vp_num_line_buffers(struct omap_dss_device *dssdev)
static void dsi_config_vp_sync_events(struct omap_dss_device *dssdev)
{
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
bool vsync_end = dssdev->panel.dsi_vm_timings.vp_vsync_end;
bool hsync_end = dssdev->panel.dsi_vm_timings.vp_hsync_end;
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
bool vsync_end = dsi->vm_timings.vp_vsync_end;
bool hsync_end = dsi->vm_timings.vp_hsync_end;
u32 r;

r = dsi_read_reg(dsidev, DSI_CTRL);
Expand All @@ -3656,10 +3659,11 @@ static void dsi_config_vp_sync_events(struct omap_dss_device *dssdev)
static void dsi_config_blanking_modes(struct omap_dss_device *dssdev)
{
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
int blanking_mode = dssdev->panel.dsi_vm_timings.blanking_mode;
int hfp_blanking_mode = dssdev->panel.dsi_vm_timings.hfp_blanking_mode;
int hbp_blanking_mode = dssdev->panel.dsi_vm_timings.hbp_blanking_mode;
int hsa_blanking_mode = dssdev->panel.dsi_vm_timings.hsa_blanking_mode;
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
int blanking_mode = dsi->vm_timings.blanking_mode;
int hfp_blanking_mode = dsi->vm_timings.hfp_blanking_mode;
int hbp_blanking_mode = dsi->vm_timings.hbp_blanking_mode;
int hsa_blanking_mode = dsi->vm_timings.hsa_blanking_mode;
u32 r;

/*
Expand Down Expand Up @@ -3992,14 +3996,14 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev)

if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) {
/* TODO: Implement a video mode check_timings function */
int hsa = dssdev->panel.dsi_vm_timings.hsa;
int hfp = dssdev->panel.dsi_vm_timings.hfp;
int hbp = dssdev->panel.dsi_vm_timings.hbp;
int vsa = dssdev->panel.dsi_vm_timings.vsa;
int vfp = dssdev->panel.dsi_vm_timings.vfp;
int vbp = dssdev->panel.dsi_vm_timings.vbp;
int window_sync = dssdev->panel.dsi_vm_timings.window_sync;
bool hsync_end = dssdev->panel.dsi_vm_timings.vp_hsync_end;
int hsa = dsi->vm_timings.hsa;
int hfp = dsi->vm_timings.hfp;
int hbp = dsi->vm_timings.hbp;
int vsa = dsi->vm_timings.vsa;
int vfp = dsi->vm_timings.vfp;
int vbp = dsi->vm_timings.vbp;
int window_sync = dsi->vm_timings.window_sync;
bool hsync_end = dsi->vm_timings.vp_hsync_end;
struct omap_video_timings *timings = &dsi->timings;
int bpp = dsi_get_pixel_size(dsi->pix_fmt);
int tl, t_he, width_bytes;
Expand Down Expand Up @@ -4715,6 +4719,20 @@ void omapdss_dsi_set_operation_mode(struct omap_dss_device *dssdev,
}
EXPORT_SYMBOL(omapdss_dsi_set_operation_mode);

void omapdss_dsi_set_videomode_timings(struct omap_dss_device *dssdev,
struct omap_dss_dsi_videomode_timings *timings)
{
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

mutex_lock(&dsi->lock);

dsi->vm_timings = *timings;

mutex_unlock(&dsi->lock);
}
EXPORT_SYMBOL(omapdss_dsi_set_videomode_timings);

static int __init dsi_init_display(struct omap_dss_device *dssdev)
{
struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/video/omapdss.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,8 @@ void omapdss_dsi_set_pixel_format(struct omap_dss_device *dssdev,
enum omap_dss_dsi_pixel_format fmt);
void omapdss_dsi_set_operation_mode(struct omap_dss_device *dssdev,
enum omap_dss_dsi_mode mode);
void omapdss_dsi_set_videomode_timings(struct omap_dss_device *dssdev,
struct omap_dss_dsi_videomode_timings *timings);

int omap_dsi_update(struct omap_dss_device *dssdev, int channel,
void (*callback)(int, void *), void *data);
Expand Down

0 comments on commit cff38a8

Please sign in to comment.