diff options
author | Alan Cox <alan@linux.intel.com> | 2011-07-15 12:46:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-15 13:12:15 -0400 |
commit | c603685443208fa6c52d5080637b36bf7092ac69 (patch) | |
tree | fed20f7dedf216f9b678c854fc2b2346fba6311b /drivers/staging | |
parent | 3a970ac1b14cf1a49076d69369aa75a23d4ad2db (diff) |
gma500: Fix DPU build
Fix up the merge build
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/gma500/mdfld_dsi_dbi.h | 6 | ||||
-rw-r--r-- | drivers/staging/gma500/mdfld_dsi_dbi_dpu.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/drivers/staging/gma500/mdfld_dsi_dbi.h b/drivers/staging/gma500/mdfld_dsi_dbi.h index a2ec6fd94ae..dc6242c51d0 100644 --- a/drivers/staging/gma500/mdfld_dsi_dbi.h +++ b/drivers/staging/gma500/mdfld_dsi_dbi.h | |||
@@ -69,6 +69,12 @@ struct mdfld_dsi_dbi_output { | |||
69 | bool dbi_panel_on; | 69 | bool dbi_panel_on; |
70 | bool first_boot; | 70 | bool first_boot; |
71 | struct panel_funcs *p_funcs; | 71 | struct panel_funcs *p_funcs; |
72 | |||
73 | /* DPU */ | ||
74 | u32 *dbi_cb_addr; | ||
75 | u32 dbi_cb_phy; | ||
76 | spinlock_t cb_lock; | ||
77 | u32 cb_write; | ||
72 | }; | 78 | }; |
73 | 79 | ||
74 | #define MDFLD_DSI_DBI_OUTPUT(dsi_encoder) \ | 80 | #define MDFLD_DSI_DBI_OUTPUT(dsi_encoder) \ |
diff --git a/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c b/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c index 98ec990a23f..a4e2ff442b1 100644 --- a/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c +++ b/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c | |||
@@ -418,7 +418,7 @@ static int mdfld_dpu_update_pipe(struct mdfld_dsi_dbi_output *dbi_output, | |||
418 | * added it so that text console could boot smoothly | 418 | * added it so that text console could boot smoothly |
419 | */ | 419 | */ |
420 | /* Clean pending flags on this pipe */ | 420 | /* Clean pending flags on this pipe */ |
421 | if (!ret && dev_priv->b_dsr_enable) { | 421 | if (!ret && dev_priv->dsr_enable) { |
422 | dpu_info->pending &= ~plane_mask; | 422 | dpu_info->pending &= ~plane_mask; |
423 | /* Reset overlay pipe damage rect */ | 423 | /* Reset overlay pipe damage rect */ |
424 | mdfld_dpu_init_damage(dpu_info, pipe); | 424 | mdfld_dpu_init_damage(dpu_info, pipe); |
@@ -527,7 +527,7 @@ static int __mdfld_dbi_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output, | |||
527 | if (!dbi_output) | 527 | if (!dbi_output) |
528 | return 0; | 528 | return 0; |
529 | 529 | ||
530 | /*if mode setting on-going, back off*/ | 530 | /* If mode setting on-going, back off */ |
531 | if ((dbi_output->mode_flags & MODE_SETTING_ON_GOING) || | 531 | if ((dbi_output->mode_flags & MODE_SETTING_ON_GOING) || |
532 | (psb_crtc && psb_crtc->mode_flags & MODE_SETTING_ON_GOING)) | 532 | (psb_crtc && psb_crtc->mode_flags & MODE_SETTING_ON_GOING)) |
533 | return -EAGAIN; | 533 | return -EAGAIN; |
@@ -542,7 +542,7 @@ static int __mdfld_dbi_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output, | |||
542 | reg_offset = MIPIC_REG_OFFSET; | 542 | reg_offset = MIPIC_REG_OFFSET; |
543 | } | 543 | } |
544 | 544 | ||
545 | if (!ospm_power_using_hw_begin(OSPM_DISPLAY_ISLAND, true)) | 545 | if (!gma_power_begin(dev, true)) |
546 | return -EAGAIN; | 546 | return -EAGAIN; |
547 | 547 | ||
548 | /* Enable DPLL */ | 548 | /* Enable DPLL */ |
@@ -585,9 +585,9 @@ static int __mdfld_dbi_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output, | |||
585 | udelay(500); | 585 | udelay(500); |
586 | } | 586 | } |
587 | 587 | ||
588 | ospm_power_using_hw_end(OSPM_DISPLAY_ISLAND); | 588 | gma_power_end(dev); |
589 | 589 | ||
590 | /*clean IN_DSR flag*/ | 590 | /* Clean IN_DSR flag */ |
591 | dbi_output->mode_flags &= ~MODE_SETTING_IN_DSR; | 591 | dbi_output->mode_flags &= ~MODE_SETTING_IN_DSR; |
592 | 592 | ||
593 | return 0; | 593 | return 0; |