drm/nouveau/disp: outp/conns do not have an engine

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/base.c b/drivers/gpu/drm/nouveau/core/engine/disp/base.c
index 64b84667f3a5e9ebbf9f57ae2b1c6c4f76997d5f..c8a5f810e537a9dcc4a42d5d6cdc99b240fc8e5f 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/base.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/base.c
@@ -225,8 +225,7 @@ nouveau_disp_create_(struct nouveau_object *parent,
                        sclass++;
                }
 
-               nouveau_object_ctor(*pobject, *pobject, oclass,
-                                   &dcbE, i, &object);
+               nouveau_object_ctor(*pobject, NULL, oclass, &dcbE, i, &object);
                hpd = max(hpd, (u8)(dcbE.connector + 1));
        }
 

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/conn.c b/drivers/gpu/drm/nouveau/core/engine/disp/conn.c
index 1496b567dd4aab9e1978bda882b1bf3ab3802da0..498ab4b8a9afafa3344d79c6e8052181c7922841 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/conn.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/conn.c
@@ -86,8 +86,8 @@ nvkm_connector_create_(struct nouveau_object *parent,
                       int length, void **pobject)
 {
        static const u8 hpd[] = { 0x07, 0x08, 0x51, 0x52, 0x5e, 0x5f, 0x60 };
+       struct nouveau_disp *disp = nouveau_disp(parent);
        struct nouveau_gpio *gpio = nouveau_gpio(parent);
-       struct nouveau_disp *disp = (void *)engine;
        struct nvkm_connector *conn;
        struct nvkm_output *outp;
        struct dcb_gpio_func func;

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/conn.h b/drivers/gpu/drm/nouveau/core/engine/disp/conn.h
index 55e5f5c82c14ff34d2f8a65e8b3721af1d270999..a1bf359e53bd750009b450c44a4158a9859d99bf 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/conn.h
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/conn.h
@@ -46,7 +46,7 @@ struct nvkm_connector_impl {
 #ifndef MSG
 #define MSG(l,f,a...) do {                                                     \
        struct nvkm_connector *_conn = (void *)conn;                           \
-       nv_##l(nv_object(conn)->engine, "%02x:%02x%02x: "f, _conn->index,      \
+       nv_##l(_conn, "%02x:%02x%02x: "f, _conn->index,                        \
               _conn->info.location, _conn->info.type, ##a);                   \
 } while(0)
 #define DBG(f,a...) MSG(debug, f, ##a)

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/outp.c b/drivers/gpu/drm/nouveau/core/engine/disp/outp.c
index bbd9b6fdc90f1744ccce55375afa66f0f320fef0..c5589c26e07d106f41d3a8095253fb6afa4c8854 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/outp.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/outp.c
@@ -62,9 +62,9 @@ nvkm_output_create_(struct nouveau_object *parent,
                    struct dcb_output *dcbE, int index,
                    int length, void **pobject)
 {
-       struct nouveau_bios *bios = nouveau_bios(engine);
+       struct nouveau_disp *disp = nouveau_disp(parent);
+       struct nouveau_bios *bios = nouveau_bios(parent);
        struct nouveau_i2c *i2c = nouveau_i2c(parent);
-       struct nouveau_disp *disp = (void *)engine;
        struct nvbios_connE connE;
        struct nvkm_output *outp;
        u8  ver, hdr;
@@ -98,7 +98,7 @@ nvkm_output_create_(struct nouveau_object *parent,
                connE.type = DCB_CONNECTOR_NONE;
        }
 
-       ret = nouveau_object_ctor(parent, engine, nvkm_connector_oclass,
+       ret = nouveau_object_ctor(parent, NULL, nvkm_connector_oclass,
                                 &connE, outp->info.connector,
                                 (struct nouveau_object **)&outp->conn);
        if (ret < 0) {

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/outp.h b/drivers/gpu/drm/nouveau/core/engine/disp/outp.h
index 187f435ad0e2011f773ce154a08e1f3d17d2d1d6..5305aa0f73b6bb830dcc28283f7b1bd8be959b4f 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/outp.h
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/outp.h
@@ -50,7 +50,7 @@ struct nvkm_output_impl {
 #ifndef MSG
 #define MSG(l,f,a...) do {                                                     \
        struct nvkm_output *_outp = (void *)outp;                              \
-       nv_##l(nv_object(outp)->engine, "%02x:%04x:%04x: "f, _outp->index,     \
+       nv_##l(_outp, "%02x:%04x:%04x: "f, _outp->index,                       \
               _outp->info.hasht, _outp->info.hashm, ##a);                     \
 } while(0)
 #define DBG(f,a...) MSG(debug, f, ##a)