drm/nouveau/disp: nothing to see here

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --cc drivers/gpu/drm/nouveau/core/engine/disp/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/core/engine/disp/priv.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/core/include/engine/disp.h
Simple merge