Skip to content

Commit

Permalink
drm/nve0/gr: remove 0x404160 bashing from hub fuc
Browse files Browse the repository at this point in the history
Triggers PIBUS interrupts due to register not existing anymore, and as
a result HUB_SET_CHAN times out.

After this commit, our fuc loads and can accelerate at least fbcon, X,
glxgears and OA on NVE4.  NVE7 not tested as of yet.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Oct 3, 2012
1 parent 1978a2f commit ec6566f
Show file tree
Hide file tree
Showing 2 changed files with 189 additions and 282 deletions.
26 changes: 0 additions & 26 deletions drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc
Original file line number Diff line number Diff line change
Expand Up @@ -468,28 +468,6 @@ ih:
bclr $flags $p0
iret

// Not real sure, but, MEM_CMD 7 will hang forever if this isn't done
ctx_4160s:
mov $r14 0x4160
sethi $r14 0x400000
mov $r15 1
call #nv_wr32
ctx_4160s_wait:
call #nv_rd32
xbit $r15 $r15 4
bra e #ctx_4160s_wait
ret

// Without clearing again at end of xfer, some things cause PGRAPH
// to hang with STATUS=0x00000007 until it's cleared.. fbcon can
// still function with it set however...
ctx_4160c:
mov $r14 0x4160
sethi $r14 0x400000
clear b32 $r15
call #nv_wr32
ret

// Again, not real sure
//
// In: $r15 value to set 0x404170 to
Expand Down Expand Up @@ -630,7 +608,6 @@ ctx_load:
// In: $r2 channel address
//
ctx_chan:
call #ctx_4160s
call #ctx_load
mov $r10 12 // DONE_UNK12
call #wait_donez
Expand All @@ -642,7 +619,6 @@ ctx_chan:
iord $r2 I[$r1 + 0x000]
or $r2 $r2
bra ne #ctx_chan_wait
call #ctx_4160c
ret

// Execute per-context state overrides list
Expand Down Expand Up @@ -709,7 +685,6 @@ ctx_xfer:
ctx_xfer_pre:
mov $r15 0x10
call #ctx_86c
call #ctx_4160s
bra not $p1 #ctx_xfer_exec

ctx_xfer_pre_load:
Expand Down Expand Up @@ -798,7 +773,6 @@ ctx_xfer:
call #ctx_mmio_exec

ctx_xfer_no_post_mmio:
call #ctx_4160c

ctx_xfer_done:
ret
Expand Down
Loading

0 comments on commit ec6566f

Please sign in to comment.