summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2017-05-19 23:59:35 +1000
committerBen Skeggs <bskeggs@redhat.com>2017-06-16 14:04:49 +1000
commit01a976376b6e57838f223dd2d2639597efd92db4 (patch)
treeee784130955e1f3a07658c6abf3d6965f50ce9b3 /drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
parentb3c9c0226c69a8d8e8a4505432f8bbf7188ad348 (diff)
drm/nouveau/disp: identity-map display paths to output resources
This essentially replicates our current behaviour in a way that's compatible with the new model that's emerging, so that we're able to start porting the hw-specific functions to it. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
index d62e93bb0f70..601fa625e440 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
@@ -562,7 +562,10 @@ nvkm_dp_ctor(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
u32 data;
int ret;
- nvkm_outp_ctor(&nvkm_dp_func, disp, index, dcbE, &dp->outp);
+ ret = nvkm_outp_ctor(&nvkm_dp_func, disp, index, dcbE, &dp->outp);
+ if (ret)
+ return ret;
+
dp->aux = aux;
if (!dp->aux) {
OUTP_ERR(&dp->outp, "no aux");