diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-18 02:00:50 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 05:12:53 +0200 |
| commit | 017e6e2955a8b290653aa71bd321609d0d4b1486 (patch) | |
| tree | c891b865843f0d11437a7acb17063ea028239179 /drivers/gpu/drm/nouveau/nv17_tv.c | |
| parent | drm/nouveau/instmem: completely new implementation, as a subdev module (diff) | |
| download | linux-017e6e2955a8b290653aa71bd321609d0d4b1486.tar.xz linux-017e6e2955a8b290653aa71bd321609d0d4b1486.zip | |
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.c | 4 |
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) 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 = &dev_priv->mode_reg.crtc_reg[head].CRTC[ + uint8_t *cr_lcd = &nv04_display(dev)->mode_reg.crtc_reg[head].CRTC[ NV_CIO_CRE_LCD__INDEX]; uint32_t dacclk_off = NV_PRAMDAC_DACCLK + nv04_dac_output_offset(encoder); @@ -456,7 +456,7 @@ static void nv17_tv_mode_set(struct drm_encoder *encoder, struct drm_device *dev = encoder->dev; struct drm_nouveau_private *dev_priv = dev->dev_private; int head = nouveau_crtc(encoder->crtc)->index; - struct nv04_crtc_reg *regs = &dev_priv->mode_reg.crtc_reg[head]; + struct nv04_crtc_reg *regs = &nv04_display(dev)->mode_reg.crtc_reg[head]; struct nv17_tv_state *tv_regs = &to_tv_enc(encoder)->state; struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder); int i; |