Commit 4daef27c authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/kms/nv50-: use NVIDIA's headers for core ntfy_wait_done()

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent d8b24526
...@@ -53,7 +53,7 @@ core507d_ntfy_wait_done(struct nouveau_bo *bo, u32 offset, ...@@ -53,7 +53,7 @@ core507d_ntfy_wait_done(struct nouveau_bo *bo, u32 offset,
struct nvif_device *device) struct nvif_device *device)
{ {
s64 time = nvif_msec(device, 2000ULL, s64 time = nvif_msec(device, 2000ULL,
if (nouveau_bo_rd32(bo, offset / 4)) if (NVBO_TD32(bo, offset, NV_DISP_CORE_NOTIFIER_1, COMPLETION_0, DONE, ==, TRUE))
break; break;
usleep_range(1, 2); usleep_range(1, 2);
); );
......
...@@ -72,10 +72,8 @@ int ...@@ -72,10 +72,8 @@ int
corec37d_ntfy_wait_done(struct nouveau_bo *bo, u32 offset, corec37d_ntfy_wait_done(struct nouveau_bo *bo, u32 offset,
struct nvif_device *device) struct nvif_device *device)
{ {
u32 data;
s64 time = nvif_msec(device, 2000ULL, s64 time = nvif_msec(device, 2000ULL,
data = nouveau_bo_rd32(bo, offset / 4 + 0); if (NVBO_TD32(bo, offset, NV_DISP_NOTIFIER, _0, STATUS, ==, FINISHED))
if ((data & 0xc0000000) == 0x80000000)
break; break;
usleep_range(1, 2); usleep_range(1, 2);
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment