diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-10-15 11:18:26 +0300 |
| commit | fa41d6ee904266fa8739cafa6ec038c3a8e435b7 (patch) | |
| tree | 4d5439bafd38dc730838bb15e6a49e747793d4a7 /drivers/gpu/drm/ast/ast_post.c | |
| parent | 9cd20ef7803cc53a00c6eb7198b3d870ac7b3766 (diff) | |
| parent | 7ed093602e0e1b60a0fc074a9692687e7d2b723d (diff) | |
| download | linux-fa41d6ee904266fa8739cafa6ec038c3a8e435b7.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
Backmerging to pull in HDR DP code:
https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.html
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/ast/ast_post.c')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_post.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c index e1d9cdf6ec1d..2d1b18619743 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c @@ -49,7 +49,7 @@ void ast_enable_mmio(struct drm_device *dev) { struct ast_private *ast = dev->dev_private; - ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa1, 0xff, 0x04); + ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x06); } |