diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-17 11:17:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-17 11:17:39 +1000 |
| commit | ff64f5011bc015ab071a969480a01df732412064 (patch) | |
| tree | a3f4b5e605f2b0fc96b1cf56d837e2b11c832765 /drivers | |
| parent | 92133f913e80eb28e7a543f24c8e5f8185a6fbf4 (diff) | |
| parent | b8f0951de854cc66f4c575a13e873be0089b9fa6 (diff) | |
Merge remote-tracking branch 'imx-drm/imx-drm/next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/ipu-v3/ipu-prg.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-prg.c b/drivers/gpu/ipu-v3/ipu-prg.c index caca57febbd6..ecc9ea44dc50 100644 --- a/drivers/gpu/ipu-v3/ipu-prg.c +++ b/drivers/gpu/ipu-v3/ipu-prg.c @@ -318,8 +318,6 @@ int ipu_prg_channel_configure(struct ipuv3_channel *ipu_chan, writel(val, prg->regs + IPU_PRG_BADDR(prg_chan)); val = readl(prg->regs + IPU_PRG_CTL); - /* counter load enable */ - val |= IPU_PRG_CTL_CNT_LOAD_EN(prg_chan); /* config AXI ID */ val &= ~(IPU_PRG_CTL_SOFT_ARID_MASK << IPU_PRG_CTL_SOFT_ARID_SHIFT(prg_chan)); |