diff options
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_drv.c')
-rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 61e674baf3a6..863974942c66 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c | |||
@@ -154,7 +154,7 @@ static struct drm_driver vc4_drm_driver = { | |||
154 | .irq_uninstall = vc4_irq_uninstall, | 154 | .irq_uninstall = vc4_irq_uninstall, |
155 | 155 | ||
156 | .get_scanout_position = vc4_crtc_get_scanoutpos, | 156 | .get_scanout_position = vc4_crtc_get_scanoutpos, |
157 | .get_vblank_timestamp = vc4_crtc_get_vblank_timestamp, | 157 | .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos, |
158 | 158 | ||
159 | #if defined(CONFIG_DEBUG_FS) | 159 | #if defined(CONFIG_DEBUG_FS) |
160 | .debugfs_init = vc4_debugfs_init, | 160 | .debugfs_init = vc4_debugfs_init, |
@@ -168,8 +168,9 @@ static struct drm_driver vc4_drm_driver = { | |||
168 | .prime_fd_to_handle = drm_gem_prime_fd_to_handle, | 168 | .prime_fd_to_handle = drm_gem_prime_fd_to_handle, |
169 | .gem_prime_import = drm_gem_prime_import, | 169 | .gem_prime_import = drm_gem_prime_import, |
170 | .gem_prime_export = vc4_prime_export, | 170 | .gem_prime_export = vc4_prime_export, |
171 | .gem_prime_res_obj = vc4_prime_res_obj, | ||
171 | .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, | 172 | .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, |
172 | .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, | 173 | .gem_prime_import_sg_table = vc4_prime_import_sg_table, |
173 | .gem_prime_vmap = vc4_prime_vmap, | 174 | .gem_prime_vmap = vc4_prime_vmap, |
174 | .gem_prime_vunmap = drm_gem_cma_prime_vunmap, | 175 | .gem_prime_vunmap = drm_gem_cma_prime_vunmap, |
175 | .gem_prime_mmap = vc4_prime_mmap, | 176 | .gem_prime_mmap = vc4_prime_mmap, |
@@ -334,6 +335,7 @@ static int vc4_platform_drm_remove(struct platform_device *pdev) | |||
334 | 335 | ||
335 | static const struct of_device_id vc4_of_match[] = { | 336 | static const struct of_device_id vc4_of_match[] = { |
336 | { .compatible = "brcm,bcm2835-vc4", }, | 337 | { .compatible = "brcm,bcm2835-vc4", }, |
338 | { .compatible = "brcm,cygnus-vc4", }, | ||
337 | {}, | 339 | {}, |
338 | }; | 340 | }; |
339 | MODULE_DEVICE_TABLE(of, vc4_of_match); | 341 | MODULE_DEVICE_TABLE(of, vc4_of_match); |