Merge tag 'v5.9-rc4' into drm-next

Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2020-09-08 14:41:40 +10:00
1709 changed files with 9109 additions and 6041 deletions

View File

@@ -240,7 +240,7 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
ast->dp501_fw_addr = NULL;
}
}
/* fallthrough */
fallthrough;
case 0x0c:
ast->tx_chip_type = AST_TX_DP501;
}