Commit Graph

4784 Commits

Author SHA1 Message Date
kfx
d2578e7f3b ion: update ion drivers 2012-05-09 16:16:34 +08:00
黄涛
469ad23578 ion: use list_for_each_entry_safe in ion_vma_close 2012-04-26 16:55:50 +08:00
kfx
303cb72aa4 ion: Fix race condition with import and map_addr_list 2012-04-19 20:07:17 +08:00
kfx
63ce107bd4 ion: modify memory leak 2012-03-30 10:41:03 +08:00
kfx
04ef98d611 Ion module: version1.0 2012-03-26 09:30:42 +08:00
黄涛
e153fabd0b Merge remote-tracking branch 'origin/develop-3.0-rk30' into develop-3.0
Conflicts:
	arch/arm/mach-rk29/Makefile
	arch/arm/mach-rk29/include/mach/rk29_camera.h
	drivers/gpu/ion/ion.c
	drivers/gpu/ion/ion_carveout_heap.c
	drivers/gpu/ion/ion_priv.h
	drivers/media/video/gc0307.c
	drivers/media/video/gc0308.c
	drivers/media/video/gc0309.c
	drivers/media/video/gc2015.c
	drivers/media/video/gt2005.c
	drivers/media/video/mt9d112.c
	drivers/media/video/mt9d113.c
	drivers/media/video/mt9p111.c
	drivers/media/video/mt9t111.c
	drivers/media/video/ov2640_rk.c
	drivers/media/video/ov2655.c
	drivers/media/video/ov2659.c
	drivers/media/video/ov5640.c
	drivers/media/video/ov5642.c
	drivers/media/video/ov7675.c
	drivers/media/video/rk29_camera.c
	drivers/media/video/sid130B.c
	drivers/media/video/siv120b.c
	drivers/mmc/host/rk29_sdmmc.c
	include/linux/ion.h
2012-03-25 15:16:37 +08:00
kfx
bbe02462c1 ion drivers: add 'query client infomation' interface for vpu 2012-03-19 16:02:18 +08:00
kfx
df6aedd2e7 Ion drivers: Compatible with older versions about flush cache 2012-03-19 12:19:10 +08:00
kfx
88d552b3bb rk30:add ion support 2012-03-12 18:48:03 +08:00
kfx
aa2d99e76e ion: invalide cache, L1 first 2012-03-09 09:11:20 +08:00
kfx
cd625606e0 ion: add debug info and modify to support libion 2012-03-07 18:23:43 +08:00
kfx
e1fcd840d7 gpu: ion: Take handle reference in ion_vma_open
When ion_vma_open is called, a reference to the handle in
the vma must be taken. Otherwise, if forking occurs,
ion_vma_close will be called twice which will leave one of
the calls with an invalid reference.
2011-12-22 20:18:46 +08:00
kfx
acee9b6457 ion mmap: set page_protection 'cached' 2011-12-22 12:43:02 +08:00
黄涛
50d910ace6 gpu: ion: fix printk when alloc failed 2011-12-19 10:07:34 +08:00
kfx
7932f134b8 ion: flush cache 2011-12-16 10:32:41 +08:00
kfx
ad773bac07 add ion(kernel allocator) for gralloc 2011-12-14 12:58:55 +08:00
Colin Cross
2bb3e31015 Merge commit 'v3.0.8' into android-3.0 2011-10-27 15:01:19 -07:00
Ben Skeggs
726e2766e0 drm/ttm: unbind ttm before destroying node in accel move cleanup
commit eac2095398 upstream.

Nouveau makes the assumption that if a TTM is bound there will be a mm_node
around for it and the backwards ordering here resulted in a use-after-free
on some eviction paths.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Cc: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-25 07:10:15 +02:00
Ben Skeggs
379791a666 drm/ttm: ensure ttm for new node is bound before calling move_notify()
commit 8d3bb23609 upstream.

This was true for new TTM_PL_SYSTEM and new TTM_PL_TT cases, but wasn't
the case on TTM_PL_SYSTEM<->TTM_PL_TT moves, which causes trouble on some
paths as nouveau's move_notify() hook requires that the dma addresses be
valid at this point.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Cc: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-25 07:10:15 +02:00
Alex Deucher
f62f4cad50 drm/radeon/kms/atom: fix handling of FB scratch indices
commit 5a6e8482a1 upstream.

FB scratch indices are dword indices, but we were treating
them as byte indices.  As such, we were getting the wrong
FB scratch data for non-0 indices.  Fix the indices and
guard the indexing against indices larger than the scratch
allocation.

Fixes memory corruption on some boards if data was written
past the end of the FB scratch array.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reported-by: Dave Airlie <airlied@redhat.com>
Tested-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-25 07:10:14 +02:00
Alex Deucher
00b8e8ceec drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for DCE4.1
commit cb7cf41961 upstream.

The encoders are supposedly fully routeable, but changing the mapping
doesn't always seem to take.  Using a hardcoded mapping is much more
reliable.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=41366

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-16 14:14:54 -07:00
Alex Deucher
3450eab782 drm/radeon/kms: retry aux transactions if there are status flags
commit 4f332844cc upstream.

If there are error flags in the aux status, retry the transaction.
This makes aux much more reliable, especially on llano systems.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-16 14:14:54 -07:00
Alex Deucher
416a1b0477 drm/radeon/kms: fix channel_remap setup (v2)
commit 12d5180bd7 upstream.

Most asics just use the hw default value which requires
no explicit programming.  For those that need a different
value, the vbios will program it properly.  As such,
there's no need to program these registers explicitly
in the driver.  Changing MC_SHARED_CHREMAP requires a reload
of all data in vram otherwise its contents will be scambled.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=40103

v2: drop now unused channel_remap functions.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-16 14:14:52 -07:00
Alex Deucher
c6e2e6abef drm/radeon/kms: add retry limits for native DP aux defer
commit 6375bda073 upstream.

The previous code could potentially loop forever.  Limit
the number of DP aux defer retries to 4 for native aux
transactions, same as i2c over aux transactions.

Noticed by: Brad Campbell <lists2009@fnarfbargle.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Brad Campbell <lists2009@fnarfbargle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-16 14:14:52 -07:00
Alex Deucher
290771305e drm/radeon/kms: fix regression in DP aux defer handling
commit 109bc10d30 upstream.

An incorrect ordering in the error checking code lead
to DP aux defer being skipped in the aux native write
path.  Move the bytes transferred check (ret == 0)
below the defer check.

Tracked down by: Brad Campbell <brad@fnarfbargle.com>

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=41121

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Brad Campbell <brad@fnarfbargle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-16 14:14:52 -07:00