diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-12 05:33:37 +0300 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 05:17:49 +0300 |
commit | 989aa5b76ad2af7653353cf01bdebec2ba9436aa (patch) | |
tree | 1101d4d85c6034c902f5956877f268dff1a144c9 /drivers/gpu/drm/nouveau/dispnv04/crtc.c | |
parent | c4345146dbee38d949efd3a7b96d1bea962a29f2 (diff) | |
download | linux-989aa5b76ad2af7653353cf01bdebec2ba9436aa.tar.xz |
drm/nouveau/nvif: namespace of nvkm accessors (no binary change)
NVKM is having it's namespace switched to nvkm_, which will conflict
with these functions (which are workarounds for the fact that as of
yet, we still aren't able to split DRM and NVKM completely).
A comparison of objdump disassemblies proves no code changes.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04/crtc.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/crtc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c index f8ddae26dfbf..f32eecbe3c95 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c @@ -112,8 +112,8 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod { struct drm_device *dev = crtc->dev; struct nouveau_drm *drm = nouveau_drm(dev); - struct nouveau_bios *bios = nvkm_bios(&drm->device); - struct nouveau_clk *clk = nvkm_clk(&drm->device); + struct nouveau_bios *bios = nvxx_bios(&drm->device); + struct nouveau_clk *clk = nvxx_clk(&drm->device); struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); struct nv04_mode_state *state = &nv04_display(dev)->mode_reg; struct nv04_crtc_reg *regp = &state->crtc_reg[nv_crtc->index]; |