diff options
Diffstat (limited to 'drivers/video/omap2/dss/dsi.c')
-rw-r--r-- | drivers/video/omap2/dss/dsi.c | 190 |
1 files changed, 11 insertions, 179 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index c951a75e7021..bd0ff1d64497 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c | |||
@@ -3648,161 +3648,6 @@ static void dsi_proto_timings(struct omap_dss_device *dssdev) | |||
3648 | enter_hs_mode_lat, exit_hs_mode_lat); | 3648 | enter_hs_mode_lat, exit_hs_mode_lat); |
3649 | } | 3649 | } |
3650 | 3650 | ||
3651 | |||
3652 | #define DSI_DECL_VARS \ | ||
3653 | int __dsi_cb = 0; u32 __dsi_cv = 0; | ||
3654 | |||
3655 | #define DSI_FLUSH(dsidev, ch) \ | ||
3656 | if (__dsi_cb > 0) { \ | ||
3657 | /*DSSDBG("sending long packet %#010x\n", __dsi_cv);*/ \ | ||
3658 | dsi_write_reg(dsidev, DSI_VC_LONG_PACKET_PAYLOAD(ch), __dsi_cv); \ | ||
3659 | __dsi_cb = __dsi_cv = 0; \ | ||
3660 | } | ||
3661 | |||
3662 | #define DSI_PUSH(dsidev, ch, data) \ | ||
3663 | do { \ | ||
3664 | __dsi_cv |= (data) << (__dsi_cb * 8); \ | ||
3665 | /*DSSDBG("cv = %#010x, cb = %d\n", __dsi_cv, __dsi_cb);*/ \ | ||
3666 | if (++__dsi_cb > 3) \ | ||
3667 | DSI_FLUSH(dsidev, ch); \ | ||
3668 | } while (0) | ||
3669 | |||
3670 | static int dsi_update_screen_l4(struct omap_dss_device *dssdev, | ||
3671 | int x, int y, int w, int h) | ||
3672 | { | ||
3673 | /* Note: supports only 24bit colors in 32bit container */ | ||
3674 | struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev); | ||
3675 | struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev); | ||
3676 | int first = 1; | ||
3677 | int fifo_stalls = 0; | ||
3678 | int max_dsi_packet_size; | ||
3679 | int max_data_per_packet; | ||
3680 | int max_pixels_per_packet; | ||
3681 | int pixels_left; | ||
3682 | int bytespp = dssdev->ctrl.pixel_size / 8; | ||
3683 | int scr_width; | ||
3684 | u32 __iomem *data; | ||
3685 | int start_offset; | ||
3686 | int horiz_inc; | ||
3687 | int current_x; | ||
3688 | struct omap_overlay *ovl; | ||
3689 | |||
3690 | debug_irq = 0; | ||
3691 | |||
3692 | DSSDBG("dsi_update_screen_l4 (%d,%d %dx%d)\n", | ||
3693 | x, y, w, h); | ||
3694 | |||
3695 | ovl = dssdev->manager->overlays[0]; | ||
3696 | |||
3697 | if (ovl->info.color_mode != OMAP_DSS_COLOR_RGB24U) | ||
3698 | return -EINVAL; | ||
3699 | |||
3700 | if (dssdev->ctrl.pixel_size != 24) | ||
3701 | return -EINVAL; | ||
3702 | |||
3703 | scr_width = ovl->info.screen_width; | ||
3704 | data = ovl->info.vaddr; | ||
3705 | |||
3706 | start_offset = scr_width * y + x; | ||
3707 | horiz_inc = scr_width - w; | ||
3708 | current_x = x; | ||
3709 | |||
3710 | /* We need header(4) + DCSCMD(1) + pixels(numpix*bytespp) bytes | ||
3711 | * in fifo */ | ||
3712 | |||
3713 | /* When using CPU, max long packet size is TX buffer size */ | ||
3714 | max_dsi_packet_size = dsi->vc[0].fifo_size * 32 * 4; | ||
3715 | |||
3716 | /* we seem to get better perf if we divide the tx fifo to half, | ||
3717 | and while the other half is being sent, we fill the other half | ||
3718 | max_dsi_packet_size /= 2; */ | ||
3719 | |||
3720 | max_data_per_packet = max_dsi_packet_size - 4 - 1; | ||
3721 | |||
3722 | max_pixels_per_packet = max_data_per_packet / bytespp; | ||
3723 | |||
3724 | DSSDBG("max_pixels_per_packet %d\n", max_pixels_per_packet); | ||
3725 | |||
3726 | pixels_left = w * h; | ||
3727 | |||
3728 | DSSDBG("total pixels %d\n", pixels_left); | ||
3729 | |||
3730 | data += start_offset; | ||
3731 | |||
3732 | while (pixels_left > 0) { | ||
3733 | /* 0x2c = write_memory_start */ | ||
3734 | /* 0x3c = write_memory_continue */ | ||
3735 | u8 dcs_cmd = first ? 0x2c : 0x3c; | ||
3736 | int pixels; | ||
3737 | DSI_DECL_VARS; | ||
3738 | first = 0; | ||
3739 | |||
3740 | #if 1 | ||
3741 | /* using fifo not empty */ | ||
3742 | /* TX_FIFO_NOT_EMPTY */ | ||
3743 | while (FLD_GET(dsi_read_reg(dsidev, DSI_VC_CTRL(0)), 5, 5)) { | ||
3744 | fifo_stalls++; | ||
3745 | if (fifo_stalls > 0xfffff) { | ||
3746 | DSSERR("fifo stalls overflow, pixels left %d\n", | ||
3747 | pixels_left); | ||
3748 | dsi_if_enable(dsidev, 0); | ||
3749 | return -EIO; | ||
3750 | } | ||
3751 | udelay(1); | ||
3752 | } | ||
3753 | #elif 1 | ||
3754 | /* using fifo emptiness */ | ||
3755 | while ((REG_GET(dsidev, DSI_TX_FIFO_VC_EMPTINESS, 7, 0)+1)*4 < | ||
3756 | max_dsi_packet_size) { | ||
3757 | fifo_stalls++; | ||
3758 | if (fifo_stalls > 0xfffff) { | ||
3759 | DSSERR("fifo stalls overflow, pixels left %d\n", | ||
3760 | pixels_left); | ||
3761 | dsi_if_enable(dsidev, 0); | ||
3762 | return -EIO; | ||
3763 | } | ||
3764 | } | ||
3765 | #else | ||
3766 | while ((REG_GET(dsidev, DSI_TX_FIFO_VC_EMPTINESS, | ||
3767 | 7, 0) + 1) * 4 == 0) { | ||
3768 | fifo_stalls++; | ||
3769 | if (fifo_stalls > 0xfffff) { | ||
3770 | DSSERR("fifo stalls overflow, pixels left %d\n", | ||
3771 | pixels_left); | ||
3772 | dsi_if_enable(dsidev, 0); | ||
3773 | return -EIO; | ||
3774 | } | ||
3775 | } | ||
3776 | #endif | ||
3777 | pixels = min(max_pixels_per_packet, pixels_left); | ||
3778 | |||
3779 | pixels_left -= pixels; | ||
3780 | |||
3781 | dsi_vc_write_long_header(dsidev, 0, DSI_DT_DCS_LONG_WRITE, | ||
3782 | 1 + pixels * bytespp, 0); | ||
3783 | |||
3784 | DSI_PUSH(dsidev, 0, dcs_cmd); | ||
3785 | |||
3786 | while (pixels-- > 0) { | ||
3787 | u32 pix = __raw_readl(data++); | ||
3788 | |||
3789 | DSI_PUSH(dsidev, 0, (pix >> 16) & 0xff); | ||
3790 | DSI_PUSH(dsidev, 0, (pix >> 8) & 0xff); | ||
3791 | DSI_PUSH(dsidev, 0, (pix >> 0) & 0xff); | ||
3792 | |||
3793 | current_x++; | ||
3794 | if (current_x == x+w) { | ||
3795 | current_x = x; | ||
3796 | data += horiz_inc; | ||
3797 | } | ||
3798 | } | ||
3799 | |||
3800 | DSI_FLUSH(dsidev, 0); | ||
3801 | } | ||
3802 | |||
3803 | return 0; | ||
3804 | } | ||
3805 | |||
3806 | static void dsi_update_screen_dispc(struct omap_dss_device *dssdev, | 3651 | static void dsi_update_screen_dispc(struct omap_dss_device *dssdev, |
3807 | u16 x, u16 y, u16 w, u16 h) | 3652 | u16 x, u16 y, u16 w, u16 h) |
3808 | { | 3653 | { |
@@ -3970,11 +3815,9 @@ int omap_dsi_prepare_update(struct omap_dss_device *dssdev, | |||
3970 | 3815 | ||
3971 | dsi_perf_mark_setup(dsidev); | 3816 | dsi_perf_mark_setup(dsidev); |
3972 | 3817 | ||
3973 | if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) { | 3818 | dss_setup_partial_planes(dssdev, x, y, w, h, |
3974 | dss_setup_partial_planes(dssdev, x, y, w, h, | 3819 | enlarge_update_area); |
3975 | enlarge_update_area); | 3820 | dispc_set_lcd_size(dssdev->manager->id, *w, *h); |
3976 | dispc_set_lcd_size(dssdev->manager->id, *w, *h); | ||
3977 | } | ||
3978 | 3821 | ||
3979 | return 0; | 3822 | return 0; |
3980 | } | 3823 | } |
@@ -3996,27 +3839,16 @@ int omap_dsi_update(struct omap_dss_device *dssdev, | |||
3996 | * see rather obscure HW error happening, as DSS halts. */ | 3839 | * see rather obscure HW error happening, as DSS halts. */ |
3997 | BUG_ON(x % 2 == 1); | 3840 | BUG_ON(x % 2 == 1); |
3998 | 3841 | ||
3999 | if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) { | 3842 | dsi->framedone_callback = callback; |
4000 | dsi->framedone_callback = callback; | 3843 | dsi->framedone_data = data; |
4001 | dsi->framedone_data = data; | ||
4002 | |||
4003 | dsi->update_region.x = x; | ||
4004 | dsi->update_region.y = y; | ||
4005 | dsi->update_region.w = w; | ||
4006 | dsi->update_region.h = h; | ||
4007 | dsi->update_region.device = dssdev; | ||
4008 | |||
4009 | dsi_update_screen_dispc(dssdev, x, y, w, h); | ||
4010 | } else { | ||
4011 | int r; | ||
4012 | 3844 | ||
4013 | r = dsi_update_screen_l4(dssdev, x, y, w, h); | 3845 | dsi->update_region.x = x; |
4014 | if (r) | 3846 | dsi->update_region.y = y; |
4015 | return r; | 3847 | dsi->update_region.w = w; |
3848 | dsi->update_region.h = h; | ||
3849 | dsi->update_region.device = dssdev; | ||
4016 | 3850 | ||
4017 | dsi_perf_show(dsidev, "L4"); | 3851 | dsi_update_screen_dispc(dssdev, x, y, w, h); |
4018 | callback(0, data); | ||
4019 | } | ||
4020 | 3852 | ||
4021 | return 0; | 3853 | return 0; |
4022 | } | 3854 | } |