diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvd0_display.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvd0_display.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c index 8d9fc00718f0..715359ef9211 100644 --- a/drivers/gpu/drm/nouveau/nvd0_display.c +++ b/drivers/gpu/drm/nouveau/nvd0_display.c | |||
@@ -1903,7 +1903,7 @@ nvd0_display_init(struct drm_device *dev) | |||
1903 | } | 1903 | } |
1904 | 1904 | ||
1905 | /* point at our hash table / objects, enable interrupts */ | 1905 | /* point at our hash table / objects, enable interrupts */ |
1906 | nv_wr32(dev, 0x610010, (disp->mem->vinst >> 8) | 9); | 1906 | nv_wr32(dev, 0x610010, (disp->mem->addr >> 8) | 9); |
1907 | nv_mask(dev, 0x6100b0, 0x00000307, 0x00000307); | 1907 | nv_mask(dev, 0x6100b0, 0x00000307, 0x00000307); |
1908 | 1908 | ||
1909 | /* init master */ | 1909 | /* init master */ |
@@ -1967,7 +1967,6 @@ int | |||
1967 | nvd0_display_create(struct drm_device *dev) | 1967 | nvd0_display_create(struct drm_device *dev) |
1968 | { | 1968 | { |
1969 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 1969 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
1970 | struct nouveau_instmem_engine *pinstmem = &dev_priv->engine.instmem; | ||
1971 | struct dcb_table *dcb = &dev_priv->vbios.dcb; | 1970 | struct dcb_table *dcb = &dev_priv->vbios.dcb; |
1972 | struct drm_connector *connector, *tmp; | 1971 | struct drm_connector *connector, *tmp; |
1973 | struct pci_dev *pdev = dev->pdev; | 1972 | struct pci_dev *pdev = dev->pdev; |
@@ -2106,7 +2105,7 @@ nvd0_display_create(struct drm_device *dev) | |||
2106 | ((dmao + 0x60) << 9)); | 2105 | ((dmao + 0x60) << 9)); |
2107 | } | 2106 | } |
2108 | 2107 | ||
2109 | pinstmem->flush(dev); | 2108 | nvimem_flush(dev); |
2110 | 2109 | ||
2111 | out: | 2110 | out: |
2112 | if (ret) | 2111 | if (ret) |