LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwc: gpu_tonemapper: Create Secure EGL Context

Browse Source 
- HWC tonemapper passes secure flag to GPU tonemapper to create object
  with secure EGL context.
- Tonemapper object gets created with secure EGL context for the tone
  mapping of secure HDR layer.

CRs-Fixed: 2048764
Change-Id: I7129505283527dbab17f1e9731d8f141b48bb310
This commit is contained in:
Sushil Chauhan
2017-05-02 17:09:47 -07:00
committed by Gerrit - the friendly Code Review server
parent ec4b547fbf
commit 70bc2c01f0
9 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gpu_tonemapper/EGLImageBuffer.cpp
View File

@@ -24,7 +24,6 @@
#include <map>
#include "EGLImageWrapper.h"
#include "glengine.h"
#define EGL_PROTECTED_CONTENT_EXT 0x32C0
//-----------------------------------------------------------------------------
EGLImageKHR create_eglImage(android::sp<android::GraphicBuffer> graphicBuffer)

4
gpu_tonemapper/TonemapFactory.cpp
View File

@@ -24,11 +24,11 @@
//----------------------------------------------------------------------------------------------------------------------------------------------------------
Tonemapper *TonemapperFactory_GetInstance(int type, void *colorMap, int colorMapSize,
void *lutXform, int lutXformSize)
void *lutXform, int lutXformSize, bool isSecure)
//----------------------------------------------------------------------------------------------------------------------------------------------------------
{
// build the tonemapper
Tonemapper *tonemapper = Tonemapper::build(type, colorMap, colorMapSize, lutXform, lutXformSize);
Tonemapper *tonemapper = Tonemapper::build(type, colorMap, colorMapSize, lutXform, lutXformSize, isSecure);
return tonemapper;
}

2
gpu_tonemapper/TonemapFactory.h
View File

@@ -28,7 +28,7 @@ extern "C" {
// returns an instance of Tonemapper
Tonemapper *TonemapperFactory_GetInstance(int type, void *colorMap, int colorMapSize,
void *lutXform, int lutXformSize);
void *lutXform, int lutXformSize, bool isSecure);
#ifdef __cplusplus
}

4
gpu_tonemapper/Tonemapper.cpp
View File

@@ -65,7 +65,7 @@ Tonemapper::~Tonemapper()
//-----------------------------------------------------------------------------
Tonemapper *Tonemapper::build(int type, void *colorMap, int colorMapSize, void *lutXform,
int lutXformSize)
int lutXformSize, bool isSecure)
//-----------------------------------------------------------------------------
{
if (colorMapSize <= 0) {
@@ -76,7 +76,7 @@ Tonemapper *Tonemapper::build(int type, void *colorMap, int colorMapSize, void *
// build new tonemapper
Tonemapper *tonemapper = new Tonemapper();
tonemapper->engineContext = engine_initialize();
tonemapper->engineContext = engine_initialize(isSecure);
void* caller_context = engine_backup();
engine_bind(tonemapper->engineContext);

2
gpu_tonemapper/Tonemapper.h
View File

@@ -40,7 +40,7 @@ class Tonemapper {
public:
~Tonemapper();
static Tonemapper *build(int type, void *colorMap, int colorMapSize, void *lutXform,
int lutXformSize);
int lutXformSize, bool isSecure);
int blit(const void *dst, const void *src, int srcFenceFd);
};

2
gpu_tonemapper/engine.h
View File

@@ -20,7 +20,7 @@
#ifndef __TONEMAPPER_ENGINE_H__
#define __TONEMAPPER_ENGINE_H__
void* engine_initialize();
void* engine_initialize(bool isSecure);
void engine_bind(void*);
void* engine_backup();
void engine_free_backup(void*);

13
gpu_tonemapper/glengine.cpp
View File

@@ -70,7 +70,7 @@ void engine_free_backup(void* context)
//-----------------------------------------------------------------------------
// initialize GL
//
void* engine_initialize()
void* engine_initialize(bool isSecure)
//-----------------------------------------------------------------------------
{
EngineContext* engineContext = new EngineContext();
@@ -94,11 +94,18 @@ void* engine_initialize()
EGL(eglChooseConfig(engineContext->eglDisplay, eglConfigAttribList, &eglConfig, 1, &numConfig));
// context
EGLint eglContextAttribList[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
EGLint eglContextAttribList[] = {EGL_CONTEXT_CLIENT_VERSION, 3,
isSecure ? EGL_PROTECTED_CONTENT_EXT : EGL_NONE,
isSecure ? EGL_TRUE : EGL_NONE,
EGL_NONE};
engineContext->eglContext = eglCreateContext(engineContext->eglDisplay, eglConfig, NULL, eglContextAttribList);
// surface
EGLint eglSurfaceAttribList[] = {EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE, EGL_NONE};
EGLint eglSurfaceAttribList[] = {EGL_WIDTH, 1,
EGL_HEIGHT, 1,
isSecure ? EGL_PROTECTED_CONTENT_EXT : EGL_NONE,
isSecure ? EGL_TRUE : EGL_NONE,
EGL_NONE};
engineContext->eglSurface = eglCreatePbufferSurface(engineContext->eglDisplay, eglConfig, eglSurfaceAttribList);
eglMakeCurrent(engineContext->eglDisplay, engineContext->eglSurface, engineContext->eglSurface, engineContext->eglContext);

2
gpu_tonemapper/glengine.h
View File

@@ -39,6 +39,8 @@
checkEglError(__FILE__, __LINE__);
#endif
#define EGL_PROTECTED_CONTENT_EXT 0x32C0
void checkGlError(const char *file, int line);
void checkEglError(const char *file, int line);

3
sdm/libs/hwc/hwc_tonemapper.cpp
View File

@@ -303,7 +303,8 @@ DisplayError HWCToneMapper::AcquireToneMapSession(Layer *layer, uint32_t *sessio
session->gpu_tone_mapper_ = TonemapperFactory_GetInstance(session->tone_map_config_.type,
layer->lut_3d.lutEntries,
layer->lut_3d.dim,
grid_entries, grid_size);
grid_entries, grid_size,
session->tone_map_config_.secure);
if (session->gpu_tone_mapper_ == NULL) {
DLOGE("Get Tonemapper failed!");