aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv17_tv.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-07-17 20:00:50 -0400
committerBen Skeggs <bskeggs@redhat.com>2012-10-02 23:12:53 -0400
commit017e6e2955a8b290653aa71bd321609d0d4b1486 (patch)
treec891b865843f0d11437a7acb17063ea028239179 /drivers/gpu/drm/nouveau/nv17_tv.c
parent3863c9bc887e9638a9d905d55f6038641ece78d6 (diff)
drm/nv04/disp: kick all private state out to own header
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv17_tv.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv17_tv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 54ff394e005b..5d1f6f6de257 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -395,7 +395,7 @@ static void nv17_tv_prepare(struct drm_encoder *encoder)
395 struct drm_encoder_helper_funcs *helper = encoder->helper_private; 395 struct drm_encoder_helper_funcs *helper = encoder->helper_private;
396 struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder); 396 struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);
397 int head = nouveau_crtc(encoder->crtc)->index; 397 int head = nouveau_crtc(encoder->crtc)->index;
398 uint8_t *cr_lcd = &dev_priv->mode_reg.crtc_reg[head].CRTC[ 398 uint8_t *cr_lcd = &nv04_display(dev)->mode_reg.crtc_reg[head].CRTC[
399 NV_CIO_CRE_LCD__INDEX]; 399 NV_CIO_CRE_LCD__INDEX];
400 uint32_t dacclk_off = NV_PRAMDAC_DACCLK + 400 uint32_t dacclk_off = NV_PRAMDAC_DACCLK +
401 nv04_dac_output_offset(encoder); 401 nv04_dac_output_offset(encoder);
@@ -456,7 +456,7 @@ static void nv17_tv_mode_set(struct drm_encoder *encoder,
456 struct drm_device *dev = encoder->dev; 456 struct drm_device *dev = encoder->dev;
457 struct drm_nouveau_private *dev_priv = dev->dev_private; 457 struct drm_nouveau_private *dev_priv = dev->dev_private;
458 int head = nouveau_crtc(encoder->crtc)->index; 458 int head = nouveau_crtc(encoder->crtc)->index;
459 struct nv04_crtc_reg *regs = &dev_priv->mode_reg.crtc_reg[head]; 459 struct nv04_crtc_reg *regs = &nv04_display(dev)->mode_reg.crtc_reg[head];
460 struct nv17_tv_state *tv_regs = &to_tv_enc(encoder)->state; 460 struct nv17_tv_state *tv_regs = &to_tv_enc(encoder)->state;
461 struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder); 461 struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);
462 int i; 462 int i;