drivers/video: Merge s3ve3g changes