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/dispnv04/tvnv04.c | |
| parent | c4345146dbee38d949efd3a7b96d1bea962a29f2 (diff) | |
| download | linux-989aa5b76ad2af7653353cf01bdebec2ba9436aa.tar.gz linux-989aa5b76ad2af7653353cf01bdebec2ba9436aa.tar.bz2 linux-989aa5b76ad2af7653353cf01bdebec2ba9436aa.zip | |
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/tvnv04.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c index 8061d8d0ce79..38a8196d1e92 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c @@ -54,7 +54,7 @@ static struct nouveau_i2c_board_info nv04_tv_encoder_info[] = { int nv04_tv_identify(struct drm_device *dev, int i2c_index) { struct nouveau_drm *drm = nouveau_drm(dev); - struct nouveau_i2c *i2c = nvkm_i2c(&drm->device); + struct nouveau_i2c *i2c = nvxx_i2c(&drm->device); return i2c->identify(i2c, i2c_index, "TV encoder", nv04_tv_encoder_info, NULL, NULL); @@ -204,7 +204,7 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry) struct drm_encoder *encoder; struct drm_device *dev = connector->dev; struct nouveau_drm *drm = nouveau_drm(dev); - struct nouveau_i2c *i2c = nvkm_i2c(&drm->device); + struct nouveau_i2c *i2c = nvxx_i2c(&drm->device); struct nouveau_i2c_port *port = i2c->find(i2c, entry->i2c_index); int type, ret; |