summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2020-06-21 03:22:35 +0300
committerBen Skeggs <bskeggs@redhat.com>2020-07-24 11:50:52 +0300
commit9659be21e8034528839216b21794da73fdbedec2 (patch)
tree683a22648ffeaf6d0cdd59034da070ffb638f17b /drivers/gpu/drm/nouveau/dispnv50/curs507a.c
parentbea8395ccf175b599fd3e36df56dd8a67adcea9e (diff)
downloadlinux-9659be21e8034528839216b21794da73fdbedec2.tar.xz
drm/nouveau/kms/nv50-: convert wimm update() to new push macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/curs507a.c')
-rw-r--r--drivers/gpu/drm/nouveau/dispnv50/curs507a.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
index babf680c25fd..47f6f01b52a0 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
@@ -40,11 +40,13 @@ curs507a_space(struct nv50_wndw *wndw)
return false;
}
-static void
+static int
curs507a_update(struct nv50_wndw *wndw, u32 *interlock)
{
- if (curs507a_space(wndw))
+ int ret = nvif_chan_wait(&wndw->wimm, 1);
+ if (ret == 0)
nvif_wr32(&wndw->wimm.base.user, 0x0080, 0x00000000);
+ return ret;
}
static int