summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-05-18 13:57:42 +1000
committerBen Skeggs <bskeggs@redhat.com>2017-02-17 15:15:04 +1000
commit1167c6bc51880cb74a3b1a02286fc25392684281 (patch)
treeab703a0c452e5123806a2e1269455a6bdde939e0 /drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
parent80e60973b2494a0c51b2c84847f3faeffed595f0 (diff)
downloadop-kernel-dev-1167c6bc51880cb74a3b1a02286fc25392684281.zip
op-kernel-dev-1167c6bc51880cb74a3b1a02286fc25392684281.tar.gz
drm/nouveau: allocate device object for every client
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.c4
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 477a8d0..0166435 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -54,7 +54,7 @@ static struct nvkm_i2c_bus_probe nv04_tv_encoder_info[] = {
int nv04_tv_identify(struct drm_device *dev, int i2c_index)
{
struct nouveau_drm *drm = nouveau_drm(dev);
- struct nvkm_i2c *i2c = nvxx_i2c(&drm->device);
+ struct nvkm_i2c *i2c = nvxx_i2c(&drm->client.device);
struct nvkm_i2c_bus *bus = nvkm_i2c_bus_find(i2c, i2c_index);
if (bus) {
return nvkm_i2c_bus_probe(bus, "TV encoder",
@@ -206,7 +206,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 nvkm_i2c *i2c = nvxx_i2c(&drm->device);
+ struct nvkm_i2c *i2c = nvxx_i2c(&drm->client.device);
struct nvkm_i2c_bus *bus = nvkm_i2c_bus_find(i2c, entry->i2c_index);
int type, ret;
OpenPOWER on IntegriCloud