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:
@@ -597,7 +597,7 @@ static void venc_bridge_mode_set(struct drm_bridge *bridge,
|
||||
switch (venc_mode) {
|
||||
default:
|
||||
WARN_ON_ONCE(1);
|
||||
/* Fall-through */
|
||||
fallthrough;
|
||||
case VENC_MODE_PAL:
|
||||
venc->config = &venc_config_pal_trm;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user