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

@@ -601,13 +601,13 @@ static void ti_sn_bridge_read_valid_rates(struct ti_sn_bridge *pdata,
DRM_DEV_ERROR(pdata->dev,
"Unexpected max rate (%#x); assuming 5.4 GHz\n",
(int)dpcd_val);
/* fall through */
fallthrough;
case DP_LINK_BW_5_4:
rate_valid[7] = 1;
/* fall through */
fallthrough;
case DP_LINK_BW_2_7:
rate_valid[4] = 1;
/* fall through */
fallthrough;
case DP_LINK_BW_1_62:
rate_valid[1] = 1;
break;