Piteball
/
android_hardware_qcom_display
mirror of https://github.com/followmsi/android_hardware_qcom_display.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge changes I3621eb30,Ib67ba670,I722ed256 into oc-dev 

* changes:
  [DO NOT MERGE] msm8998: libgralloc: Fix adding offset to the mapped base address
  [DO NOT MERGE] msm8996: libgralloc: Fix adding offset to the mapped base address
  [DO NOT MERGE] msm8994: libgralloc: Fix adding offset to the mapped base address
This commit is contained in:
TreeHugger Robot 2017-10-17 01:54:22 +00:00 committed by Android (Google) Code Review
parent d74ebf2dcc f3abcf51ab
commit 5abba5cb83
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msm8994/libgralloc/mapper.cpp
View File

@ -73,7 +73,7 @@ static int gralloc_map_metadata(buffer_handle_t handle) {
hnd, hnd->fd_metadata, strerror(errno));
return -errno;
}
hnd->base_metadata = uint64_t(mappedAddress) + hnd->offset_metadata;
hnd->base_metadata = uint64_t(mappedAddress);
}
return 0;
}
@ -104,7 +104,7 @@ static int gralloc_map(gralloc_module_t const* module,
return -errno;
}
hnd->base = uint64_t(mappedAddress) + hnd->offset;
hnd->base = uint64_t(mappedAddress);
} else {
// Cannot map secure buffers or framebuffers, but still need to map
// metadata for secure buffers.

4
msm8996/libgralloc/mapper.cpp
View File

@ -73,7 +73,7 @@ static int gralloc_map_metadata(buffer_handle_t handle) {
hnd, hnd->fd_metadata, strerror(errno));
return -errno;
}
hnd->base_metadata = uint64_t(mappedAddress) + hnd->offset_metadata;
hnd->base_metadata = uint64_t(mappedAddress);
}
return 0;
}
@ -104,7 +104,7 @@ static int gralloc_map(gralloc_module_t const* module,
return -errno;
}
hnd->base = uint64_t(mappedAddress) + hnd->offset;
hnd->base = uint64_t(mappedAddress);
} else {
// Cannot map secure buffers or framebuffers, but still need to map
// metadata for secure buffers.

4
msm8998/libgralloc/mapper.cpp
View File

@ -71,7 +71,7 @@ static int gralloc_map_metadata(buffer_handle_t handle) {
hnd, hnd->fd_metadata, strerror(errno));
return -errno;
}
hnd->base_metadata = uint64_t(mappedAddress) + hnd->offset_metadata;
hnd->base_metadata = uint64_t(mappedAddress);
}
return 0;
}
@ -102,7 +102,7 @@ static int gralloc_map(gralloc_module_t const* module,
return -errno;
}
hnd->base = uint64_t(mappedAddress) + hnd->offset;
hnd->base = uint64_t(mappedAddress);
} else {
// Cannot map secure buffers or framebuffers, but still need to map
// metadata for secure buffers.