Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62dcf7b5 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Steve Kondik
Browse files

ui: exynos4: getphys is common 

Change-Id: I1dc9c2ced0700072e7c30c8435676873b10c7026

Conflicts:
	include/ui/GraphicBufferMapper.h
	libs/ui/GraphicBufferMapper.cpp
parent 1c60a74a

include/ui/GraphicBufferMapper.h

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public: 


    status_t unlock(buffer_handle_t handle);



#ifdef EXYNOS4210_ENHANCEMENTS

#ifdef EXYNOS4_ENHANCEMENTS

    status_t getphys(buffer_handle_t handle, void** paddr);

#endif

libs/ui/GraphicBufferMapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ status_t GraphicBufferMapper::unlock(buffer_handle_t handle) 
    return err;

}



#ifdef EXYNOS4210_ENHANCEMENTS

#ifdef EXYNOS4_ENHANCEMENTS

status_t GraphicBufferMapper::getphys(buffer_handle_t handle, void** paddr)

{

    status_t err;