diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-08-01 09:12:10 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-08-01 09:12:10 (GMT) |
| commit | 209fb1b7e298c5f5a93a9450bc9e9e7923f745d9 (patch) | |
| tree | 27cbfa78e5eeaceb2aae1c165f7f0e24f6fee286 /drivers/gpu/drm/qxl/qxl_object.h | |
| parent | a8d30608eaed6cc759b8e2e8a8bbbb42591f797f (diff) | |
| parent | 3fef7f795fff7ccc58d55a28315ca73305515884 (diff) | |
| download | linux-fsl-qoriq-209fb1b7e298c5f5a93a9450bc9e9e7923f745d9.tar.xz | |
Merge tag 'asoc-v3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11
A fix to make sure userspace knows when control writes have caused a
change in value, fixing some UIs, plus a few few driver fixes mainly
cleaning up issues from recent refactorings on less mainstream platforms.
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_object.h')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_object.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h index ee7ad79..8cb6167 100644 --- a/drivers/gpu/drm/qxl/qxl_object.h +++ b/drivers/gpu/drm/qxl/qxl_object.h @@ -88,7 +88,7 @@ static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type, extern int qxl_bo_create(struct qxl_device *qdev, unsigned long size, - bool kernel, u32 domain, + bool kernel, bool pinned, u32 domain, struct qxl_surface *surf, struct qxl_bo **bo_ptr); extern int qxl_bo_kmap(struct qxl_bo *bo, void **ptr); @@ -99,9 +99,7 @@ extern struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo); extern void qxl_bo_unref(struct qxl_bo **bo); extern int qxl_bo_pin(struct qxl_bo *bo, u32 domain, u64 *gpu_addr); extern int qxl_bo_unpin(struct qxl_bo *bo); -extern void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain); +extern void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain, bool pinned); extern bool qxl_ttm_bo_is_qxl_bo(struct ttm_buffer_object *bo); -extern int qxl_bo_list_add(struct qxl_reloc_list *reloc_list, struct qxl_bo *bo); -extern void qxl_bo_list_unreserve(struct qxl_reloc_list *reloc_list, bool failed); #endif |