drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw scale_set()
authorBen Skeggs <bskeggs@redhat.com>
Sat, 20 Jun 2020 04:24:57 +0000 (14:24 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 24 Jul 2020 08:51:00 +0000 (18:51 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/ovly507e.c

index 5369080d97f3f9e126372370329a1a910314a16c..afd6c7271de135f6468c4ed00505dd5e191342a3 100644 (file)
@@ -41,9 +41,16 @@ ovly507e_scale_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
        if ((ret = PUSH_WAIT(push, 4)))
                return ret;
 
-       PUSH_NVSQ(push, NV507E, 0x00e0, asyw->scale.sy << 16 | asyw->scale.sx,
-                               0x00e4, asyw->scale.sh << 16 | asyw->scale.sw,
-                               0x00e8, asyw->scale.dw);
+       PUSH_MTHD(push, NV507E, SET_POINT_IN,
+                 NVVAL(NV507E, SET_POINT_IN, X, asyw->scale.sx) |
+                 NVVAL(NV507E, SET_POINT_IN, Y, asyw->scale.sy),
+
+                               SET_SIZE_IN,
+                 NVVAL(NV507E, SET_SIZE_IN, WIDTH, asyw->scale.sw) |
+                 NVVAL(NV507E, SET_SIZE_IN, HEIGHT, asyw->scale.sh),
+
+                               SET_SIZE_OUT,
+                 NVVAL(NV507E, SET_SIZE_OUT, WIDTH, asyw->scale.dw));
        return 0;
 }