diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-17 20:00:50 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-02 23:12:53 -0400 |
commit | 017e6e2955a8b290653aa71bd321609d0d4b1486 (patch) | |
tree | c891b865843f0d11437a7acb17063ea028239179 /drivers/gpu/drm/nouveau/nouveau_hw.h | |
parent | 3863c9bc887e9638a9d905d55f6038641ece78d6 (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/nouveau_hw.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_hw.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.h b/drivers/gpu/drm/nouveau/nouveau_hw.h index 24c459213613..feb2a2f7bd42 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hw.h +++ b/drivers/gpu/drm/nouveau/nouveau_hw.h | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | #include "drmP.h" | 26 | #include "drmP.h" |
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nv04_display.h" | ||
28 | 29 | ||
29 | #include <subdev/bios/pll.h> | 30 | #include <subdev/bios/pll.h> |
30 | 31 | ||
@@ -437,7 +438,7 @@ nv_show_cursor(struct drm_device *dev, int head, bool show) | |||
437 | { | 438 | { |
438 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 439 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
439 | uint8_t *curctl1 = | 440 | uint8_t *curctl1 = |
440 | &dev_priv->mode_reg.crtc_reg[head].CRTC[NV_CIO_CRE_HCUR_ADDR1_INDEX]; | 441 | &nv04_display(dev)->mode_reg.crtc_reg[head].CRTC[NV_CIO_CRE_HCUR_ADDR1_INDEX]; |
441 | 442 | ||
442 | if (show) | 443 | if (show) |
443 | *curctl1 |= MASK(NV_CIO_CRE_HCUR_ADDR1_ENABLE); | 444 | *curctl1 |= MASK(NV_CIO_CRE_HCUR_ADDR1_ENABLE); |