diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2022-01-13 13:21:03 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-01-13 13:21:03 -0400 |
| commit | c0fe82baaeb2719f910359684c0817057f79a84a (patch) | |
| tree | 74d879664c964efbf64ee51b5aa5a582fa868635 /drivers/gpu/drm/ast/ast_mode.c | |
| parent | RDMA/irdma: Remove the redundant return (diff) | |
| parent | Linux 5.16 (diff) | |
| download | wireguard-linux-c0fe82baaeb2719f910359684c0817057f79a84a.tar.xz wireguard-linux-c0fe82baaeb2719f910359684c0817057f79a84a.zip | |
Merge tag 'v5.16' into rdma.git for-next
To resolve minor conflict in:
drivers/infiniband/hw/mlx5/mlx5_ib.h
By merging both hunks.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
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 * |