-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/nouveau/disp: add connector class
Will be used to provide more solid driver interfaces in general, but the immediate motivation is work towards fixing issues with handling hotplug/DP IRQ events. Its use is currently limited to where we support non-polled hotplug already (ie. any GPU since NV40ish era, where our DCB handling works well enough), until that gets cleaned up someday. v2: - use ?: (lyude) Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
- Loading branch information
Showing
15 changed files
with
189 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
/* SPDX-License-Identifier: MIT */ | ||
#ifndef __NVIF_CONN_H__ | ||
#define __NVIF_CONN_H__ | ||
#include <nvif/object.h> | ||
struct nvif_disp; | ||
|
||
struct nvif_conn { | ||
struct nvif_object object; | ||
}; | ||
|
||
int nvif_conn_ctor(struct nvif_disp *, const char *name, int id, struct nvif_conn *); | ||
void nvif_conn_dtor(struct nvif_conn *); | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
/* SPDX-License-Identifier: MIT */ | ||
#ifndef __NVIF_IF0011_H__ | ||
#define __NVIF_IF0011_H__ | ||
|
||
union nvif_conn_args { | ||
struct nvif_conn_v0 { | ||
__u8 version; | ||
__u8 id; /* DCB connector table index. */ | ||
__u8 pad02[6]; | ||
} v0; | ||
}; | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* | ||
* Copyright 2021 Red Hat Inc. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a | ||
* copy of this software and associated documentation files (the "Software"), | ||
* to deal in the Software without restriction, including without limitation | ||
* the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
* and/or sell copies of the Software, and to permit persons to whom the | ||
* Software is furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
* OTHER DEALINGS IN THE SOFTWARE. | ||
*/ | ||
#include <nvif/conn.h> | ||
#include <nvif/disp.h> | ||
#include <nvif/printf.h> | ||
|
||
#include <nvif/class.h> | ||
#include <nvif/if0011.h> | ||
|
||
void | ||
nvif_conn_dtor(struct nvif_conn *conn) | ||
{ | ||
nvif_object_dtor(&conn->object); | ||
} | ||
|
||
int | ||
nvif_conn_ctor(struct nvif_disp *disp, const char *name, int id, struct nvif_conn *conn) | ||
{ | ||
struct nvif_conn_v0 args; | ||
int ret; | ||
|
||
args.version = 0; | ||
args.id = id; | ||
|
||
ret = nvif_object_ctor(&disp->object, name ?: "nvifConn", id, NVIF_CLASS_CONN, | ||
&args, sizeof(args), &conn->object); | ||
NVIF_ERRON(ret, &disp->object, "[NEW conn id:%d]", id); | ||
return ret; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/* | ||
* Copyright 2021 Red Hat Inc. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a | ||
* copy of this software and associated documentation files (the "Software"), | ||
* to deal in the Software without restriction, including without limitation | ||
* the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
* and/or sell copies of the Software, and to permit persons to whom the | ||
* Software is furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
* OTHER DEALINGS IN THE SOFTWARE. | ||
*/ | ||
#define nvkm_uconn(p) container_of((p), struct nvkm_conn, object) | ||
#include "conn.h" | ||
|
||
#include <nvif/if0011.h> | ||
|
||
static void * | ||
nvkm_uconn_dtor(struct nvkm_object *object) | ||
{ | ||
struct nvkm_conn *conn = nvkm_uconn(object); | ||
struct nvkm_disp *disp = conn->disp; | ||
|
||
spin_lock(&disp->client.lock); | ||
conn->object.func = NULL; | ||
spin_unlock(&disp->client.lock); | ||
return NULL; | ||
} | ||
|
||
static const struct nvkm_object_func | ||
nvkm_uconn = { | ||
.dtor = nvkm_uconn_dtor, | ||
}; | ||
|
||
int | ||
nvkm_uconn_new(const struct nvkm_oclass *oclass, void *argv, u32 argc, struct nvkm_object **pobject) | ||
{ | ||
struct nvkm_disp *disp = nvkm_udisp(oclass->parent); | ||
struct nvkm_conn *cont, *conn = NULL; | ||
union nvif_conn_args *args = argv; | ||
int ret; | ||
|
||
if (argc != sizeof(args->v0) || args->v0.version != 0) | ||
return -ENOSYS; | ||
|
||
list_for_each_entry(cont, &disp->conns, head) { | ||
if (cont->index == args->v0.id) { | ||
conn = cont; | ||
break; | ||
} | ||
} | ||
|
||
if (!conn) | ||
return -EINVAL; | ||
|
||
ret = -EBUSY; | ||
spin_lock(&disp->client.lock); | ||
if (!conn->object.func) { | ||
nvkm_object_ctor(&nvkm_uconn, oclass, &conn->object); | ||
*pobject = &conn->object; | ||
ret = 0; | ||
} | ||
spin_unlock(&disp->client.lock); | ||
return ret; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters