Commit 137c4ba7 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/kms/gv100-: avoid sending a core update until the first modeset

The OR routing logic in NVKM does not expect to receive supervisor
interrupts until the DD has provided consistent information on the
ORs it's using and the EVO/NVD assembly state to match.

The combination of changing window ownership + core channel update
during display init triggered a situation where we'd disconnect an
OR from the pad it was meant to still be driving on some systems.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5bb88d07
...@@ -90,7 +90,7 @@ corec37d_init(struct nv50_core *core) ...@@ -90,7 +90,7 @@ corec37d_init(struct nv50_core *core)
{ {
const u32 windows = 8; /*XXX*/ const u32 windows = 8; /*XXX*/
u32 *push, i; u32 *push, i;
if ((push = evo_wait(&core->chan, 2 + 5 * windows + 2))) { if ((push = evo_wait(&core->chan, 2 + 5 * windows))) {
evo_mthd(push, 0x0208, 1); evo_mthd(push, 0x0208, 1);
evo_data(push, core->chan.sync.handle); evo_data(push, core->chan.sync.handle);
for (i = 0; i < windows; i++) { for (i = 0; i < windows; i++) {
...@@ -100,8 +100,6 @@ corec37d_init(struct nv50_core *core) ...@@ -100,8 +100,6 @@ corec37d_init(struct nv50_core *core)
evo_mthd(push, 0x1010 + (i * 0x080), 1); evo_mthd(push, 0x1010 + (i * 0x080), 1);
evo_data(push, 0x00127fff); evo_data(push, 0x00127fff);
} }
evo_mthd(push, 0x0200, 1);
evo_data(push, 0x00000001);
evo_kick(push, &core->chan); evo_kick(push, &core->chan);
core->assign_windows = true; core->assign_windows = true;
} }
......
...@@ -27,7 +27,7 @@ corec57d_init(struct nv50_core *core) ...@@ -27,7 +27,7 @@ corec57d_init(struct nv50_core *core)
{ {
const u32 windows = 8; /*XXX*/ const u32 windows = 8; /*XXX*/
u32 *push, i; u32 *push, i;
if ((push = evo_wait(&core->chan, 2 + 5 * windows + 2))) { if ((push = evo_wait(&core->chan, 2 + 5 * windows))) {
evo_mthd(push, 0x0208, 1); evo_mthd(push, 0x0208, 1);
evo_data(push, core->chan.sync.handle); evo_data(push, core->chan.sync.handle);
for (i = 0; i < windows; i++) { for (i = 0; i < windows; i++) {
...@@ -37,8 +37,6 @@ corec57d_init(struct nv50_core *core) ...@@ -37,8 +37,6 @@ corec57d_init(struct nv50_core *core)
evo_mthd(push, 0x1010 + (i * 0x080), 1); evo_mthd(push, 0x1010 + (i * 0x080), 1);
evo_data(push, 0x00117fff); evo_data(push, 0x00117fff);
} }
evo_mthd(push, 0x0200, 1);
evo_data(push, 0x00000001);
evo_kick(push, &core->chan); evo_kick(push, &core->chan);
core->assign_windows = true; core->assign_windows = true;
} }
......
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