Note that if you apply the Mesa fix, you also need to apply the xf86-video-amdgpu fix, or Xorg will fail to start up as you reported on IRC.