f4c7 doesn't build on it's own it when cherry-picked.
Based on just the summary (no code review) I added the following 3 commits to it:
00a3adaf43640b9aaa84b8cb98c1f2f227686689 52c9d7ca2467bc273a8ef3c61c1b690ac56caa74 ebc5e9c3b2241be69bee7b96bd63ef00dacf816c
The combination does build and with all of them the issue is fixed. Ignoring the one big sna/gen9 patch this seems like it's still a large amount of the changes in the driver.
f4c7 doesn't build on it's own it when cherry-picked.
Based on just the summary (no code review) I added the following 3 commits to it: aaa84b8cb98c1f2 f227686689 52c9d7ca2467bc2 73a8ef3c61c1b69 0ac56caa74 ebc5e9c3b2241be 69bee7b96bd63ef 00dacf816c
00a3adaf43640b9
The combination does build and with all of them the issue is fixed. Ignoring the one big sna/gen9 patch this seems like it's still a large amount of the changes in the driver.