This makes it easier to remove legacy code later.

v2: move check into lock file as well.
Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: NDave Airlie <airlied@redhat.com>