diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-12 12:33:37 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 12:17:49 +1000 |
commit | 989aa5b76ad2af7653353cf01bdebec2ba9436aa (patch) | |
tree | 1101d4d85c6034c902f5956877f268dff1a144c9 /drivers/gpu/drm/nouveau/nouveau_agp.c | |
parent | c4345146dbee38d949efd3a7b96d1bea962a29f2 (diff) | |
download | op-kernel-dev-989aa5b76ad2af7653353cf01bdebec2ba9436aa.zip op-kernel-dev-989aa5b76ad2af7653353cf01bdebec2ba9436aa.tar.gz |
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/nouveau_agp.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_agp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_agp.c b/drivers/gpu/drm/nouveau/nouveau_agp.c index 1f6f6ba..0b59709 100644 --- a/drivers/gpu/drm/nouveau/nouveau_agp.c +++ b/drivers/gpu/drm/nouveau/nouveau_agp.c @@ -45,8 +45,8 @@ get_agp_mode(struct nouveau_drm *drm, const struct drm_agp_info *info) while (agpmode == -1 && quirk->hostbridge_vendor) { if (info->id_vendor == quirk->hostbridge_vendor && info->id_device == quirk->hostbridge_device && - nvkm_device(device)->pdev->vendor == quirk->chip_vendor && - nvkm_device(device)->pdev->device == quirk->chip_device) { + nvxx_device(device)->pdev->vendor == quirk->chip_vendor && + nvxx_device(device)->pdev->device == quirk->chip_device) { agpmode = quirk->mode; NV_INFO(drm, "Forcing agp mode to %dX. Use agpmode to override.\n", agpmode); |