diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-06-10 15:55:32 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-10 15:55:32 -0700 |
| commit | 5c281b4e529cd5a73b32ac561d79f448d18dda6f (patch) | |
| tree | 30c3126d9015754c8cdb0bd77fae22ba36086f81 /drivers/gpu/drm/ast/ast_post.c | |
| parent | b97dcb85750b7e8bc5aaed5403ddf4b0552c7993 (diff) | |
| parent | aa3398fb4b3f67d89688976098ad93721b6d7852 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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 0aa9cf0fb5c3..82fd3c8adee1 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c @@ -391,7 +391,7 @@ void ast_post_gpu(struct drm_device *dev) ast_init_3rdtx(dev); } else { - if (ast->tx_chip_type != AST_TX_NONE) + if (ast->tx_chip_types & AST_TX_SIL164_BIT) ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa3, 0xcf, 0x80); /* Enable DVO */ } } |