From ddbbbb59ea5c8b8bb02eafd688621b4bdcfc8312 Mon Sep 17 00:00:00 2001 From: "Christopher N. Hesse" Date: Sun, 9 Jul 2017 11:05:37 +0200 Subject: [PATCH] display: Drop the 8890 specific hacks Now that the stride is calculated properly, we don't need any of this anymore. Change-Id: I8ce792ae456bded150166dfebee57b7e2f2ba3e7 --- libdisplay/Android.mk | 6 ------ libdisplay/ExynosOverlayDisplay.cpp | 5 ----- 2 files changed, 11 deletions(-) diff --git a/libdisplay/Android.mk b/libdisplay/Android.mk index 09ea74b..0741074 100644 --- a/libdisplay/Android.mk +++ b/libdisplay/Android.mk @@ -53,12 +53,6 @@ ifneq ($(filter exynos7420 exynos7580 exynos8890, $(TARGET_SOC)),) LOCAL_CFLAGS += -DDECON_FB endif -# Exynos 8890 Uses IDMA_G1 instead of the standard IDMA_G0 -# and needs forced parameters. -ifneq ($(filter exynos8890, $(TARGET_SOC)),) - LOCAL_CFLAGS += -DDECON_8890 -endif - LOCAL_CFLAGS += -DLOG_TAG=\"display\" LOCAL_C_INCLUDES := \ $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ diff --git a/libdisplay/ExynosOverlayDisplay.cpp b/libdisplay/ExynosOverlayDisplay.cpp index d09b2d7..1e9d0c8 100644 --- a/libdisplay/ExynosOverlayDisplay.cpp +++ b/libdisplay/ExynosOverlayDisplay.cpp @@ -216,10 +216,6 @@ void ExynosOverlayDisplay::configureHandle(private_handle_t *handle, // check MPP isRotated() val? ALOGE("%s: overlay is VPP type, but we cannot handle this!", __func__); } -#ifdef DECON_8890 - cfg.src = {0, 0, 1440, 2560, 1440, 2560}; - cfg.dst = {0, 0, 1440, 2560, 1440, 2560}; -#else cfg.dst.x = x; cfg.dst.y = y; cfg.dst.w = w; @@ -234,7 +230,6 @@ void ExynosOverlayDisplay::configureHandle(private_handle_t *handle, // Framebuffer linelength cfg.src.f_w = handle->stride; cfg.src.f_h = h; -#endif #else cfg.state = cfg.S3C_FB_WIN_STATE_BUFFER; cfg.fd = handle->fd;