| author | Shuide Chen <shuide.chen@amlogic.com> | 2018-08-14 07:27:57 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-08-14 07:27:57 (GMT) |
| commit | 01b400cc092011ee921270f1742fca41bb7d9bba (patch) | |
| tree | e843627f73bdf477985718beb79a07ee7429f6f8 | |
| parent | f192c116e6d97cc6f5720df6af351ef93efeb2f8 (diff) | |
| parent | 2e2bb63e8dfef17fc5d2c751a263cae81eaca016 (diff) | |
| download | common-01b400cc092011ee921270f1742fca41bb7d9bba.zip common-01b400cc092011ee921270f1742fca41bb7d9bba.tar.gz common-01b400cc092011ee921270f1742fca41bb7d9bba.tar.bz2 | |
Merge "osd: wait for vsync no need lock [1/1]" into p-amlogic
| -rw-r--r-- | drivers/amlogic/media/osd/osd_fb.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/amlogic/media/osd/osd_fb.c b/drivers/amlogic/media/osd/osd_fb.c index 7fed76a..2e2cf92 100644 --- a/drivers/amlogic/media/osd/osd_fb.c +++ b/drivers/amlogic/media/osd/osd_fb.c @@ -758,7 +758,13 @@ static int osd_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) sizeof(struct fb_sync_request_s)); break; case FBIO_WAITFORVSYNC: + vsync_timestamp = (s32)osd_wait_vsync_event(); + ret = copy_to_user(argp, &vsync_timestamp, sizeof(s32)); + break; case FBIO_WAITFORVSYNC_64: + vsync_timestamp_64 = osd_wait_vsync_event(); + ret = copy_to_user(argp, &vsync_timestamp_64, sizeof(s64)); + break; case FBIOGET_OSD_SCALE_AXIS: case FBIOPUT_OSD_ORDER: case FBIOGET_OSD_ORDER: @@ -1039,15 +1045,6 @@ static int osd_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) ? -EFAULT : 0; break; #endif - - case FBIO_WAITFORVSYNC: - vsync_timestamp = (s32)osd_wait_vsync_event(); - ret = copy_to_user(argp, &vsync_timestamp, sizeof(s32)); - break; - case FBIO_WAITFORVSYNC_64: - vsync_timestamp_64 = osd_wait_vsync_event(); - ret = copy_to_user(argp, &vsync_timestamp_64, sizeof(s64)); - break; case FBIOPUT_OSD_CURSOR: #ifdef CONFIG_AMLOGIC_MEDIA_FB_OSD2_CURSOR osd_cursor(info, &cursor); |