This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "DRM driver for VIA IGPs".
The branch, master has been updated
via fb00c5aeefdad1ba0274971ec2071e157f0a11d9 (commit)
via c72c0f1193676d48bffd12d10d0bf93c336b1acf (commit)
via ac1f388a593d08356d37d9d2b6d630ff17ba0152 (commit)
from f3ab97ba782d7a5b245c5be8a8226c22700983a8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fb00c5aeefdad1ba0274971ec2071e157f0a11d9
Merge: c72c0f1 f3ab97b
Author: James Simmons <[email protected]>
Date: Mon Dec 29 22:32:08 2014 -0500
Merge branch 'master' of git.freedesktop.org:/git/openchrome/drm-openchrome
Conflicts:
drivers/gpu/drm/via/ttm_gem.c
drivers/gpu/drm/via/via_drv.h
drivers/gpu/drm/via/via_fb.c
commit c72c0f1193676d48bffd12d10d0bf93c336b1acf
Author: James Simmons <[email protected]>
Date: Sun Dec 28 17:19:06 2014 -0500
drm/via: Remove dependency on gem object private field
In newer kernels the private field in struct drm_gem_object
disappears. Also gem_object_init() handling will migrate to
gem_object_open() so we preform this update here. Added a
header to expose struct ttm_heap to the GEM handling code.
Signed-off-by: James Simmons <[email protected]>
commit ac1f388a593d08356d37d9d2b6d630ff17ba0152
Author: James Simmons <[email protected]>
Date: Sat Dec 27 14:40:12 2014 -0500
drm/via: Remove GEM handling out of ttm_bo_allocate
The function ttm_bo_allocate assumes that the GEM object
will be created before the ttm_buffer_object which might
not be the case. So we move the shem handling in
ttm_bo_allocate to the gem handling code.
Signed-off-by: James Simmons <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
drivers/gpu/drm/via/init_ttm.c | 10 +----
drivers/gpu/drm/via/ttm_gem.c | 65 +++++++++++++++++++++++----------
drivers/gpu/drm/via/via_crtc.c | 12 +++---
drivers/gpu/drm/via/via_drv.c | 23 +++++++-----
drivers/gpu/drm/via/via_drv.h | 38 +------------------
drivers/gpu/drm/via/via_fb.c | 11 +++---
drivers/gpu/drm/via/via_ioc32.c | 30 ++++++++-------
drivers/gpu/drm/via/via_mem.h | 77 +++++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/via/via_ttm.c | 4 +-
9 files changed, 169 insertions(+), 101 deletions(-)
create mode 100644 drivers/gpu/drm/via/via_mem.h
hooks/post-receive
--
DRM driver for VIA IGPs
_______________________________________________
Openchrome-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/openchrome-devel
