Adapt upstream commits to LinuxRendererA10