diff options
| author | Thomas Zimmermann <[email protected]> | 2020-09-14 07:22:36 +0000 |
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2020-09-16 11:08:10 +0000 |
| commit | 2f0ddd89fe32f1534a17ca44ebccc939f8a74af4 (patch) | |
| tree | 4774286bc41da1382d49cc6f554b2b408bbe6a7e /drivers/gpu/drm/ast/ast_mode.c | |
| parent | drm/ast: Program display mode in CRTC's atomic_enable() (diff) | |
| download | kernel-2f0ddd89fe32f1534a17ca44ebccc939f8a74af4.tar.gz kernel-2f0ddd89fe32f1534a17ca44ebccc939f8a74af4.zip | |
drm/ast: Enable CRTC before planes
An active cursor plane requires a valid display mode. Change the
commit_tail callback, so that it sets up the CRTC's mode before
updating planes.
Signed-off-by: Thomas Zimmermann <[email protected]>
Acked-by: Daniel Vetter <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/ast/ast_mode.c')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_mode.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index fd0127f48fb9..834a156e3a75 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1068,6 +1068,11 @@ static int ast_connector_init(struct drm_device *dev) * Mode config */ +static const struct drm_mode_config_helper_funcs +ast_mode_config_helper_funcs = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; + static const struct drm_mode_config_funcs ast_mode_config_funcs = { .fb_create = drm_gem_fb_create, .mode_valid = drm_vram_helper_mode_valid, @@ -1107,6 +1112,8 @@ int ast_mode_config_init(struct ast_private *ast) dev->mode_config.max_height = 1200; } + dev->mode_config.helper_private = &ast_mode_config_helper_funcs; + memset(&ast->primary_plane, 0, sizeof(ast->primary_plane)); ret = drm_universal_plane_init(dev, &ast->primary_plane, 0x01, &ast_primary_plane_funcs, |