diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-25 11:06:23 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-25 11:06:23 +0000 |
| commit | 760ea850d39dcd4bd498f5da2bce2d19aafe5cfe (patch) | |
| tree | ec7631db84f658ba7435f795ca1703f3443bd238 | |
| parent | 8949bbaaf415725c016728ce5e96fc36a92d4643 (diff) | |
| parent | 0c1c47e76716c11152ff5e9b3f679797139bae67 (diff) | |
| download | mt8516-v4.4-760ea850d39dcd4bd498f5da2bce2d19aafe5cfe.tar.gz | |
Snap for 5333343 from 0c1c47e76716c11152ff5e9b3f679797139bae67 to oc-mr1-1.7-iot-release
Change-Id: I20d41bbe0d6d22de669141581de5bffaf7b486cb
| -rw-r--r-- | drivers/misc/mediatek/video/mt8167/videox/mtkfb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/mediatek/video/mt8167/videox/mtkfb.c b/drivers/misc/mediatek/video/mt8167/videox/mtkfb.c index 363d92167a0f..5966496a7a9a 100644 --- a/drivers/misc/mediatek/video/mt8167/videox/mtkfb.c +++ b/drivers/misc/mediatek/video/mt8167/videox/mtkfb.c @@ -2446,11 +2446,13 @@ static int mtkfb_probe(struct platform_device *pdev) if (disp_helper_get_stage() != DISP_HELPER_STAGE_NORMAL) primary_display_diagnose(); - /* this function will get fb_heap base address to ion for management frame buffer */ +#ifndef MTK_ONLY_KERNEL_DISP + /* this function will get fb_heap base address to ion for management frame buffer*/ DISPPRINT("ion map framebuffer base=0x%p, fb total size=%d DAL size=%d\n", (void *)mtkfb_get_fb_base(), (unsigned int)mtkfb_get_fb_size(), (unsigned int)DAL_GetLayerSize()); ion_drv_create_FB_heap(mtkfb_get_fb_base(), mtkfb_get_fb_size() - DAL_GetLayerSize()); +#endif fbdev->state = MTKFB_ACTIVE; |