diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:29 +1000 |
| commit | 2aa5eac5163fedf09f2d61992cb5ea4d75bec9db (patch) | |
| tree | 64bd7231349c928341892f4141d85e3397400d0a /drivers/gpu/drm/nouveau/dispnv04/disp.c | |
| parent | d36a99d2da22bdffebf644e4a5f811e8eff82360 (diff) | |
| download | op-kernel-dev-2aa5eac5163fedf09f2d61992cb5ea4d75bec9db.zip op-kernel-dev-2aa5eac5163fedf09f2d61992cb5ea4d75bec9db.tar.gz | |
drm/nouveau/i2c: transition pad/ports away from being based on nvkm_object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv04/disp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv04/disp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c index 4131be55..018a448 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c @@ -101,7 +101,9 @@ nv04_display_create(struct drm_device *dev) list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); - nv_encoder->i2c = i2c->find(i2c, nv_encoder->dcb->i2c_index); + struct nvkm_i2c_bus *bus = + nvkm_i2c_bus_find(i2c, nv_encoder->dcb->i2c_index); + nv_encoder->i2c = bus ? &bus->i2c : NULL; } /* Save previous state */ |
