[Bug 31152] Please backport r200 fix to r100 and r300c