diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-05-29 10:54:14 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-05-29 10:54:14 +1000 |
commit | 5fe975de6f6910186193f2a81464eaa4f9759ea5 (patch) | |
tree | ef6424907909077a921573ab7a943badf74ba485 /drm/nouveau/dispnv04/tvnv17.c | |
parent | 27f7c447213f8e7ed29f1f9183729077b835abd7 (diff) | |
download | nouveau-5fe975de6f6910186193f2a81464eaa4f9759ea5.tar.gz |
v4.1-rc5
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/dispnv04/tvnv17.c')
-rw-r--r-- | drm/nouveau/dispnv04/tvnv17.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/nouveau/dispnv04/tvnv17.c b/drm/nouveau/dispnv04/tvnv17.c index 731d74efc..d9720dda8 100644 --- a/drm/nouveau/dispnv04/tvnv17.c +++ b/drm/nouveau/dispnv04/tvnv17.c @@ -405,7 +405,7 @@ static void nv17_tv_prepare(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev; struct nouveau_drm *drm = nouveau_drm(dev); - struct drm_encoder_helper_funcs *helper = encoder->helper_private; + const struct drm_encoder_helper_funcs *helper = encoder->helper_private; struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder); int head = nouveau_crtc(encoder->crtc)->index; uint8_t *cr_lcd = &nv04_display(dev)->mode_reg.crtc_reg[head].CRTC[ @@ -583,7 +583,7 @@ static void nv17_tv_commit(struct drm_encoder *encoder) struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc); struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); - struct drm_encoder_helper_funcs *helper = encoder->helper_private; + const struct drm_encoder_helper_funcs *helper = encoder->helper_private; if (get_tv_norm(encoder)->kind == TV_ENC_MODE) { nv17_tv_update_rescaler(encoder); |