gpu: ipu-v3: ipu-ic: Remove unused ipu_ic_task_graphics_init

ipu_ic_task_graphics_init() was added in 2014 by
commit 1aa8ea0d2bd5 ("gpu: ipu-v3: Add Image Converter unit")
but has been unused.

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241226022752.219399-2-linux@treblig.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/ipu-v3/ipu-ic.c
index 846461bac70da912809384a4eb74bccd9fa80749..acd76ecc5221555251983650719594cbdd45df91 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-ic.c
+++ b/drivers/gpu/ipu-v3/ipu-ic.c
@@ -321,79 +321,6 @@ void ipu_ic_task_disable(struct ipu_ic *ic)
 }
 EXPORT_SYMBOL_GPL(ipu_ic_task_disable);
 
-int ipu_ic_task_graphics_init(struct ipu_ic *ic,
-                             const struct ipu_ic_colorspace *g_in_cs,
-                             bool galpha_en, u32 galpha,
-                             bool colorkey_en, u32 colorkey)
-{
-       struct ipu_ic_priv *priv = ic->priv;
-       struct ipu_ic_csc csc2;
-       unsigned long flags;
-       u32 reg, ic_conf;
-       int ret = 0;
-
-       if (ic->task == IC_TASK_ENCODER)
-               return -EINVAL;
-
-       spin_lock_irqsave(&priv->lock, flags);
-
-       ic_conf = ipu_ic_read(ic, IC_CONF);
-
-       if (!(ic_conf & ic->bit->ic_conf_csc1_en)) {
-               struct ipu_ic_csc csc1;
-
-               ret = ipu_ic_calc_csc(&csc1,
-                                     V4L2_YCBCR_ENC_601,
-                                     V4L2_QUANTIZATION_FULL_RANGE,
-                                     IPUV3_COLORSPACE_RGB,
-                                     V4L2_YCBCR_ENC_601,
-                                     V4L2_QUANTIZATION_FULL_RANGE,
-                                     IPUV3_COLORSPACE_RGB);
-               if (ret)
-                       goto unlock;
-
-               /* need transparent CSC1 conversion */
-               ret = init_csc(ic, &csc1, 0);
-               if (ret)
-                       goto unlock;
-       }
-
-       ic->g_in_cs = *g_in_cs;
-       csc2.in_cs = ic->g_in_cs;
-       csc2.out_cs = ic->out_cs;
-
-       ret = __ipu_ic_calc_csc(&csc2);
-       if (ret)
-               goto unlock;
-
-       ret = init_csc(ic, &csc2, 1);
-       if (ret)
-               goto unlock;
-
-       if (galpha_en) {
-               ic_conf |= IC_CONF_IC_GLB_LOC_A;
-               reg = ipu_ic_read(ic, IC_CMBP_1);
-               reg &= ~(0xff << ic->bit->ic_cmb_galpha_bit);
-               reg |= (galpha << ic->bit->ic_cmb_galpha_bit);
-               ipu_ic_write(ic, reg, IC_CMBP_1);
-       } else
-               ic_conf &= ~IC_CONF_IC_GLB_LOC_A;
-
-       if (colorkey_en) {
-               ic_conf |= IC_CONF_KEY_COLOR_EN;
-               ipu_ic_write(ic, colorkey, IC_CMBP_2);
-       } else
-               ic_conf &= ~IC_CONF_KEY_COLOR_EN;
-
-       ipu_ic_write(ic, ic_conf, IC_CONF);
-
-       ic->graphics = true;
-unlock:
-       spin_unlock_irqrestore(&priv->lock, flags);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(ipu_ic_task_graphics_init);
-
 int ipu_ic_task_init_rsc(struct ipu_ic *ic,
                         const struct ipu_ic_csc *csc,
                         int in_width, int in_height,

diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index c422a403c0990d51c3e81d27f881fb5976a44150..0bb1d714cbf54369fae9ca5a68030923be14d855 100644 (file)
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -445,10 +445,6 @@ int ipu_ic_task_init_rsc(struct ipu_ic *ic,
                         int in_width, int in_height,
                         int out_width, int out_height,
                         u32 rsc);
-int ipu_ic_task_graphics_init(struct ipu_ic *ic,
-                             const struct ipu_ic_colorspace *g_in_cs,
-                             bool galpha_en, u32 galpha,
-                             bool colorkey_en, u32 colorkey);
 void ipu_ic_task_enable(struct ipu_ic *ic);
 void ipu_ic_task_disable(struct ipu_ic *ic);
 int ipu_ic_task_idma_init(struct ipu_ic *ic, struct ipuv3_channel *channel,