summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6560b47)
raw | patch | inline | side by side (parent: 6560b47)
author | Eric Anholt <eric@anholt.net> | |
Mon, 1 Nov 2010 13:54:58 +0000 (06:54 -0700) | ||
committer | Eric Anholt <eric@anholt.net> | |
Mon, 1 Nov 2010 13:54:58 +0000 (06:54 -0700) |
intel/intel_bufmgr.c | patch | blob | history | |
intel/intel_bufmgr_fake.c | patch | blob | history |
diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index 2b4e888304d42e6a4ab0bf6a638fc172198ef1e2..f93a87078c8062b5f1f37fbb6ea1e162eeb3d36a 100644 (file)
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
drm_intel_bo_subdata(drm_intel_bo *bo, unsigned long offset,
unsigned long size, const void *data)
{
- int ret;
-
- if (bo->bufmgr->bo_subdata)
- return bo->bufmgr->bo_subdata(bo, offset, size, data);
- if (size == 0 || data == NULL)
- return 0;
-
- ret = drm_intel_bo_map(bo, 1);
- if (ret)
- return ret;
- memcpy((unsigned char *)bo->virtual + offset, data, size);
- drm_intel_bo_unmap(bo);
- return 0;
+ return bo->bufmgr->bo_subdata(bo, offset, size, data);
}
int
index bc4a2ff9f196b3accb4d5f66dda02a8303b0f232..d9b5cfdc89525f86dfd9ef1950ee213a261bbe0c 100644 (file)
return ret;
}
+static int
+drm_intel_fake_bo_subdata(drm_intel_bo *bo, unsigned long offset,
+ unsigned long size, const void *data)
+{
+ int ret;
+
+ if (size == 0 || data == NULL)
+ return 0;
+
+ ret = drm_intel_bo_map(bo, 1);
+ if (ret)
+ return ret;
+ memcpy((unsigned char *)bo->virtual + offset, data, size);
+ drm_intel_bo_unmap(bo);
+ return 0;
+}
+
static void
drm_intel_fake_kick_all_locked(drm_intel_bufmgr_fake *bufmgr_fake)
{
bufmgr_fake->bufmgr.bo_unreference = drm_intel_fake_bo_unreference;
bufmgr_fake->bufmgr.bo_map = drm_intel_fake_bo_map;
bufmgr_fake->bufmgr.bo_unmap = drm_intel_fake_bo_unmap;
+ bufmgr_fake->bufmgr.bo_subdata = drm_intel_fake_bo_subdata;
bufmgr_fake->bufmgr.bo_wait_rendering =
drm_intel_fake_bo_wait_rendering;
bufmgr_fake->bufmgr.bo_emit_reloc = drm_intel_fake_emit_reloc;