summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c28
-rw-r--r--drivers/gpu/drm/msm/sde/sde_hw_wb.c32
2 files changed, 0 insertions, 60 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c b/drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c
index 3681de54f19a..e3310b9ab7ec 100644
--- a/drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c
+++ b/drivers/gpu/drm/msm/sde/sde_encoder_phys_wb.c
@@ -630,33 +630,6 @@ static void sde_encoder_phys_wb_mode_set(
}
/**
- * sde_encoder_phys_wb_control_vblank_irq - Control vblank interrupt
- * @phys_enc: Pointer to physical encoder
- * @enable: Enable interrupt
- */
-static int sde_encoder_phys_wb_control_vblank_irq(
- struct sde_encoder_phys *phys_enc,
- bool enable)
-{
- struct sde_encoder_phys_wb *wb_enc = to_sde_encoder_phys_wb(phys_enc);
- struct sde_hw_wb *hw_wb = wb_enc->hw_wb;
- int ret = 0;
-
- SDE_DEBUG("[wb:%d,%d]\n", hw_wb->idx - WB_0, enable);
-
- if (enable)
- ret = sde_encoder_phys_wb_register_irq(phys_enc);
- else
- ret = sde_encoder_phys_wb_unregister_irq(phys_enc);
-
- if (ret)
- SDE_ERROR("control vblank irq error %d, enable %d\n", ret,
- enable);
-
- return ret;
-}
-
-/**
* sde_encoder_phys_wb_wait_for_commit_done - wait until request is committed
* @phys_enc: Pointer to physical encoder
*/
@@ -962,7 +935,6 @@ static void sde_encoder_phys_wb_init_ops(struct sde_encoder_phys_ops *ops)
ops->destroy = sde_encoder_phys_wb_destroy;
ops->atomic_check = sde_encoder_phys_wb_atomic_check;
ops->get_hw_resources = sde_encoder_phys_wb_get_hw_resources;
- ops->control_vblank_irq = sde_encoder_phys_wb_control_vblank_irq;
ops->wait_for_commit_done = sde_encoder_phys_wb_wait_for_commit_done;
ops->prepare_for_kickoff = sde_encoder_phys_wb_prepare_for_kickoff;
ops->handle_post_kickoff = sde_encoder_phys_wb_handle_post_kickoff;
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_wb.c b/drivers/gpu/drm/msm/sde/sde_hw_wb.c
index ac6ff8c82291..a776d5538d83 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_wb.c
+++ b/drivers/gpu/drm/msm/sde/sde_hw_wb.c
@@ -63,11 +63,6 @@ static struct sde_wb_cfg *_wb_offset(enum sde_wb wb,
return ERR_PTR(-EINVAL);
}
-static void sde_hw_wb_setup_csc_8bit(struct sde_hw_wb *ctx,
- struct sde_csc_cfg *data)
-{
-}
-
static void sde_hw_wb_setup_outaddress(struct sde_hw_wb *ctx,
struct sde_hw_wb_cfg *data)
{
@@ -160,21 +155,6 @@ static void sde_hw_wb_setup_format(struct sde_hw_wb *ctx,
SDE_REG_WRITE(c, WB_CDP_CTRL, cdp_settings);
}
-static void sde_hw_wb_setup_rotator(struct sde_hw_wb *ctx,
- struct sde_hw_wb_cfg *data)
-{
-}
-
-static void sde_hw_setup_dither(struct sde_hw_wb *ctx,
- struct sde_hw_wb_cfg *data)
-{
-}
-
-static void sde_hw_wb_setup_cdwn(struct sde_hw_wb *ctx,
- struct sde_hw_wb_cfg *data)
-{
-}
-
static void sde_hw_wb_traffic_shaper(struct sde_hw_wb *ctx,
struct sde_hw_wb_cfg *data)
{
@@ -186,21 +166,9 @@ static void sde_hw_wb_traffic_shaper(struct sde_hw_wb *ctx,
static void _setup_wb_ops(struct sde_hw_wb_ops *ops,
unsigned long features)
{
- if (test_bit(SDE_WB_CSC, &features))
- ops->setup_csc_data = sde_hw_wb_setup_csc_8bit;
-
ops->setup_outaddress = sde_hw_wb_setup_outaddress;
ops->setup_outformat = sde_hw_wb_setup_format;
- if (test_bit(SDE_WB_BLOCK_MODE, &features))
- ops->setup_rotator = sde_hw_wb_setup_rotator;
-
- if (test_bit(SDE_WB_DITHER, &features))
- ops->setup_dither = sde_hw_setup_dither;
-
- if (test_bit(SDE_WB_CHROMA_DOWN, &features))
- ops->setup_cdwn = sde_hw_wb_setup_cdwn;
-
if (test_bit(SDE_WB_TRAFFIC_SHAPER, &features))
ops->setup_trafficshaper = sde_hw_wb_traffic_shaper;
}