mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-05 22:56:39 +07:00
drm/nouveau/disp: outp/conns do not have an engine
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
c272d86e70
commit
bdda4703f1
@ -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));
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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) {
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user