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

resolve merge conflicts of 5abba5cb to oc-dr1-dev 

Bug: 63662821
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8f4539b80c542b1212a090a45fbb7b2dfd5ce274
This commit is contained in:
Steve Pfetsch 2017-10-17 10:59:24 -07:00
parent 7a80115acf 5abba5cb83
commit 812125f118
2 changed files with 4 additions and 4 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.