diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2015-09-24 11:52:24 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2015-10-13 14:44:35 +0900 |
| commit | 0e8f081d9ae03a17e3c9a276d896cd8a7e64ec95 (patch) | |
| tree | 9faf6c3134f8eb7b81c9fb0bb6f049ae5c743299 | |
| parent | 392c5d11201ac38737602ab5c5bc448268b02557 (diff) | |
| download | nouveau-0e8f081d9ae03a17e3c9a276d896cd8a7e64ec95.tar.gz | |
Compile fixes
| -rw-r--r-- | drm/nouveau/dispnv04/tvnv17.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nouveau_display.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nouveau_drm.c | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/drm/nouveau/dispnv04/tvnv17.c b/drm/nouveau/dispnv04/tvnv17.c index b734195d8..403095f98 100644 --- a/drm/nouveau/dispnv04/tvnv17.c +++ b/drm/nouveau/dispnv04/tvnv17.c @@ -656,7 +656,7 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder, nouveau_tv_norm); } - drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); + //drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); drm_object_attach_property(&connector->base, conf->tv_select_subconnector_property, diff --git a/drm/nouveau/nouveau_display.c b/drm/nouveau/nouveau_display.c index d3d6438ea..7ab14a2d1 100644 --- a/drm/nouveau/nouveau_display.c +++ b/drm/nouveau/nouveau_display.c @@ -154,9 +154,11 @@ nouveau_display_vblstamp(struct drm_device *dev, int head, int *max_error, list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { if (nouveau_crtc(crtc)->index == head) { + /* return drm_calc_vbltimestamp_from_scanoutpos(dev, head, max_error, time, flags, crtc, &crtc->hwmode); + */ } } diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c index bdcc9b9fb..3a46f1c49 100644 --- a/drm/nouveau/nouveau_drm.c +++ b/drm/nouveau/nouveau_drm.c @@ -933,10 +933,10 @@ driver_stub = { #endif .get_vblank_counter = drm_vblank_count, - .enable_vblank = nouveau_display_vblank_enable, - .disable_vblank = nouveau_display_vblank_disable, - .get_scanout_position = nouveau_display_scanoutpos, - .get_vblank_timestamp = nouveau_display_vblstamp, + //.enable_vblank = nouveau_display_vblank_enable, + //.disable_vblank = nouveau_display_vblank_disable, + //.get_scanout_position = nouveau_display_scanoutpos, + //.get_vblank_timestamp = nouveau_display_vblstamp, .ioctls = nouveau_ioctls, .num_ioctls = ARRAY_SIZE(nouveau_ioctls), |