commit e9bef455 upstream.

This reverts commit bedf2a65.

See the radeon revert for an extended description.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>