diff options
| author |   Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-06-04 12:00:31 +0200 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2012-07-26 10:28:13 +1000 |
| commit | ce806a30470bcd846d148bf39d46de3ad7748228 (patch) | |
| tree | b804660246b0ab0c673364298666b0c158252107 /drivers/gpu/drm/nouveau/nva3_copy.fuc | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (diff) | |
| download | linux-dev-ce806a30470bcd846d148bf39d46de3ad7748228.tar.xz linux-dev-ce806a30470bcd846d148bf39d46de3ad7748228.zip | |
nouveau: Fix alignment requirements on src and dst addresses
Linear copy works by adding the offset to the buffer address,
which may end up not being 16-byte aligned.
Some tests I've written for prime_pcopy show that the engine
allows this correctly, so the restriction on lowest 4 bits of
address can be lifted safely.
The comments added were by envyas, I think because I used
a newer version.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/nouveau/nva3_copy.fuc')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nva3_copy.fuc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nva3_copy.fuc b/drivers/gpu/drm/nouveau/nva3_copy.fuc index abc36626fef0..219850d53286 100644 --- a/drivers/gpu/drm/nouveau/nva3_copy.fuc +++ b/drivers/gpu/drm/nouveau/nva3_copy.fuc @@ -119,9 +119,9 @@ dispatch_dma: // mthd 0x030c-0x0340, various stuff .b16 0xc3 14 .b32 #ctx_src_address_high ~0x000000ff -.b32 #ctx_src_address_low ~0xfffffff0 +.b32 #ctx_src_address_low ~0xffffffff .b32 #ctx_dst_address_high ~0x000000ff -.b32 #ctx_dst_address_low ~0xfffffff0 +.b32 #ctx_dst_address_low ~0xffffffff .b32 #ctx_src_pitch ~0x0007ffff .b32 #ctx_dst_pitch ~0x0007ffff .b32 #ctx_xcnt ~0x0000ffff |