diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-20 09:58:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-20 09:58:10 +0100 |
| commit | 236c9ad1f87088bb07ebdd136b8432f83dfd1e14 (patch) | |
| tree | ae8713c9878593521f2cb517891f123f178fdd83 /drivers/gpu/drm/ast/ast_mode.c | |
| parent | f2b42379c57682d4b127283da109fa1a3317966a (diff) | |
| parent | a7904a538933c525096ca2ccde1e60d0ee62c08e (diff) | |
| download | linux-236c9ad1f87088bb07ebdd136b8432f83dfd1e14.tar.gz linux-236c9ad1f87088bb07ebdd136b8432f83dfd1e14.tar.bz2 linux-236c9ad1f87088bb07ebdd136b8432f83dfd1e14.zip | |
Merge 5.16-rc6 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/ast/ast_mode.c')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_mode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 1e30eaeb0e1b..d5c98f79d58d 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1121,7 +1121,10 @@ static void ast_crtc_reset(struct drm_crtc *crtc) if (crtc->state) crtc->funcs->atomic_destroy_state(crtc, crtc->state); - __drm_atomic_helper_crtc_reset(crtc, &ast_state->base); + if (ast_state) + __drm_atomic_helper_crtc_reset(crtc, &ast_state->base); + else + __drm_atomic_helper_crtc_reset(crtc, NULL); } static struct drm_crtc_state * |