diff options
| author | Jinhyung Jo <jinhyung.jo@samsung.com> | 2017-05-12 17:17:03 +0900 |
|---|---|---|
| committer | Jinhyung Jo <jinhyung.jo@samsung.com> | 2017-05-12 17:18:50 +0900 |
| commit | 784bb5e93628686cb3cb0b06636d60a1b86908bc (patch) | |
| tree | 4963c7e7381ffb631d13438ac2c484f868ac8ef0 | |
| parent | 5861eaa1fafabd160c70ecb721e6588999560cf1 (diff) | |
| parent | 37a85fd684cee5005408ce525838b4880bb09d18 (diff) | |
| download | emulator-kernel-784bb5e93628686cb3cb0b06636d60a1b86908bc.tar.gz emulator-kernel-784bb5e93628686cb3cb0b06636d60a1b86908bc.tar.bz2 emulator-kernel-784bb5e93628686cb3cb0b06636d60a1b86908bc.zip | |
Merge branch 'develop' into tizen_studio_p4.0
Change-Id: Ie8774442fbf7b4f7c61963598728e00a9445e7a9
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
| -rw-r--r-- | drivers/gpu/drm/vigs/vigs_mman.c | 6 | ||||
| -rw-r--r-- | package/changelog | 3 | ||||
| -rw-r--r-- | package/pkginfo.manifest | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vigs/vigs_mman.c b/drivers/gpu/drm/vigs/vigs_mman.c index fa22fdd18edf..9440d44c40fb 100644 --- a/drivers/gpu/drm/vigs/vigs_mman.c +++ b/drivers/gpu/drm/vigs/vigs_mman.c @@ -309,6 +309,11 @@ static int vigs_ttm_fault_reserve_notify(struct ttm_buffer_object *bo) return 0; } +void vigs_ttm_swap_notify(struct ttm_buffer_object *bo) +{ + ttm_tt_unbind(bo->ttm); +} + static int vigs_ttm_io_mem_reserve(struct ttm_bo_device *bo_dev, struct ttm_mem_reg *mem) { @@ -362,6 +367,7 @@ static struct ttm_bo_driver vigs_ttm_bo_driver = .move = &vigs_ttm_move, .verify_access = &vigs_ttm_verify_access, .fault_reserve_notify = &vigs_ttm_fault_reserve_notify, + .swap_notify = &vigs_ttm_swap_notify, .io_mem_reserve = &vigs_ttm_io_mem_reserve, .io_mem_free = &vigs_ttm_io_mem_free, }; diff --git a/package/changelog b/package/changelog index df5ea3cbe7b9..7e4d36505247 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 4.4.35.3 +- unbind ttm bo before swapout in vigs +== Jinhyung Jo <jinhyung.jo@samsung.com> 2017-05-12 * 4.4.35.2 - unify packaging regardless of version == Jinhyung Jo <jinhyung.jo@samsung.com> 2017-03-06 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 1ee6a47586fa..4b9b35137ce5 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source: emulator-kernel -Version: 4.4.35.2 +Version: 4.4.35.3 Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com> Package: 4.0-emulator-kernel-x86 |