diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-09 14:10:22 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-09 15:13:11 -0400 |
commit | db2bec187dd68e79d512112df1f6e7a849e7f0ce (patch) | |
tree | 1a43c57fcea7915c837d5338d2bdf103259bc7be /drivers/gpu/drm/nouveau/dispnv04/arb.c | |
parent | fa2bade99a6fb24c3847d48ba3cad9a70dbb5364 (diff) |
drm/nouveau: kill nouveau_dev() + wrap register macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04/arb.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/arb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/arb.c b/drivers/gpu/drm/nouveau/dispnv04/arb.c index 2a15b98b4d2b..c64db854cc26 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/arb.c +++ b/drivers/gpu/drm/nouveau/dispnv04/arb.c | |||
@@ -198,12 +198,12 @@ nv04_update_arb(struct drm_device *dev, int VClk, int bpp, | |||
198 | int *burst, int *lwm) | 198 | int *burst, int *lwm) |
199 | { | 199 | { |
200 | struct nouveau_drm *drm = nouveau_drm(dev); | 200 | struct nouveau_drm *drm = nouveau_drm(dev); |
201 | struct nouveau_device *device = nouveau_dev(dev); | 201 | struct nouveau_object *device = nouveau_drm(dev)->device; |
202 | struct nv_fifo_info fifo_data; | 202 | struct nv_fifo_info fifo_data; |
203 | struct nv_sim_state sim_data; | 203 | struct nv_sim_state sim_data; |
204 | int MClk = nouveau_hw_get_clock(dev, PLL_MEMORY); | 204 | int MClk = nouveau_hw_get_clock(dev, PLL_MEMORY); |
205 | int NVClk = nouveau_hw_get_clock(dev, PLL_CORE); | 205 | int NVClk = nouveau_hw_get_clock(dev, PLL_CORE); |
206 | uint32_t cfg1 = nv_rd32(device, NV04_PFB_CFG1); | 206 | uint32_t cfg1 = nvif_rd32(device, NV04_PFB_CFG1); |
207 | 207 | ||
208 | sim_data.pclk_khz = VClk; | 208 | sim_data.pclk_khz = VClk; |
209 | sim_data.mclk_khz = MClk; | 209 | sim_data.mclk_khz = MClk; |
@@ -221,8 +221,8 @@ nv04_update_arb(struct drm_device *dev, int VClk, int bpp, | |||
221 | sim_data.mem_latency = 3; | 221 | sim_data.mem_latency = 3; |
222 | sim_data.mem_page_miss = 10; | 222 | sim_data.mem_page_miss = 10; |
223 | } else { | 223 | } else { |
224 | sim_data.memory_type = nv_rd32(device, NV04_PFB_CFG0) & 0x1; | 224 | sim_data.memory_type = nvif_rd32(device, NV04_PFB_CFG0) & 0x1; |
225 | sim_data.memory_width = (nv_rd32(device, NV_PEXTDEV_BOOT_0) & 0x10) ? 128 : 64; | 225 | sim_data.memory_width = (nvif_rd32(device, NV_PEXTDEV_BOOT_0) & 0x10) ? 128 : 64; |
226 | sim_data.mem_latency = cfg1 & 0xf; | 226 | sim_data.mem_latency = cfg1 & 0xf; |
227 | sim_data.mem_page_miss = ((cfg1 >> 4) & 0xf) + ((cfg1 >> 31) & 0x1); | 227 | sim_data.mem_page_miss = ((cfg1 >> 4) & 0xf) + ((cfg1 >> 31) & 0x1); |
228 | } | 228 | } |