Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/arch/arm/mach-exynos/sec_debug.c b/arch/arm/mach-exynos/sec_debug.c
- index 78e2b4a..a612965 100644
- --- a/arch/arm/mach-exynos/sec_debug.c
- +++ b/arch/arm/mach-exynos/sec_debug.c
- @@ -723,7 +723,7 @@ void sec_debug_check_crash_key(unsigned int code, int value)
- __func__, ++loopcount);
- if (loopcount == 2) {
- #ifdef CONFIG_FB_S5P
- - read_lcd_register();
- + //read_lcd_register();
- #endif
- #ifdef CONFIG_SEC_DEBUG_FUPLOAD_DUMP_MORE
- dump_state_and_upload();
- diff --git a/drivers/media/video/samsung/fimc/fimc_dev_u1.c b/drivers/media/video/samsung/fimc/fimc_dev_u1.c
- index 52246a1..11765b2 100644
- --- a/drivers/media/video/samsung/fimc/fimc_dev_u1.c
- +++ b/drivers/media/video/samsung/fimc/fimc_dev_u1.c
- @@ -1153,8 +1153,8 @@ static int fimc_open(struct file *filp)
- /* Apply things to interface register */
- fimc_hwset_reset(ctrl);
- #endif
- - ctrl->fb.open_fifo = s3cfb_open_fifo;
- - ctrl->fb.close_fifo = s3cfb_close_fifo;
- + //ctrl->fb.open_fifo = s3cfb_open_fifo;
- + //ctrl->fb.close_fifo = s3cfb_close_fifo;
- ret = s3cfb_direct_ioctl(ctrl->id, S3CFB_GET_LCD_WIDTH,
- (unsigned long)&ctrl->fb.lcd_hres);
- diff --git a/drivers/video/samsung/Makefile b/drivers/video/samsung/Makefile
- index 085cefe..6665bb8 100644
- --- a/drivers/video/samsung/Makefile
- +++ b/drivers/video/samsung/Makefile
- @@ -2,10 +2,12 @@
- # Makefile for the s3c framebuffer driver
- #
- ifeq ($(CONFIG_FB_S5P),y)
- +ifeq ($(CONFIG_FB_S5P),NOPE)
- obj-y += s3cfb.o
- s3cfb-y := s3cfb_main.o s3cfb_ops.o lcdfreq.o
- obj-$(CONFIG_ARCH_S5PV210) += s3cfb_fimd6x.o
- obj-$(CONFIG_ARCH_EXYNOS4) += s3cfb_fimd6x.o
- +endif
- obj-$(CONFIG_FB_S5P_S6C1372) += s3cfb_s6c1372.o
- obj-$(CONFIG_FB_S5P_S6F1202A) += s3cfb_s6c1372.o
- diff --git a/drivers/video/samsung/s3cfb_s6e8aa0.c b/drivers/video/samsung/s3cfb_s6e8aa0.c
- index 4be6ee2..14c84a3 100644
- --- a/drivers/video/samsung/s3cfb_s6e8aa0.c
- +++ b/drivers/video/samsung/s3cfb_s6e8aa0.c
- @@ -189,8 +189,8 @@ static unsigned int elvss_offset_table[ELVSS_STATUS_MAX] = {
- };
- #endif
- -extern void (*lcd_early_suspend)(void);
- -extern void (*lcd_late_resume)(void);
- +//extern void (*lcd_early_suspend)(void);
- +//extern void (*lcd_late_resume)(void);
- #if defined(GPIO_OLED_DET)
- static void oled_detection_work(struct work_struct *work)
- @@ -1541,8 +1541,8 @@ static int s6e8ax0_probe(struct device *dev)
- }
- #endif
- - lcd_early_suspend = s6e8ax0_early_suspend;
- - lcd_late_resume = s6e8ax0_late_resume;
- + //lcd_early_suspend = s6e8ax0_early_suspend;
- + //lcd_late_resume = s6e8ax0_late_resume;
- return 0;
- @@ -1598,6 +1598,12 @@ static void s6e8ax0_exit(void)
- return;
- }
- +int s3cfb_direct_ioctl(int id, unsigned int cmd, unsigned long arg)
- +{
- + return -1;
- +}
- +EXPORT_SYMBOL(s3cfb_direct_ioctl);
- +
- module_init(s6e8ax0_init);
- module_exit(s6e8ax0_exit);
- diff --git a/drivers/video/samsung/s5p-dsim.c b/drivers/video/samsung/s5p-dsim.c
- index 61cefab..a62e8c7 100644
- --- a/drivers/video/samsung/s5p-dsim.c
- +++ b/drivers/video/samsung/s5p-dsim.c
- @@ -577,7 +577,7 @@ static irqreturn_t s5p_dsim_isr(int irq, void *dev_id)
- /* printk("S5P_DSIM_INT_MSK_FRAME_DONE\n"); */
- if (dsim->dsim_lcd_info->lcd_enabled && dsim->mipi_ddi_pd->resume_complete) {
- if (completion_done(&dsim_wr_comp) && completion_done(&dsim_rd_comp)) {
- - if (s3cfb_vsync_status_check()) {
- + //if (s3cfb_vsync_status_check()) {
- s5p_dsim_toggle_hs_clock(dsim->reg_base);
- if (!dsim->dsim_toggle_per_frame_count) {
- s5p_dsim_frame_done_interrupt_enable(dsim, 0);
- @@ -586,7 +586,7 @@ static irqreturn_t s5p_dsim_isr(int irq, void *dev_id)
- }
- if (dsim->dsim_toggle_per_frame_count)
- dsim->dsim_toggle_per_frame_count--;
- - }
- + //}
- }
- }
- break;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement