Skip to content

Commit 16e3bf4

Browse files
Dr. David Alan Gilbertlumag
authored andcommitted
gpu: ipu-v3: ipu-ic: Remove unused ipu_ic_task_graphics_init
ipu_ic_task_graphics_init() was added in 2014 by commit 1aa8ea0 ("gpu: ipu-v3: Add Image Converter unit") but has been unused. Remove it. Signed-off-by: Dr. David Alan Gilbert <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent 049e7ac commit 16e3bf4

File tree

2 files changed

+0
-77
lines changed

2 files changed

+0
-77
lines changed

drivers/gpu/ipu-v3/ipu-ic.c

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -321,79 +321,6 @@ void ipu_ic_task_disable(struct ipu_ic *ic)
321321
}
322322
EXPORT_SYMBOL_GPL(ipu_ic_task_disable);
323323

324-
int ipu_ic_task_graphics_init(struct ipu_ic *ic,
325-
const struct ipu_ic_colorspace *g_in_cs,
326-
bool galpha_en, u32 galpha,
327-
bool colorkey_en, u32 colorkey)
328-
{
329-
struct ipu_ic_priv *priv = ic->priv;
330-
struct ipu_ic_csc csc2;
331-
unsigned long flags;
332-
u32 reg, ic_conf;
333-
int ret = 0;
334-
335-
if (ic->task == IC_TASK_ENCODER)
336-
return -EINVAL;
337-
338-
spin_lock_irqsave(&priv->lock, flags);
339-
340-
ic_conf = ipu_ic_read(ic, IC_CONF);
341-
342-
if (!(ic_conf & ic->bit->ic_conf_csc1_en)) {
343-
struct ipu_ic_csc csc1;
344-
345-
ret = ipu_ic_calc_csc(&csc1,
346-
V4L2_YCBCR_ENC_601,
347-
V4L2_QUANTIZATION_FULL_RANGE,
348-
IPUV3_COLORSPACE_RGB,
349-
V4L2_YCBCR_ENC_601,
350-
V4L2_QUANTIZATION_FULL_RANGE,
351-
IPUV3_COLORSPACE_RGB);
352-
if (ret)
353-
goto unlock;
354-
355-
/* need transparent CSC1 conversion */
356-
ret = init_csc(ic, &csc1, 0);
357-
if (ret)
358-
goto unlock;
359-
}
360-
361-
ic->g_in_cs = *g_in_cs;
362-
csc2.in_cs = ic->g_in_cs;
363-
csc2.out_cs = ic->out_cs;
364-
365-
ret = __ipu_ic_calc_csc(&csc2);
366-
if (ret)
367-
goto unlock;
368-
369-
ret = init_csc(ic, &csc2, 1);
370-
if (ret)
371-
goto unlock;
372-
373-
if (galpha_en) {
374-
ic_conf |= IC_CONF_IC_GLB_LOC_A;
375-
reg = ipu_ic_read(ic, IC_CMBP_1);
376-
reg &= ~(0xff << ic->bit->ic_cmb_galpha_bit);
377-
reg |= (galpha << ic->bit->ic_cmb_galpha_bit);
378-
ipu_ic_write(ic, reg, IC_CMBP_1);
379-
} else
380-
ic_conf &= ~IC_CONF_IC_GLB_LOC_A;
381-
382-
if (colorkey_en) {
383-
ic_conf |= IC_CONF_KEY_COLOR_EN;
384-
ipu_ic_write(ic, colorkey, IC_CMBP_2);
385-
} else
386-
ic_conf &= ~IC_CONF_KEY_COLOR_EN;
387-
388-
ipu_ic_write(ic, ic_conf, IC_CONF);
389-
390-
ic->graphics = true;
391-
unlock:
392-
spin_unlock_irqrestore(&priv->lock, flags);
393-
return ret;
394-
}
395-
EXPORT_SYMBOL_GPL(ipu_ic_task_graphics_init);
396-
397324
int ipu_ic_task_init_rsc(struct ipu_ic *ic,
398325
const struct ipu_ic_csc *csc,
399326
int in_width, int in_height,

include/video/imx-ipu-v3.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,6 @@ int ipu_ic_task_init_rsc(struct ipu_ic *ic,
445445
int in_width, int in_height,
446446
int out_width, int out_height,
447447
u32 rsc);
448-
int ipu_ic_task_graphics_init(struct ipu_ic *ic,
449-
const struct ipu_ic_colorspace *g_in_cs,
450-
bool galpha_en, u32 galpha,
451-
bool colorkey_en, u32 colorkey);
452448
void ipu_ic_task_enable(struct ipu_ic *ic);
453449
void ipu_ic_task_disable(struct ipu_ic *ic);
454450
int ipu_ic_task_idma_init(struct ipu_ic *ic, struct ipuv3_channel *channel,

0 commit comments

Comments
 (0)