From 8c40b1bde094f6c60591bfd94e8ae39081ade999 Mon Sep 17 00:00:00 2001 From: Janghyuck Kim Date: Fri, 19 May 2017 11:17:01 +0900 Subject: [PATCH] [COMMON] media: scaler: remove csc table for DCI-P3 csc table for DCI-P3 is not used. Change-Id: I2fed0147641f1b37dc97d5395342a56f743bcba9 Signed-off-by: Janghyuck Kim --- drivers/media/platform/exynos/scaler/scaler-core.c | 2 +- drivers/media/platform/exynos/scaler/scaler-regs.c | 13 ------------- drivers/media/platform/exynos/scaler/scaler.h | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/media/platform/exynos/scaler/scaler-core.c b/drivers/media/platform/exynos/scaler/scaler-core.c index ab0157ad574b..ce353e0b4ed3 100644 --- a/drivers/media/platform/exynos/scaler/scaler-core.c +++ b/drivers/media/platform/exynos/scaler/scaler-core.c @@ -1947,7 +1947,7 @@ static const struct v4l2_ctrl_config sc_custom_ctrl[] = { .flags = V4L2_CTRL_FLAG_SLIDER, .step = 1, .min = V4L2_COLORSPACE_DEFAULT, - .max = V4L2_COLORSPACE_DCI_P3, + .max = V4L2_COLORSPACE_BT2020, .def = V4L2_COLORSPACE_DEFAULT, }, { .ops = &sc_ctrl_ops, diff --git a/drivers/media/platform/exynos/scaler/scaler-regs.c b/drivers/media/platform/exynos/scaler/scaler-regs.c index a3ac5bf77b07..8e0392468205 100644 --- a/drivers/media/platform/exynos/scaler/scaler-regs.c +++ b/drivers/media/platform/exynos/scaler/scaler-regs.c @@ -526,10 +526,6 @@ static struct sc_csc_tab sc_y2r = { { 0x254, 0x000, 0x36F, 0x254, 0xF9E, 0xEAC, 0x254, 0x461, 0x000 }, /* BT.2020 Wide */ { 0x200, 0x000, 0x2F3, 0x200, 0xFAC, 0xEDB, 0x200, 0x3C3, 0x000 }, - /* DCI-P3 Narrow */ - { 0x254, 0x000, 0x3AE, 0x254, 0xF96, 0xEEE, 0x254, 0x456, 0x000 }, - /* DCI-P3 Wide */ - { 0x200, 0x000, 0x329, 0x200, 0xFA5, 0xF15, 0x200, 0x3B9, 0x000 }, }; static struct sc_csc_tab sc_r2y = { @@ -545,10 +541,6 @@ static struct sc_csc_tab sc_r2y = { { 0x087, 0x15B, 0x01E, 0xFB9, 0xF47, 0x100, 0x100, 0xF15, 0xFEB }, /* BT.2020 Wide */ { 0x087, 0x15B, 0x01E, 0xFB9, 0xF47, 0x100, 0x100, 0xF15, 0xFEB }, - /* TODO: DCI-P3 Narrow */ - { 0x06B, 0x171, 0x023, 0xFC6, 0xF3A, 0x100, 0x100, 0xF16, 0xFEA }, - /* DCI-P3 Wide */ - { 0x06B, 0x171, 0x023, 0xFC6, 0xF3A, 0x100, 0x100, 0xF16, 0xFEA }, }; static struct sc_csc_tab *sc_csc_list[] = { @@ -741,11 +733,6 @@ void sc_hwset_csc_coef(struct sc_dev *sc, enum sc_csc_idx idx, csc_eq_val = sc_csc_list[idx]->narrow_2020; else csc_eq_val = sc_csc_list[idx]->wide_2020; - } else if (csc->csc_eq == V4L2_COLORSPACE_DCI_P3) { - if (csc->csc_range == SC_CSC_NARROW) - csc_eq_val = sc_csc_list[idx]->narrow_p3; - else - csc_eq_val = sc_csc_list[idx]->wide_p3; } else { if (csc->csc_range == SC_CSC_NARROW) csc_eq_val = sc_csc_list[idx]->narrow_601; diff --git a/drivers/media/platform/exynos/scaler/scaler.h b/drivers/media/platform/exynos/scaler/scaler.h index 47db733bcde0..89012f6dbe39 100644 --- a/drivers/media/platform/exynos/scaler/scaler.h +++ b/drivers/media/platform/exynos/scaler/scaler.h @@ -125,8 +125,6 @@ struct sc_csc_tab { int wide_709[9]; int narrow_2020[9]; int wide_2020[9]; - int narrow_p3[9]; - int wide_p3[9]; }; enum sc_clk_status { -- 2.20.1