Skip to content

L
linux
Commit 6d6e11e2 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau/kms/nv50-: convert wndw image_set() to new push macros 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 34838908
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 195 deletions
drivers/gpu/drm/nouveau/dispnv50/base507c.c
View file @ 6d6e11e2
...@@ -56,37 +56,35 @@ base507c_image_clr(struct nv50_wndw *wndw) ...@@ -56,37 +56,35 @@ base507c_image_clr(struct nv50_wndw *wndw)
} }
} }
static void static int
base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
if ((push = evo_wait(&wndw->wndw, 13))) { int ret;
evo_mthd(push, 0x0084, 1);
evo_data(push, asyw->image.mode << 8 | if ((ret = PUSH_WAIT(push, 13)))
return ret;
PUSH_NVSQ(push, NV507C, 0x0084, asyw->image.mode << 8 |
asyw->image.interval << 4); asyw->image.interval << 4);
evo_mthd(push, 0x00c0, 1); PUSH_NVSQ(push, NV507C, 0x00c0, asyw->image.handle[0]);
evo_data(push, asyw->image.handle[0]);
if (asyw->image.format == 0xca) { if (asyw->image.format == 0xca) {
evo_mthd(push, 0x0110, 2); PUSH_NVSQ(push, NV507C, 0x0110, 1,
evo_data(push, 1); 0x0114, 0x6400);
evo_data(push, 0x6400);
} else { } else {
evo_mthd(push, 0x0110, 2); PUSH_NVSQ(push, NV507C, 0x0110, 0,
evo_data(push, 0); 0x0114, 0);
evo_data(push, 0);
} }
evo_mthd(push, 0x0800, 5); PUSH_NVSQ(push, NV507C, 0x0800, asyw->image.offset[0] >> 8,
evo_data(push, asyw->image.offset[0] >> 8); 0x0804, 0x00000000,
evo_data(push, 0x00000000); 0x0808, asyw->image.h << 16 | asyw->image.w,
evo_data(push, asyw->image.h << 16 | asyw->image.w); 0x080c, asyw->image.layout << 20 |
evo_data(push, asyw->image.layout << 20 |
(asyw->image.pitch[0] >> 8) << 8 | (asyw->image.pitch[0] >> 8) << 8 |
asyw->image.blocks[0] << 8 | asyw->image.blocks[0] << 8 |
asyw->image.blockh); asyw->image.blockh,
evo_data(push, asyw->image.kind << 16 | 0x0810, asyw->image.kind << 16 |
asyw->image.format << 8); asyw->image.format << 8);
evo_kick(push, &wndw->wndw); return 0;
}
} }
int int
......
drivers/gpu/drm/nouveau/dispnv50/base827c.c
View file @ 6d6e11e2
...@@ -21,36 +21,36 @@ ...@@ -21,36 +21,36 @@
*/ */
#include "base.h" #include "base.h"
static void #include <nvif/push507c.h>
static int
base827c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) base827c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
if ((push = evo_wait(&wndw->wndw, 13))) { int ret;
evo_mthd(push, 0x0084, 1);
evo_data(push, asyw->image.mode << 8 | if ((ret = PUSH_WAIT(push, 13)))
return ret;
PUSH_NVSQ(push, NV827C, 0x0084, asyw->image.mode << 8 |
asyw->image.interval << 4); asyw->image.interval << 4);
evo_mthd(push, 0x00c0, 1); PUSH_NVSQ(push, NV827C, 0x00c0, asyw->image.handle[0]);
evo_data(push, asyw->image.handle[0]);
if (asyw->image.format == 0xca) { if (asyw->image.format == 0xca) {
evo_mthd(push, 0x0110, 2); PUSH_NVSQ(push, NV827C, 0x0110, 1,
evo_data(push, 1); 0x0114, 0x6400);
evo_data(push, 0x6400);
} else { } else {
evo_mthd(push, 0x0110, 2); PUSH_NVSQ(push, NV827C, 0x0110, 0,
evo_data(push, 0); 0x0114, 0);
evo_data(push, 0);
} }
evo_mthd(push, 0x0800, 5); PUSH_NVSQ(push, NV827C, 0x0800, asyw->image.offset[0] >> 8,
evo_data(push, asyw->image.offset[0] >> 8); 0x0804, 0x00000000,
evo_data(push, 0x00000000); 0x0808, asyw->image.h << 16 | asyw->image.w,
evo_data(push, asyw->image.h << 16 | asyw->image.w); 0x080c, asyw->image.layout << 20 |
evo_data(push, asyw->image.layout << 20 |
(asyw->image.pitch[0] >> 8) << 8 | (asyw->image.pitch[0] >> 8) << 8 |
asyw->image.blocks[0] << 8 | asyw->image.blocks[0] << 8 |
asyw->image.blockh); asyw->image.blockh,
evo_data(push, asyw->image.format << 8); 0x0810, asyw->image.format << 8);
evo_kick(push, &wndw->wndw); return 0;
}
} }
static const struct nv50_wndw_func static const struct nv50_wndw_func
......
drivers/gpu/drm/nouveau/dispnv50/base907c.c
View file @ 6d6e11e2
...@@ -23,27 +23,27 @@ ...@@ -23,27 +23,27 @@
#include <nvif/push507c.h> #include <nvif/push507c.h>
static void static int
base907c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) base907c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
if ((push = evo_wait(&wndw->wndw, 10))) { int ret;
evo_mthd(push, 0x0084, 1);
evo_data(push, asyw->image.mode << 8 | if ((ret = PUSH_WAIT(push, 10)))
return ret;
PUSH_NVSQ(push, NV907C, 0x0084, asyw->image.mode << 8 |
asyw->image.interval << 4); asyw->image.interval << 4);
evo_mthd(push, 0x00c0, 1); PUSH_NVSQ(push, NV907C, 0x00c0, asyw->image.handle[0]);
evo_data(push, asyw->image.handle[0]); PUSH_NVSQ(push, NV907C, 0x0400, asyw->image.offset[0] >> 8,
evo_mthd(push, 0x0400, 5); 0x0404, 0x00000000,
evo_data(push, asyw->image.offset[0] >> 8); 0x0408, asyw->image.h << 16 | asyw->image.w,
evo_data(push, 0x00000000); 0x040c, asyw->image.layout << 24 |
evo_data(push, asyw->image.h << 16 | asyw->image.w);
evo_data(push, asyw->image.layout << 24 |
(asyw->image.pitch[0] >> 8) << 8 | (asyw->image.pitch[0] >> 8) << 8 |
asyw->image.blocks[0] << 8 | asyw->image.blocks[0] << 8 |
asyw->image.blockh); asyw->image.blockh,
evo_data(push, asyw->image.format << 8); 0x0410, asyw->image.format << 8);
evo_kick(push, &wndw->wndw); return 0;
}
} }
static int static int
......
drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
View file @ 6d6e11e2
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <nvif/cl507e.h> #include <nvif/cl507e.h>
#include <nvif/event.h> #include <nvif/event.h>
#include <nvif/push507c.h>
void void
ovly507e_update(struct nv50_wndw *wndw, u32 *interlock) ovly507e_update(struct nv50_wndw *wndw, u32 *interlock)
...@@ -66,30 +67,28 @@ ovly507e_image_clr(struct nv50_wndw *wndw) ...@@ -66,30 +67,28 @@ ovly507e_image_clr(struct nv50_wndw *wndw)
} }
} }
static void static int
ovly507e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) ovly507e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
if ((push = evo_wait(&wndw->wndw, 12))) { int ret;
evo_mthd(push, 0x0084, 1);
evo_data(push, asyw->image.interval << 4); if ((ret = PUSH_WAIT(push, 12)))
evo_mthd(push, 0x00c0, 1); return ret;
evo_data(push, asyw->image.handle[0]);
evo_mthd(push, 0x0100, 1); PUSH_NVSQ(push, NV507E, 0x0084, asyw->image.interval << 4);
evo_data(push, 0x00000002); PUSH_NVSQ(push, NV507E, 0x00c0, asyw->image.handle[0]);
evo_mthd(push, 0x0800, 1); PUSH_NVSQ(push, NV507E, 0x0100, 0x00000002);
evo_data(push, asyw->image.offset[0] >> 8); PUSH_NVSQ(push, NV507E, 0x0800, asyw->image.offset[0] >> 8);
evo_mthd(push, 0x0808, 3); PUSH_NVSQ(push, NV507E, 0x0808, asyw->image.h << 16 | asyw->image.w,
evo_data(push, asyw->image.h << 16 | asyw->image.w); 0x080c, asyw->image.layout << 20 |
evo_data(push, asyw->image.layout << 20 |
(asyw->image.pitch[0] >> 8) << 8 | (asyw->image.pitch[0] >> 8) << 8 |
asyw->image.blocks[0] << 8 | asyw->image.blocks[0] << 8 |
asyw->image.blockh); asyw->image.blockh,
evo_data(push, asyw->image.kind << 16 | 0x0810, asyw->image.kind << 16 |
asyw->image.format << 8 | asyw->image.format << 8 |
asyw->image.colorspace); asyw->image.colorspace);
evo_kick(push, &wndw->wndw); return 0;
}
} }
void void
......
drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
View file @ 6d6e11e2
...@@ -24,31 +24,30 @@ ...@@ -24,31 +24,30 @@
#include <nouveau_bo.h> #include <nouveau_bo.h>
#include <nvif/push507c.h>
#include <nvif/timer.h> #include <nvif/timer.h>
static void static int
ovly827e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) ovly827e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
if ((push = evo_wait(&wndw->wndw, 12))) { int ret;
evo_mthd(push, 0x0084, 1);
evo_data(push, asyw->image.interval << 4); if ((ret = PUSH_WAIT(push, 12)))
evo_mthd(push, 0x00c0, 1); return ret;
evo_data(push, asyw->image.handle[0]);
evo_mthd(push, 0x0100, 1); PUSH_NVSQ(push, NV827E, 0x0084, asyw->image.interval << 4);
evo_data(push, 0x00000002); PUSH_NVSQ(push, NV827E, 0x00c0, asyw->image.handle[0]);
evo_mthd(push, 0x0800, 1); PUSH_NVSQ(push, NV827E, 0x0100, 0x00000002);
evo_data(push, asyw->image.offset[0] >> 8); PUSH_NVSQ(push, NV827E, 0x0800, asyw->image.offset[0] >> 8);
evo_mthd(push, 0x0808, 3); PUSH_NVSQ(push, NV827E, 0x0808, asyw->image.h << 16 | asyw->image.w,
evo_data(push, asyw->image.h << 16 | asyw->image.w); 0x080c, asyw->image.layout << 20 |
evo_data(push, asyw->image.layout << 20 |
(asyw->image.pitch[0] >> 8) << 8 | (asyw->image.pitch[0] >> 8) << 8 |
asyw->image.blocks[0] << 8 | asyw->image.blocks[0] << 8 |
asyw->image.blockh); asyw->image.blockh,
evo_data(push, asyw->image.format << 8 | 0x0810, asyw->image.format << 8 |
asyw->image.colorspace); asyw->image.colorspace);
evo_kick(push, &wndw->wndw); return 0;
}
} }
int int
......
drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
View file @ 6d6e11e2
...@@ -22,29 +22,29 @@ ...@@ -22,29 +22,29 @@
#include "ovly.h" #include "ovly.h"
#include "atom.h" #include "atom.h"
static void #include <nvif/push507c.h>
static int
ovly907e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) ovly907e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
if ((push = evo_wait(&wndw->wndw, 12))) { int ret;
evo_mthd(push, 0x0084, 1);
evo_data(push, asyw->image.interval << 4); if ((ret = PUSH_WAIT(push, 12)))
evo_mthd(push, 0x00c0, 1); return ret;
evo_data(push, asyw->image.handle[0]);
evo_mthd(push, 0x0100, 1); PUSH_NVSQ(push, NV907E, 0x0084, asyw->image.interval << 4);
evo_data(push, 0x00000002); PUSH_NVSQ(push, NV907E, 0x00c0, asyw->image.handle[0]);
evo_mthd(push, 0x0400, 1); PUSH_NVSQ(push, NV907E, 0x0100, 0x00000002);
evo_data(push, asyw->image.offset[0] >> 8); PUSH_NVSQ(push, NV907E, 0x0400, asyw->image.offset[0] >> 8);
evo_mthd(push, 0x0408, 3); PUSH_NVSQ(push, NV907E, 0x0408, asyw->image.h << 16 | asyw->image.w,
evo_data(push, asyw->image.h << 16 | asyw->image.w); 0x040c, asyw->image.layout << 24 |
evo_data(push, asyw->image.layout << 24 |
(asyw->image.pitch[0] >> 8) << 8 | (asyw->image.pitch[0] >> 8) << 8 |
asyw->image.blocks[0] << 8 | asyw->image.blocks[0] << 8 |
asyw->image.blockh); asyw->image.blockh,
evo_data(push, asyw->image.format << 8 | 0x0410, asyw->image.format << 8 |
asyw->image.colorspace); asyw->image.colorspace);
evo_kick(push, &wndw->wndw); return 0;
}
} }
const struct nv50_wndw_func const struct nv50_wndw_func
......
drivers/gpu/drm/nouveau/dispnv50/wndw.h
View file @ 6d6e11e2
...@@ -74,7 +74,7 @@ struct nv50_wndw_func { ...@@ -74,7 +74,7 @@ struct nv50_wndw_func {
bool olut_core; bool olut_core;
int (*xlut_set)(struct nv50_wndw *, struct nv50_wndw_atom *); int (*xlut_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
int (*xlut_clr)(struct nv50_wndw *); int (*xlut_clr)(struct nv50_wndw *);
void (*image_set)(struct nv50_wndw *, struct nv50_wndw_atom *); int (*image_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
void (*image_clr)(struct nv50_wndw *); void (*image_clr)(struct nv50_wndw *);
void (*scale_set)(struct nv50_wndw *, struct nv50_wndw_atom *); void (*scale_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
void (*blend_set)(struct nv50_wndw *, struct nv50_wndw_atom *); void (*blend_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
......
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
View file @ 6d6e11e2
...@@ -125,37 +125,34 @@ wndwc37e_image_clr(struct nv50_wndw *wndw) ...@@ -125,37 +125,34 @@ wndwc37e_image_clr(struct nv50_wndw *wndw)
} }
} }
static void static int
wndwc37e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) wndwc37e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
int ret;
if (!(push = evo_wait(&wndw->wndw, 17))) if ((ret = PUSH_WAIT(push, 17)))
return; return ret;
evo_mthd(push, 0x0308, 1); PUSH_NVSQ(push, NVC37E, 0x0308, asyw->image.mode << 4 |
evo_data(push, asyw->image.mode << 4 | asyw->image.interval); asyw->image.interval);
evo_mthd(push, 0x0224, 4); PUSH_NVSQ(push, NVC37E, 0x0224, asyw->image.h << 16 | asyw->image.w,
evo_data(push, asyw->image.h << 16 | asyw->image.w); 0x0228, asyw->image.layout << 4 |
evo_data(push, asyw->image.layout << 4 | asyw->image.blockh); asyw->image.blockh,
evo_data(push, asyw->csc.valid << 17 | 0x022c, asyw->csc.valid << 17 |
asyw->image.colorspace << 8 | asyw->image.colorspace << 8 |
asyw->image.format); asyw->image.format,
evo_data(push, asyw->image.blocks[0] | (asyw->image.pitch[0] >> 6)); 0x0230, asyw->image.blocks[0] |
evo_mthd(push, 0x0240, 1); (asyw->image.pitch[0] >> 6));
evo_data(push, asyw->image.handle[0]); PUSH_NVSQ(push, NVC37E, 0x0240, asyw->image.handle[0]);
evo_mthd(push, 0x0260, 1); PUSH_NVSQ(push, NVC37E, 0x0260, asyw->image.offset[0] >> 8);
evo_data(push, asyw->image.offset[0] >> 8); PUSH_NVSQ(push, NVC37E, 0x0290,(asyw->state.src_y >> 16) << 16 |
evo_mthd(push, 0x0290, 1);
evo_data(push, (asyw->state.src_y >> 16) << 16 |
(asyw->state.src_x >> 16)); (asyw->state.src_x >> 16));
evo_mthd(push, 0x0298, 1); PUSH_NVSQ(push, NVC37E, 0x0298,(asyw->state.src_h >> 16) << 16 |
evo_data(push, (asyw->state.src_h >> 16) << 16 |
(asyw->state.src_w >> 16)); (asyw->state.src_w >> 16));
evo_mthd(push, 0x02a4, 1); PUSH_NVSQ(push, NVC37E, 0x02a4, asyw->state.crtc_h << 16 |
evo_data(push, asyw->state.crtc_h << 16 |
asyw->state.crtc_w); asyw->state.crtc_w);
evo_kick(push, &wndw->wndw); return 0;
} }
int int
......
drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
View file @ 6d6e11e2
...@@ -29,36 +29,33 @@ ...@@ -29,36 +29,33 @@
#include <nvif/clc37e.h> #include <nvif/clc37e.h>
#include <nvif/pushc37b.h> #include <nvif/pushc37b.h>
static void static int
wndwc57e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) wndwc57e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{ {
u32 *push; struct nvif_push *push = wndw->wndw.push;
int ret;
if (!(push = evo_wait(&wndw->wndw, 17)))
return; if ((ret = PUSH_WAIT(push, 17)))
return ret;
evo_mthd(push, 0x0308, 1);
evo_data(push, asyw->image.mode << 4 | asyw->image.interval); PUSH_NVSQ(push, NVC57E, 0x0308, asyw->image.mode << 4 |
evo_mthd(push, 0x0224, 4); asyw->image.interval);
evo_data(push, asyw->image.h << 16 | asyw->image.w); PUSH_NVSQ(push, NVC57E, 0x0224, asyw->image.h << 16 | asyw->image.w,
evo_data(push, asyw->image.layout << 4 | asyw->image.blockh); 0x0228, asyw->image.layout << 4 |
evo_data(push, asyw->image.colorspace << 8 | asyw->image.blockh,
asyw->image.format); 0x022c, asyw->image.colorspace << 8 |
evo_data(push, asyw->image.blocks[0] | (asyw->image.pitch[0] >> 6)); asyw->image.format,
evo_mthd(push, 0x0240, 1); 0x0230, asyw->image.blocks[0] |
evo_data(push, asyw->image.handle[0]); (asyw->image.pitch[0] >> 6));
evo_mthd(push, 0x0260, 1); PUSH_NVSQ(push, NVC57E, 0x0240, asyw->image.handle[0]);
evo_data(push, asyw->image.offset[0] >> 8); PUSH_NVSQ(push, NVC57E, 0x0260, asyw->image.offset[0] >> 8);
evo_mthd(push, 0x0290, 1); PUSH_NVSQ(push, NVC57E, 0x0290,(asyw->state.src_y >> 16) << 16 |
evo_data(push, (asyw->state.src_y >> 16) << 16 |
(asyw->state.src_x >> 16)); (asyw->state.src_x >> 16));
evo_mthd(push, 0x0298, 1); PUSH_NVSQ(push, NVC57E, 0x0298,(asyw->state.src_h >> 16) << 16 |
evo_data(push, (asyw->state.src_h >> 16) << 16 |
(asyw->state.src_w >> 16)); (asyw->state.src_w >> 16));
evo_mthd(push, 0x02a4, 1); PUSH_NVSQ(push, NVC57E, 0x02a4, asyw->state.crtc_h << 16 |
evo_data(push, asyw->state.crtc_h << 16 |
asyw->state.crtc_w); asyw->state.crtc_w);
evo_kick(push, &wndw->wndw); return 0;
} }
static int static int
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7