diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2016-02-25 09:16:25 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:15:52 -0700 |
| commit | 56930b9f1730d6cdaf59da6000cfe0ca71f90f15 (patch) | |
| tree | 632046dee775a570ea6391474d6aba9492631104 /drivers/gpu/msm/adreno_cp_parser.c | |
| parent | 318be96313dcf3828b02937e5aae38e9f862acf3 (diff) | |
msm: kgsl: Update various exernal APIs for the 4.4 kernel
Make several changes to build the GPU driver for 4.4:
- Rename CONFIG_MSM to CONFIG_QCOM where applicable
- Add msm_kgsl.h to the Kbuild exports
- Remove linux/coresight_of.h (as it has been merged into
coresight.h) and remove the .owner member of the
coresight_desc struct.
- Use the new location for the sync.h file (in staging)
- Remove an unused sync function
- Move oneshot_sync.h inside of #ifdef wrappers
Signed-off-by: Jordan Crouse <jcrouse@codeauorora.org>
Diffstat (limited to 'drivers/gpu/msm/adreno_cp_parser.c')
| -rw-r--r-- | drivers/gpu/msm/adreno_cp_parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/msm/adreno_cp_parser.c b/drivers/gpu/msm/adreno_cp_parser.c index 4faf3a8319cb..4a444c27b8a4 100644 --- a/drivers/gpu/msm/adreno_cp_parser.c +++ b/drivers/gpu/msm/adreno_cp_parser.c @@ -799,13 +799,14 @@ static int adreno_cp_parse_ib2(struct kgsl_device *device, * only try to find sub objects iff this IB has * not been processed already */ - for (i = 0; i < ib_obj_list->num_objs; i++) + for (i = 0; i < ib_obj_list->num_objs; i++) { ib_obj = &(ib_obj_list->obj_list[i]); if ((SNAPSHOT_GPU_OBJECT_IB == ib_obj->snapshot_obj_type) && (gpuaddr >= ib_obj->gpuaddr) && (gpuaddr + dwords * sizeof(unsigned int) <= ib_obj->gpuaddr + ib_obj->size)) return 0; + } return adreno_ib_find_objs(device, process, gpuaddr, dwords, SNAPSHOT_GPU_OBJECT_IB, ib_obj_list, 2); |