From: sangwook lee Date: Thu, 23 Jun 2022 04:49:19 +0000 (+0900) Subject: "revert it for testing" X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_studio_4.5_p6.5_test2;p=sdk%2Femulator%2Femulator-kernel.git "revert it for testing" Change-Id: Ic50a55803a9bc58374ec806adf87bfea2e5f2508 Signed-off-by: sangwook lee --- diff --git a/arch/x86/configs/tizen_emul_defconfig b/arch/x86/configs/tizen_emul_defconfig index 18662751e376..763b04d16f87 100644 --- a/arch/x86/configs/tizen_emul_defconfig +++ b/arch/x86/configs/tizen_emul_defconfig @@ -3116,7 +3116,7 @@ CONFIG_STAGING=y # Android # # CONFIG_ASHMEM is not set -# CONFIG_ANDROID_LOGGER is not set +CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_TIMED_OUTPUT=y # CONFIG_ANDROID_TIMED_GPIO is not set # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set diff --git a/drivers/gpu/drm/vigs/vigs_output.c b/drivers/gpu/drm/vigs/vigs_output.c index 3684759e56cf..47603cbbdd8c 100644 --- a/drivers/gpu/drm/vigs/vigs_output.c +++ b/drivers/gpu/drm/vigs/vigs_output.c @@ -4,8 +4,8 @@ #include #define DPI_DEF_VALUE 316 -#define DPI_MIN_VALUE 1 -#define DPI_MAX_VALUE 1000 +#define DPI_MIN_VALUE 100 +#define DPI_MAX_VALUE 600 #ifndef MODULE static int vigs_atoi(const char *str) @@ -280,10 +280,9 @@ int vigs_output_get_dpi(void) if (str != NULL) { str += 4; dpi = vigs_atoi(str); - if (dpi < DPI_MIN_VALUE) - dpi = DPI_MIN_VALUE; - else if (dpi > DPI_MAX_VALUE) - dpi = DPI_MAX_VALUE; + if ((dpi < DPI_MIN_VALUE) || (dpi > DPI_MAX_VALUE)) { + dpi = DPI_DEF_VALUE; + } } #endif return dpi; diff --git a/package/changelog b/package/changelog index f263e3defcd9..78362abf485c 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 4.4.35.25 +- Revert it for testing +== Sangwook Lee 2022-06-23 * 4.4.35.24 - Disable ANDROID_LOGGER == Chanwoo Choi 2022-01-11 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index b58710dc13b2..6d3ba295a0d5 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source: emulator-kernel -Version: 4.4.35.24 +Version: 4.4.35.25 Maintainer: SeokYeon Hwang Package: 6.5-emulator-kernel-x86