Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix OdroidC1 fbdev vsync and panning #97

Merged
merged 2 commits into from
Apr 22, 2015
Merged

Fix OdroidC1 fbdev vsync and panning #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0164586
Add support for FBIO_WAITFORVSYNC ioctl
OtherCrashOverride Apr 7, 2015
a9f09e0
Fix FBIOPAN_DISPLAY ioctl
OtherCrashOverride Apr 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/amlogic/display/osd/osd_hw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,8 +1484,9 @@ void osd_pan_display_hw(unsigned int xoffset, unsigned int yoffset,int index )
osd_hw.pandata[index].x_end += diff_x;
osd_hw.pandata[index].y_start += diff_y;
osd_hw.pandata[index].y_end += diff_y;
#if 0

add_to_update_list(index,DISP_GEOMETRY);
#if 0

#ifdef CONFIG_AM_FB_EXT
osd_ext_clone_pan(index);
Expand Down
13 changes: 13 additions & 0 deletions drivers/amlogic/display/osd/osd_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@
#include <linux/amlogic/logo/logo_dev_osd.h>
#ifdef CONFIG_HAS_EARLYSUSPEND
#include <linux/earlysuspend.h>

// This is not in osd_hw.h private or public header
void osd_wait_vsync_hw(void);


static struct early_suspend early_suspend;
static int early_suspend_flag = 0;
#endif
Expand Down Expand Up @@ -381,6 +386,14 @@ osd_ioctl(struct fb_info *info, unsigned int cmd,
ret = osddev_copy_data_tocursor(fbdev, &para);
}
break;

case FBIO_WAITFORVSYNC:
{
osd_wait_vsync_hw();
ret = 0;
}
break;

default :
amlog_mask_level(LOG_MASK_IOCTL,LOG_LEVEL_HIGH,"command not supported\r\n ");
return -1;
Expand Down