diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-18 17:04:24 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-18 17:04:24 +0000 |
| commit | 9c44e92418489d1d773a3dc2406608ebba23cc13 (patch) | |
| tree | edeb83edad46d65f40cc5e38221b6734b4d2a4e2 | |
| parent | 6f1408a52a34ac2d65085ae7f21bc13655220b2a (diff) | |
| parent | 058a6f9bf2a2c85974e5f8001dc5d8d68969390d (diff) | |
| download | platform_hardware_qcom_display-oreo-m6-s3-release.tar.gz platform_hardware_qcom_display-oreo-m6-s3-release.tar.bz2 platform_hardware_qcom_display-oreo-m6-s3-release.zip | |
Snap for 4402310 from 058a6f9bf2a2c85974e5f8001dc5d8d68969390d to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: Ia23dab15015db6f9b2bd509d83579ced7b628553
| -rw-r--r-- | msm8994/libgralloc/mapper.cpp | 4 | ||||
| -rw-r--r-- | msm8996/libgralloc/mapper.cpp | 4 | ||||
| -rw-r--r-- | msm8998/libqdutils/qdMetaData.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/msm8994/libgralloc/mapper.cpp b/msm8994/libgralloc/mapper.cpp index 0b091fb4..8df761ee 100644 --- a/msm8994/libgralloc/mapper.cpp +++ b/msm8994/libgralloc/mapper.cpp @@ -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. diff --git a/msm8996/libgralloc/mapper.cpp b/msm8996/libgralloc/mapper.cpp index 2ecb491c..77e761d2 100644 --- a/msm8996/libgralloc/mapper.cpp +++ b/msm8996/libgralloc/mapper.cpp @@ -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. diff --git a/msm8998/libqdutils/qdMetaData.cpp b/msm8998/libqdutils/qdMetaData.cpp index 783006d7..0860c816 100644 --- a/msm8998/libqdutils/qdMetaData.cpp +++ b/msm8998/libqdutils/qdMetaData.cpp @@ -37,8 +37,8 @@ static int validateAndMap(private_handle_t* handle) { if (private_handle_t::validate(handle)) { - ALOGE("%s: Private handle is invalid - handle:%p id: %" PRIu64, - __func__, handle, handle->id); + ALOGE("%s: Private handle is invalid - handle:%p", + __func__, handle); return -1; } if (handle->fd_metadata == -1) { |