diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-06-17 00:10:47 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-17 00:41:41 -0400 |
commit | c15ad3ca3238f99ad4a71948bdf81527dcf116a0 (patch) | |
tree | 20906d1c7c6b4fe565c23ecd0c5407d227c68957 | |
parent | ba5e01b0d0146c2d2bb5475cf1d6efec51bf2669 (diff) |
drm/nouveau/pwr: fix typo in fifo wrap handling
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/host.fuc b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/host.fuc index 2284ecb1c9b8..c2bb616a8da5 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/host.fuc +++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/host.fuc | |||
@@ -83,7 +83,7 @@ host_send: | |||
83 | // increment GET | 83 | // increment GET |
84 | add b32 $r1 0x1 | 84 | add b32 $r1 0x1 |
85 | and $r14 $r1 #fifo_qmaskf | 85 | and $r14 $r1 #fifo_qmaskf |
86 | nv_iowr(NV_PPWR_FIFO_GET(0), $r1) | 86 | nv_iowr(NV_PPWR_FIFO_GET(0), $r14) |
87 | bra #host_send | 87 | bra #host_send |
88 | host_send_done: | 88 | host_send_done: |
89 | ret | 89 | ret |
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h index 4bd43a99fdcc..39a5dc150a05 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h +++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h | |||
@@ -1018,7 +1018,7 @@ uint32_t nv108_pwr_code[] = { | |||
1018 | 0xb600023f, | 1018 | 0xb600023f, |
1019 | 0x1ec40110, | 1019 | 0x1ec40110, |
1020 | 0x04b0400f, | 1020 | 0x04b0400f, |
1021 | 0xbd0001f6, | 1021 | 0xbd000ef6, |
1022 | 0xc70ef404, | 1022 | 0xc70ef404, |
1023 | /* 0x0328: host_send_done */ | 1023 | /* 0x0328: host_send_done */ |
1024 | /* 0x032a: host_recv */ | 1024 | /* 0x032a: host_recv */ |
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h index 5a73fa620978..254205cd5166 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h +++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h | |||
@@ -1124,7 +1124,7 @@ uint32_t nva3_pwr_code[] = { | |||
1124 | 0x0f1ec401, | 1124 | 0x0f1ec401, |
1125 | 0x04b007f1, | 1125 | 0x04b007f1, |
1126 | 0xd00604b6, | 1126 | 0xd00604b6, |
1127 | 0x04bd0001, | 1127 | 0x04bd000e, |
1128 | /* 0x03cb: host_send_done */ | 1128 | /* 0x03cb: host_send_done */ |
1129 | 0xf8ba0ef4, | 1129 | 0xf8ba0ef4, |
1130 | /* 0x03cd: host_recv */ | 1130 | /* 0x03cd: host_recv */ |
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h index 4dba00d2dd1a..7ac87405d01b 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h +++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h | |||
@@ -1124,7 +1124,7 @@ uint32_t nvc0_pwr_code[] = { | |||
1124 | 0x0f1ec401, | 1124 | 0x0f1ec401, |
1125 | 0x04b007f1, | 1125 | 0x04b007f1, |
1126 | 0xd00604b6, | 1126 | 0xd00604b6, |
1127 | 0x04bd0001, | 1127 | 0x04bd000e, |
1128 | /* 0x03cb: host_send_done */ | 1128 | /* 0x03cb: host_send_done */ |
1129 | 0xf8ba0ef4, | 1129 | 0xf8ba0ef4, |
1130 | /* 0x03cd: host_recv */ | 1130 | /* 0x03cd: host_recv */ |
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h index 5e24c6bc041d..cd9ff1a73284 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h +++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h | |||
@@ -1033,7 +1033,7 @@ uint32_t nvd0_pwr_code[] = { | |||
1033 | 0xb6026b21, | 1033 | 0xb6026b21, |
1034 | 0x1ec40110, | 1034 | 0x1ec40110, |
1035 | 0xb007f10f, | 1035 | 0xb007f10f, |
1036 | 0x0001d004, | 1036 | 0x000ed004, |
1037 | 0x0ef404bd, | 1037 | 0x0ef404bd, |
1038 | /* 0x0365: host_send_done */ | 1038 | /* 0x0365: host_send_done */ |
1039 | /* 0x0367: host_recv */ | 1039 | /* 0x0367: host_recv */ |