This is basically a revert of commit 314eeac9 but now in a
fixed version.
Signed-off-by: NJoerg Roedel <joerg.roedel@amd.com>