diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2015-12-11 17:31:10 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2016-01-15 14:32:53 +0900 |
| commit | d62979800094813943f467bb157cd0b74feefed1 (patch) | |
| tree | c5e3ba5d832c3d4969d69649237bbb92be5174c3 | |
| parent | eb87d86fd2c1395485d5cea93fe6159146fd1d9b (diff) | |
| download | nouveau-d62979800094813943f467bb157cd0b74feefed1.tar.gz | |
tegra: compile fixes
| -rw-r--r-- | drm/nouveau/nouveau_display.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nouveau_drm.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drm/nouveau/nouveau_display.c b/drm/nouveau/nouveau_display.c index 24be27d3c..0ab2663ef 100644 --- a/drm/nouveau/nouveau_display.c +++ b/drm/nouveau/nouveau_display.c @@ -154,6 +154,7 @@ int nouveau_display_vblstamp(struct drm_device *dev, unsigned int pipe, int *max_error, struct timeval *time, unsigned flags) { +#ifndef CONFIG_ARCH_TEGRA struct drm_crtc *crtc; list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { @@ -163,6 +164,7 @@ nouveau_display_vblstamp(struct drm_device *dev, unsigned int pipe, &crtc->hwmode); } } +#endif return -EINVAL; } diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c index 2f2f252e3..c75b662c1 100644 --- a/drm/nouveau/nouveau_drm.c +++ b/drm/nouveau/nouveau_drm.c @@ -939,7 +939,9 @@ driver_stub = { .get_vblank_counter = drm_vblank_no_hw_counter, .enable_vblank = nouveau_display_vblank_enable, .disable_vblank = nouveau_display_vblank_disable, +#ifndef CONFIG_ARCH_TEGRA .get_scanout_position = nouveau_display_scanoutpos, +#endif .get_vblank_timestamp = nouveau_display_vblstamp, .ioctls = nouveau_ioctls, |