[PATCH] Upstream fix for Raven Ridge