Oh boy.  That was a bad gamble.  PDISP has changed.

This reverts commit cdf81a23.
Signed-off-by: Dave Airlie <airlied@redhat.com>