github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

video: rockchip: iep: compatible for did not config CONFIG_FB_ROCKCHIP

Browse Source 
if there not config CONFIG_FB_ROCKCHIP that will build error

Change-Id: Icaa837f3c0a539e98133b7cb9550700e8a46817f
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
This commit is contained in:
buluess.li 2017-06-27 11:29:40 +08:00 committed by Jianqun Xu
parent e00cd14512
commit 8f74840178
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/rockchip/iep/iep_drv.c
View File

@ -288,6 +288,7 @@ static void iep_power_off_work(struct work_struct *work)
}
}
#ifdef CONFIG_FB_ROCKCHIP
extern void rk_direct_fb_show(struct fb_info *fbi);
extern struct fb_info* rk_get_fb(int fb_id);
extern bool rk_fb_poll_wait_frame_complete(void);
@ -404,7 +405,6 @@ static int iep_switch_dpi(struct iep_reg *reg)
bool status;
rk_fb_dpi_open(false);
status = rk_fb_poll_wait_frame_complete();
iep_drvdata1->dpi_mode = false;
IEP_INFO("%s %d, iep dpi inactivated\n",
__func__, __LINE__);
@ -413,6 +413,7 @@ static int iep_switch_dpi(struct iep_reg *reg)
return 0;
}
#endif
static void iep_reg_copy_to_hw(struct iep_reg *reg)
{
@ -444,8 +445,9 @@ static void iep_switch_fields_order(void)
{
void *pbase = (void *)iep_drvdata1->iep_base;
int mode = iep_get_deinterlace_mode(pbase);
#ifdef CONFIG_FB_ROCKCHIP
struct fb_info *fb;
#endif
switch (mode) {
case dein_mode_I4O1B:
iep_set_deinterlace_mode(dein_mode_I4O1T, pbase);
@ -462,10 +464,10 @@ static void iep_switch_fields_order(void)
default:
;
}
#ifdef CONFIG_FB_ROCKCHIP
fb = rk_get_fb(1);
rk_direct_fb_show(fb);
#endif
/*iep_switch_input_address(pbase);*/
}
@ -507,9 +509,9 @@ static void iep_try_start_frm(void)
if (list_empty(&iep_service.running)) {
if (!list_empty(&iep_service.ready)) {
reg = list_entry(iep_service.ready.next, struct iep_reg, status_link);
#ifdef CONFIG_FB_ROCKCHIP
iep_switch_dpi(reg);
#endif
iep_reg_from_ready_to_running(reg);
iep_config_frame_end_int_en(iep_drvdata1->iep_base);
iep_config_done(iep_drvdata1->iep_base);

1
drivers/video/rockchip/iep/iep_iommu_ops.h
View File

@ -17,6 +17,7 @@
#define __IEP_IOMMU_OPS_H__
#include <linux/platform_device.h>
#include <linux/rockchip-iovmm.h>
#include "iep_drv.h"
#define BUFFER_LIST_MAX_NUMS 30