diff options
| author | Simon Ser <contact@emersion.fr> | 2020-11-15 16:39:07 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-11-16 09:56:55 +0100 |
| commit | 0003b687ee6d55b889f037530582493f353f0567 (patch) | |
| tree | 786cc8b147cdd30f709e6fc64b02eae8fb78bce7 /drivers | |
| parent | drm/virtio: Make virtgpu_dmabuf_ops with static keyword (diff) | |
| download | linux-0003b687ee6d55b889f037530582493f353f0567.tar.xz linux-0003b687ee6d55b889f037530582493f353f0567.zip | |
drm: fix oops in drm_atomic_set_crtc_for_connector
crtc can be NULL. connector, extracted from conn_state, can't.
Fixes: e3aae683e861 ("drm: convert drm_atomic_uapi.c to new debug helpers")
Signed-off-by: Simon Ser <contact@emersion.fr>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/7xhyNYrWtzUIt3HNrWfi9iScW0k475RZiKNfF5TbPs@cp4-web-031.plabs.ch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_uapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 9df7f2a170e3..268bb69c2e2f 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -334,12 +334,12 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state, drm_connector_get(conn_state->connector); conn_state->crtc = crtc; - drm_dbg_atomic(crtc->dev, + drm_dbg_atomic(connector->dev, "Link [CONNECTOR:%d:%s] state %p to [CRTC:%d:%s]\n", connector->base.id, connector->name, conn_state, crtc->base.id, crtc->name); } else { - drm_dbg_atomic(crtc->dev, + drm_dbg_atomic(connector->dev, "Link [CONNECTOR:%d:%s] state %p to [NOCRTC]\n", connector->base.id, connector->name, conn_state); |