|
@@ -18,7 +18,6 @@
|
|
|
#include <linux/dma-buf.h>
|
|
|
#include <linux/clk.h>
|
|
|
#include <linux/clk/qcom.h>
|
|
|
-#include <linux/msm_rtb.h>
|
|
|
|
|
|
#include "sde_rotator_core.h"
|
|
|
#include "sde_rotator_util.h"
|
|
@@ -63,12 +62,12 @@
|
|
|
do { \
|
|
|
SDEROT_DBG("SDEREG.W:[%s:0x%X] <= 0x%X\n", #off, (off),\
|
|
|
(u32)(data));\
|
|
|
- writel_relaxed_no_log( \
|
|
|
+ writel_relaxed( \
|
|
|
(REGDMA_OP_REGWRITE | \
|
|
|
((off) & REGDMA_ADDR_OFFSET_MASK)), \
|
|
|
p); \
|
|
|
p += sizeof(u32); \
|
|
|
- writel_relaxed_no_log(data, p); \
|
|
|
+ writel_relaxed(data, p); \
|
|
|
p += sizeof(u32); \
|
|
|
} while (0)
|
|
|
|
|
@@ -76,14 +75,14 @@
|
|
|
do { \
|
|
|
SDEROT_DBG("SDEREG.M:[%s:0x%X] <= 0x%X\n", #off, (off),\
|
|
|
(u32)(data));\
|
|
|
- writel_relaxed_no_log( \
|
|
|
+ writel_relaxed( \
|
|
|
(REGDMA_OP_REGMODIFY | \
|
|
|
((off) & REGDMA_ADDR_OFFSET_MASK)), \
|
|
|
p); \
|
|
|
p += sizeof(u32); \
|
|
|
- writel_relaxed_no_log(mask, p); \
|
|
|
+ writel_relaxed(mask, p); \
|
|
|
p += sizeof(u32); \
|
|
|
- writel_relaxed_no_log(data, p); \
|
|
|
+ writel_relaxed(data, p); \
|
|
|
p += sizeof(u32); \
|
|
|
} while (0)
|
|
|
|
|
@@ -91,25 +90,25 @@
|
|
|
do { \
|
|
|
SDEROT_DBG("SDEREG.B:[%s:0x%X:0x%X]\n", #off, (off),\
|
|
|
(u32)(len));\
|
|
|
- writel_relaxed_no_log( \
|
|
|
+ writel_relaxed( \
|
|
|
(REGDMA_OP_BLKWRITE_INC | \
|
|
|
((off) & REGDMA_ADDR_OFFSET_MASK)), \
|
|
|
p); \
|
|
|
p += sizeof(u32); \
|
|
|
- writel_relaxed_no_log(len, p); \
|
|
|
+ writel_relaxed(len, p); \
|
|
|
p += sizeof(u32); \
|
|
|
} while (0)
|
|
|
|
|
|
#define SDE_REGDMA_BLKWRITE_DATA(p, data) \
|
|
|
do { \
|
|
|
SDEROT_DBG("SDEREG.I:[:] <= 0x%X\n", (u32)(data));\
|
|
|
- writel_relaxed_no_log(data, p); \
|
|
|
+ writel_relaxed(data, p); \
|
|
|
p += sizeof(u32); \
|
|
|
} while (0)
|
|
|
|
|
|
#define SDE_REGDMA_READ(p, data) \
|
|
|
do { \
|
|
|
- data = readl_relaxed_no_log(p); \
|
|
|
+ data = readl_relaxed(p); \
|
|
|
p += sizeof(u32); \
|
|
|
} while (0)
|
|
|
|
|
@@ -2056,7 +2055,7 @@ static u32 sde_hw_rotator_start_no_regdma(struct sde_hw_rotator_context *ctx,
|
|
|
/* Write all command stream to Rotator blocks */
|
|
|
/* Rotator will start right away after command stream finish writing */
|
|
|
while (mem_rdptr < wrptr) {
|
|
|
- u32 op = REGDMA_OP_MASK & readl_relaxed_no_log(mem_rdptr);
|
|
|
+ u32 op = REGDMA_OP_MASK & readl_relaxed(mem_rdptr);
|
|
|
|
|
|
switch (op) {
|
|
|
case REGDMA_OP_NOP:
|