MLK-15932-4 gpu: imx: dpu: fetchdecode: Add scaler support

The output of FetchDecode can be the input of HScaler and/or VScaler.
If both of the two scalers are wanted, the two scalers can be connected
with each other by themselves as an united scaler unit.  This patch adds
basic scaling capability support for FetchDecode.  Three helpers are
introduced - fetchdecode_get_vproc_mask() and fetchdecode_get_h/vscaler().

Signed-off-by: Liu Ying <victor.liu@nxp.com>

diff --git a/drivers/gpu/imx/dpu/dpu-fetchdecode.c b/drivers/gpu/imx/dpu/dpu-fetchdecode.c
index dc24934..533427b 100644 (file)
--- a/drivers/gpu/imx/dpu/dpu-fetchdecode.c
+++ b/drivers/gpu/imx/dpu/dpu-fetchdecode.c
@@ -21,9 +21,17 @@
 #include <video/dpu.h>
 #include "dpu-prv.h"
 
+#define FD_NUM                         4
+
+static const u32 fd_vproc_cap[FD_NUM] = {
+       DPU_VPROC_CAP_HSCALER4 | DPU_VPROC_CAP_VSCALER4,
+       DPU_VPROC_CAP_HSCALER5 | DPU_VPROC_CAP_VSCALER5,
+       DPU_VPROC_CAP_HSCALER4 | DPU_VPROC_CAP_VSCALER4,
+       DPU_VPROC_CAP_HSCALER5 | DPU_VPROC_CAP_VSCALER5,
+};
+
 #define PIXENGCFG_DYNAMIC              0x8
 #define SRC_NUM                                3
-#define FD_NUM                         4
 static const fd_dynamic_src_sel_t fd_srcs[FD_NUM][SRC_NUM] = {
        { FD_SRC_DISABLE, FD_SRC_FETCHECO0, FD_SRC_FETCHDECODE2 },
        { FD_SRC_DISABLE, FD_SRC_FETCHECO1, FD_SRC_FETCHDECODE3 },
@@ -428,6 +436,50 @@ shadow_load_req_t fetchdecode_to_shdldreq_t(struct dpu_fetchdecode *fd)
 }
 EXPORT_SYMBOL_GPL(fetchdecode_to_shdldreq_t);
 
+u32 fetchdecode_get_vproc_mask(struct dpu_fetchdecode *fd)
+{
+       return fd_vproc_cap[fd->id];
+}
+EXPORT_SYMBOL_GPL(fetchdecode_get_vproc_mask);
+
+struct dpu_hscaler *fetchdecode_get_hscaler(struct dpu_fetchdecode *fd)
+{
+       struct dpu_soc *dpu = fd->dpu;
+
+       switch (fd->id) {
+       case 0:
+       case 2:
+               return dpu->hs_priv[0];
+       case 1:
+       case 3:
+               return dpu->hs_priv[1];
+       default:
+               WARN_ON(1);
+       }
+
+       return ERR_PTR(-EINVAL);
+}
+EXPORT_SYMBOL_GPL(fetchdecode_get_hscaler);
+
+struct dpu_vscaler *fetchdecode_get_vscaler(struct dpu_fetchdecode *fd)
+{
+       struct dpu_soc *dpu = fd->dpu;
+
+       switch (fd->id) {
+       case 0:
+       case 2:
+               return dpu->vs_priv[0];
+       case 1:
+       case 3:
+               return dpu->vs_priv[1];
+       default:
+               WARN_ON(1);
+       }
+
+       return ERR_PTR(-EINVAL);
+}
+EXPORT_SYMBOL_GPL(fetchdecode_get_vscaler);
+
 unsigned int fetchdecode_get_stream_id(struct dpu_fetchdecode *fd)
 {
        return fd->stream_id;

diff --git a/drivers/gpu/imx/dpu/dpu-prv.h b/drivers/gpu/imx/dpu/dpu-prv.h
index 4f2f3c2..ae58468 100644 (file)
--- a/drivers/gpu/imx/dpu/dpu-prv.h
+++ b/drivers/gpu/imx/dpu/dpu-prv.h
@@ -93,6 +93,16 @@ enum {
        DPU_V2,
 };
 
+#define DPU_VPROC_CAP_HSCALER4 BIT(0)
+#define DPU_VPROC_CAP_VSCALER4 BIT(1)
+#define DPU_VPROC_CAP_HSCALER5 BIT(2)
+#define DPU_VPROC_CAP_VSCALER5 BIT(3)
+
+#define DPU_VPROC_CAP_HSCALE   (DPU_VPROC_CAP_HSCALER4 | \
+                                DPU_VPROC_CAP_HSCALER5)
+#define DPU_VPROC_CAP_VSCALE   (DPU_VPROC_CAP_VSCALER4 | \
+                                DPU_VPROC_CAP_VSCALER5)
+
 struct dpu_unit {
        char *name;
        unsigned int num;

diff --git a/include/video/dpu.h b/include/video/dpu.h
index 149eb15..1b0660e 100644 (file)
--- a/include/video/dpu.h
+++ b/include/video/dpu.h
@@ -492,6 +492,7 @@ void fetchdecode_yuv_constantcolor(struct dpu_fetchdecode *fd,
 void fetchdecode_controltrigger(struct dpu_fetchdecode *fd, bool trigger);
 int fetchdecode_fetchtype(struct dpu_fetchdecode *fd, fetchtype_t *type);
 shadow_load_req_t fetchdecode_to_shdldreq_t(struct dpu_fetchdecode *fd);
+u32 fetchdecode_get_vproc_mask(struct dpu_fetchdecode *fd);
 unsigned int fetchdecode_get_stream_id(struct dpu_fetchdecode *fd);
 void fetchdecode_set_stream_id(struct dpu_fetchdecode *fd, unsigned int id);
 struct dpu_fetchdecode *dpu_fd_get(struct dpu_soc *dpu, int id);
@@ -596,6 +597,9 @@ void vscaler_set_stream_id(struct dpu_vscaler *vs, unsigned int id);
 struct dpu_vscaler *dpu_vs_get(struct dpu_soc *dpu, int id);
 void dpu_vs_put(struct dpu_vscaler *vs);
 
+struct dpu_hscaler *fetchdecode_get_hscaler(struct dpu_fetchdecode *fd);
+struct dpu_vscaler *fetchdecode_get_vscaler(struct dpu_fetchdecode *fd);
+
 /*
  * to avoid on-the-fly/hot plane resource migration
  * between two display interfaces