* [PATCH v3] [media] s5p-g2d: Add support for FIMG2D v4.1 H/W logic
@ 2012-04-24 10:38 Sachin Kamat
2012-04-28 1:59 ` Sachin Kamat
2012-04-28 12:06 ` Sylwester Nawrocki
0 siblings, 2 replies; 3+ messages in thread
From: Sachin Kamat @ 2012-04-24 10:38 UTC (permalink / raw)
To: linux-media; +Cc: k.debski, sachin.kamat, patches, Ajay Kumar
From: Ajay Kumar <ajaykumar.rs@samsung.com>
Modify the G2D driver(which initially supported only FIMG2D v3 style H/W)
to support FIMG2D v4.1 style hardware present on Exynos4x12 and Exynos52x0 SOC.
-- Set the SRC and DST type to 'memory' instead of using reset values.
-- FIMG2D v4.1 H/W uses different logic for stretching(scaling).
-- Use CACHECTL_REG only with FIMG2D v3.
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
drivers/media/video/s5p-g2d/g2d-hw.c | 17 +++++++++++++----
drivers/media/video/s5p-g2d/g2d-regs.h | 6 ++++++
drivers/media/video/s5p-g2d/g2d.c | 23 +++++++++++++++++++++--
drivers/media/video/s5p-g2d/g2d.h | 9 ++++++++-
4 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/drivers/media/video/s5p-g2d/g2d-hw.c b/drivers/media/video/s5p-g2d/g2d-hw.c
index 5b86cbe..8c8bf71 100644
--- a/drivers/media/video/s5p-g2d/g2d-hw.c
+++ b/drivers/media/video/s5p-g2d/g2d-hw.c
@@ -28,6 +28,8 @@ void g2d_set_src_size(struct g2d_dev *d, struct g2d_frame *f)
{
u32 n;
+ w(0, SRC_SELECT_REG);
+
w(f->stride & 0xFFFF, SRC_STRIDE_REG);
n = f->o_height & 0xFFF;
@@ -52,6 +54,8 @@ void g2d_set_dst_size(struct g2d_dev *d, struct g2d_frame *f)
{
u32 n;
+ w(0, DST_SELECT_REG);
+
w(f->stride & 0xFFFF, DST_STRIDE_REG);
n = f->o_height & 0xFFF;
@@ -82,10 +86,14 @@ void g2d_set_flip(struct g2d_dev *d, u32 r)
w(r, SRC_MSK_DIRECT_REG);
}
-u32 g2d_cmd_stretch(u32 e)
+void g2d_set_v41_stretch(struct g2d_dev *d, struct g2d_frame *src,
+ struct g2d_frame *dst)
{
- e &= 1;
- return e << 4;
+ w(DEFAULT_SCALE_MODE, SRC_SCALE_CTRL_REG);
+
+ /* inversed scaling factor: src is numerator */
+ w((src->c_width << 16) / dst->c_width, SRC_XSCALE_REG);
+ w((src->c_height << 16) / dst->c_height, SRC_YSCALE_REG);
}
void g2d_set_cmd(struct g2d_dev *d, u32 c)
@@ -96,7 +104,8 @@ void g2d_set_cmd(struct g2d_dev *d, u32 c)
void g2d_start(struct g2d_dev *d)
{
/* Clear cache */
- w(0x7, CACHECTL_REG);
+ if (d->device_type == TYPE_G2D_3X)
+ w(0x7, CACHECTL_REG);
/* Enable interrupt */
w(1, INTEN_REG);
/* Start G2D engine */
diff --git a/drivers/media/video/s5p-g2d/g2d-regs.h b/drivers/media/video/s5p-g2d/g2d-regs.h
index 02e1cf5..14c681f 100644
--- a/drivers/media/video/s5p-g2d/g2d-regs.h
+++ b/drivers/media/video/s5p-g2d/g2d-regs.h
@@ -35,6 +35,9 @@
#define SRC_COLOR_MODE_REG 0x030C /* Src Image Color Mode reg */
#define SRC_LEFT_TOP_REG 0x0310 /* Src Left Top Coordinate reg */
#define SRC_RIGHT_BOTTOM_REG 0x0314 /* Src Right Bottom Coordinate reg */
+#define SRC_SCALE_CTRL_REG 0x0328 /* Src Scaling type select */
+#define SRC_XSCALE_REG 0x032c /* Src X Scaling ratio */
+#define SRC_YSCALE_REG 0x0330 /* Src Y Scaling ratio */
/* Parameter Setting Registers (Dest) */
#define DST_SELECT_REG 0x0400 /* Dest Image Selection reg */
@@ -112,4 +115,7 @@
#define DEFAULT_WIDTH 100
#define DEFAULT_HEIGHT 100
+#define DEFAULT_SCALE_MODE (2 << 0)
+/* Command mode register values */
+#define CMD_V3_ENABLE_STRETCH (1 << 4)
diff --git a/drivers/media/video/s5p-g2d/g2d.c b/drivers/media/video/s5p-g2d/g2d.c
index 789de74..8924f7e 100644
--- a/drivers/media/video/s5p-g2d/g2d.c
+++ b/drivers/media/video/s5p-g2d/g2d.c
@@ -582,8 +582,13 @@ static void device_run(void *prv)
g2d_set_flip(dev, ctx->flip);
if (ctx->in.c_width != ctx->out.c_width ||
- ctx->in.c_height != ctx->out.c_height)
- cmd |= g2d_cmd_stretch(1);
+ ctx->in.c_height != ctx->out.c_height) {
+ if (dev->device_type == TYPE_G2D_3X)
+ cmd |= CMD_V3_ENABLE_STRETCH;
+ else
+ g2d_set_v41_stretch(dev, &ctx->in, &ctx->out);
+ }
+
g2d_set_cmd(dev, cmd);
g2d_start(dev);
@@ -783,6 +788,8 @@ static int g2d_probe(struct platform_device *pdev)
def_frame.stride = (def_frame.width * def_frame.fmt->depth) >> 3;
+ dev->device_type = platform_get_device_id(pdev)->driver_data;
+
return 0;
unreg_video_dev:
@@ -832,9 +839,21 @@ static int g2d_remove(struct platform_device *pdev)
return 0;
}
+static struct platform_device_id g2d_driver_ids[] = {
+ {
+ .name = "s5p-g2d",
+ .driver_data = TYPE_G2D_3X,
+ }, {
+ .name = "s5p-g2d41x",
+ .driver_data = TYPE_G2D_41X,
+ }, { },
+};
+MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids);
+
static struct platform_driver g2d_pdrv = {
.probe = g2d_probe,
.remove = g2d_remove,
+ .id_table = g2d_driver_ids,
.driver = {
.name = G2D_NAME,
.owner = THIS_MODULE,
diff --git a/drivers/media/video/s5p-g2d/g2d.h b/drivers/media/video/s5p-g2d/g2d.h
index 1b82065..009b37d 100644
--- a/drivers/media/video/s5p-g2d/g2d.h
+++ b/drivers/media/video/s5p-g2d/g2d.h
@@ -15,6 +15,11 @@
#define G2D_NAME "s5p-g2d"
+enum g2d_type {
+ TYPE_G2D_3X,
+ TYPE_G2D_41X,
+};
+
struct g2d_dev {
struct v4l2_device v4l2_dev;
struct v4l2_m2m_dev *m2m_dev;
@@ -30,6 +35,7 @@ struct g2d_dev {
struct g2d_ctx *curr;
int irq;
wait_queue_head_t irq_queue;
+ enum g2d_type device_type;
};
struct g2d_frame {
@@ -81,7 +87,8 @@ void g2d_start(struct g2d_dev *d);
void g2d_clear_int(struct g2d_dev *d);
void g2d_set_rop4(struct g2d_dev *d, u32 r);
void g2d_set_flip(struct g2d_dev *d, u32 r);
-u32 g2d_cmd_stretch(u32 e);
+void g2d_set_v41_stretch(struct g2d_dev *d,
+ struct g2d_frame *src, struct g2d_frame *dst);
void g2d_set_cmd(struct g2d_dev *d, u32 c);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] [media] s5p-g2d: Add support for FIMG2D v4.1 H/W logic
2012-04-24 10:38 [PATCH v3] [media] s5p-g2d: Add support for FIMG2D v4.1 H/W logic Sachin Kamat
@ 2012-04-28 1:59 ` Sachin Kamat
2012-04-28 12:06 ` Sylwester Nawrocki
1 sibling, 0 replies; 3+ messages in thread
From: Sachin Kamat @ 2012-04-28 1:59 UTC (permalink / raw)
To: linux-media; +Cc: k.debski, sachin.kamat, patches, Ajay Kumar
Hi Kamil,
Any comments on the below patch?
Regards
Sachin
On 24 April 2012 16:08, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> From: Ajay Kumar <ajaykumar.rs@samsung.com>
>
> Modify the G2D driver(which initially supported only FIMG2D v3 style H/W)
> to support FIMG2D v4.1 style hardware present on Exynos4x12 and Exynos52x0 SOC.
>
> -- Set the SRC and DST type to 'memory' instead of using reset values.
> -- FIMG2D v4.1 H/W uses different logic for stretching(scaling).
> -- Use CACHECTL_REG only with FIMG2D v3.
>
> Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
> drivers/media/video/s5p-g2d/g2d-hw.c | 17 +++++++++++++----
> drivers/media/video/s5p-g2d/g2d-regs.h | 6 ++++++
> drivers/media/video/s5p-g2d/g2d.c | 23 +++++++++++++++++++++--
> drivers/media/video/s5p-g2d/g2d.h | 9 ++++++++-
> 4 files changed, 48 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/video/s5p-g2d/g2d-hw.c b/drivers/media/video/s5p-g2d/g2d-hw.c
> index 5b86cbe..8c8bf71 100644
> --- a/drivers/media/video/s5p-g2d/g2d-hw.c
> +++ b/drivers/media/video/s5p-g2d/g2d-hw.c
> @@ -28,6 +28,8 @@ void g2d_set_src_size(struct g2d_dev *d, struct g2d_frame *f)
> {
> u32 n;
>
> + w(0, SRC_SELECT_REG);
> +
> w(f->stride & 0xFFFF, SRC_STRIDE_REG);
>
> n = f->o_height & 0xFFF;
> @@ -52,6 +54,8 @@ void g2d_set_dst_size(struct g2d_dev *d, struct g2d_frame *f)
> {
> u32 n;
>
> + w(0, DST_SELECT_REG);
> +
> w(f->stride & 0xFFFF, DST_STRIDE_REG);
>
> n = f->o_height & 0xFFF;
> @@ -82,10 +86,14 @@ void g2d_set_flip(struct g2d_dev *d, u32 r)
> w(r, SRC_MSK_DIRECT_REG);
> }
>
> -u32 g2d_cmd_stretch(u32 e)
> +void g2d_set_v41_stretch(struct g2d_dev *d, struct g2d_frame *src,
> + struct g2d_frame *dst)
> {
> - e &= 1;
> - return e << 4;
> + w(DEFAULT_SCALE_MODE, SRC_SCALE_CTRL_REG);
> +
> + /* inversed scaling factor: src is numerator */
> + w((src->c_width << 16) / dst->c_width, SRC_XSCALE_REG);
> + w((src->c_height << 16) / dst->c_height, SRC_YSCALE_REG);
> }
>
> void g2d_set_cmd(struct g2d_dev *d, u32 c)
> @@ -96,7 +104,8 @@ void g2d_set_cmd(struct g2d_dev *d, u32 c)
> void g2d_start(struct g2d_dev *d)
> {
> /* Clear cache */
> - w(0x7, CACHECTL_REG);
> + if (d->device_type == TYPE_G2D_3X)
> + w(0x7, CACHECTL_REG);
> /* Enable interrupt */
> w(1, INTEN_REG);
> /* Start G2D engine */
> diff --git a/drivers/media/video/s5p-g2d/g2d-regs.h b/drivers/media/video/s5p-g2d/g2d-regs.h
> index 02e1cf5..14c681f 100644
> --- a/drivers/media/video/s5p-g2d/g2d-regs.h
> +++ b/drivers/media/video/s5p-g2d/g2d-regs.h
> @@ -35,6 +35,9 @@
> #define SRC_COLOR_MODE_REG 0x030C /* Src Image Color Mode reg */
> #define SRC_LEFT_TOP_REG 0x0310 /* Src Left Top Coordinate reg */
> #define SRC_RIGHT_BOTTOM_REG 0x0314 /* Src Right Bottom Coordinate reg */
> +#define SRC_SCALE_CTRL_REG 0x0328 /* Src Scaling type select */
> +#define SRC_XSCALE_REG 0x032c /* Src X Scaling ratio */
> +#define SRC_YSCALE_REG 0x0330 /* Src Y Scaling ratio */
>
> /* Parameter Setting Registers (Dest) */
> #define DST_SELECT_REG 0x0400 /* Dest Image Selection reg */
> @@ -112,4 +115,7 @@
>
> #define DEFAULT_WIDTH 100
> #define DEFAULT_HEIGHT 100
> +#define DEFAULT_SCALE_MODE (2 << 0)
>
> +/* Command mode register values */
> +#define CMD_V3_ENABLE_STRETCH (1 << 4)
> diff --git a/drivers/media/video/s5p-g2d/g2d.c b/drivers/media/video/s5p-g2d/g2d.c
> index 789de74..8924f7e 100644
> --- a/drivers/media/video/s5p-g2d/g2d.c
> +++ b/drivers/media/video/s5p-g2d/g2d.c
> @@ -582,8 +582,13 @@ static void device_run(void *prv)
> g2d_set_flip(dev, ctx->flip);
>
> if (ctx->in.c_width != ctx->out.c_width ||
> - ctx->in.c_height != ctx->out.c_height)
> - cmd |= g2d_cmd_stretch(1);
> + ctx->in.c_height != ctx->out.c_height) {
> + if (dev->device_type == TYPE_G2D_3X)
> + cmd |= CMD_V3_ENABLE_STRETCH;
> + else
> + g2d_set_v41_stretch(dev, &ctx->in, &ctx->out);
> + }
> +
> g2d_set_cmd(dev, cmd);
> g2d_start(dev);
>
> @@ -783,6 +788,8 @@ static int g2d_probe(struct platform_device *pdev)
>
> def_frame.stride = (def_frame.width * def_frame.fmt->depth) >> 3;
>
> + dev->device_type = platform_get_device_id(pdev)->driver_data;
> +
> return 0;
>
> unreg_video_dev:
> @@ -832,9 +839,21 @@ static int g2d_remove(struct platform_device *pdev)
> return 0;
> }
>
> +static struct platform_device_id g2d_driver_ids[] = {
> + {
> + .name = "s5p-g2d",
> + .driver_data = TYPE_G2D_3X,
> + }, {
> + .name = "s5p-g2d41x",
> + .driver_data = TYPE_G2D_41X,
> + }, { },
> +};
> +MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids);
> +
> static struct platform_driver g2d_pdrv = {
> .probe = g2d_probe,
> .remove = g2d_remove,
> + .id_table = g2d_driver_ids,
> .driver = {
> .name = G2D_NAME,
> .owner = THIS_MODULE,
> diff --git a/drivers/media/video/s5p-g2d/g2d.h b/drivers/media/video/s5p-g2d/g2d.h
> index 1b82065..009b37d 100644
> --- a/drivers/media/video/s5p-g2d/g2d.h
> +++ b/drivers/media/video/s5p-g2d/g2d.h
> @@ -15,6 +15,11 @@
>
> #define G2D_NAME "s5p-g2d"
>
> +enum g2d_type {
> + TYPE_G2D_3X,
> + TYPE_G2D_41X,
> +};
> +
> struct g2d_dev {
> struct v4l2_device v4l2_dev;
> struct v4l2_m2m_dev *m2m_dev;
> @@ -30,6 +35,7 @@ struct g2d_dev {
> struct g2d_ctx *curr;
> int irq;
> wait_queue_head_t irq_queue;
> + enum g2d_type device_type;
> };
>
> struct g2d_frame {
> @@ -81,7 +87,8 @@ void g2d_start(struct g2d_dev *d);
> void g2d_clear_int(struct g2d_dev *d);
> void g2d_set_rop4(struct g2d_dev *d, u32 r);
> void g2d_set_flip(struct g2d_dev *d, u32 r);
> -u32 g2d_cmd_stretch(u32 e);
> +void g2d_set_v41_stretch(struct g2d_dev *d,
> + struct g2d_frame *src, struct g2d_frame *dst);
> void g2d_set_cmd(struct g2d_dev *d, u32 c);
>
>
> --
> 1.7.4.1
>
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] [media] s5p-g2d: Add support for FIMG2D v4.1 H/W logic
2012-04-24 10:38 [PATCH v3] [media] s5p-g2d: Add support for FIMG2D v4.1 H/W logic Sachin Kamat
2012-04-28 1:59 ` Sachin Kamat
@ 2012-04-28 12:06 ` Sylwester Nawrocki
1 sibling, 0 replies; 3+ messages in thread
From: Sylwester Nawrocki @ 2012-04-28 12:06 UTC (permalink / raw)
To: Sachin Kamat
Cc: linux-media, k.debski, patches, Ajay Kumar, linux-samsung-soc
Hi Sachin,
On 04/24/2012 12:38 PM, Sachin Kamat wrote:
> From: Ajay Kumar<ajaykumar.rs@samsung.com>
>
> Modify the G2D driver(which initially supported only FIMG2D v3 style H/W)
> to support FIMG2D v4.1 style hardware present on Exynos4x12 and Exynos52x0 SOC.
>
> -- Set the SRC and DST type to 'memory' instead of using reset values.
> -- FIMG2D v4.1 H/W uses different logic for stretching(scaling).
> -- Use CACHECTL_REG only with FIMG2D v3.
>
> Signed-off-by: Ajay Kumar<ajaykumar.rs@samsung.com>
> Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org>
> ---
> drivers/media/video/s5p-g2d/g2d-hw.c | 17 +++++++++++++----
> drivers/media/video/s5p-g2d/g2d-regs.h | 6 ++++++
> drivers/media/video/s5p-g2d/g2d.c | 23 +++++++++++++++++++++--
> drivers/media/video/s5p-g2d/g2d.h | 9 ++++++++-
> 4 files changed, 48 insertions(+), 7 deletions(-)
>
...
> @@ -783,6 +788,8 @@ static int g2d_probe(struct platform_device *pdev)
>
> def_frame.stride = (def_frame.width * def_frame.fmt->depth)>> 3;
>
> + dev->device_type = platform_get_device_id(pdev)->driver_data;
> +
> return 0;
>
> unreg_video_dev:
> @@ -832,9 +839,21 @@ static int g2d_remove(struct platform_device *pdev)
> return 0;
> }
>
> +static struct platform_device_id g2d_driver_ids[] = {
> + {
> + .name = "s5p-g2d",
> + .driver_data = TYPE_G2D_3X,
IMHO it would be better to define a separate data structure describing
the quirks. For an example please see http://patchwork.linuxtv.org/patch/10869
and the code using struct flite_variant. There was some lengthy
discussion recently on linux-i2c mailing list, where someone tried
to add more quirks to the i2c-s3c2440 driver which uses 'driver_data'
like it is done in this patch. To avoid wasting time in future,
I would suggest to make 'driver_data' right away holding a pointer
to a data structure, rather than simple integer.
We could start, for example, with something like:
struct g2d_variant {
unsigned short hw_rev;
};
> + }, {
> + .name = "s5p-g2d41x",
> + .driver_data = TYPE_G2D_41X,
> + }, { },
How about marking the last empty entry e.g.
{ /* sentinel */ }
? Or just putting it in new line ?
> +};
> +MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids);
Hmm, should be g2d_driver_ids. This isn't going to fly when you
compile this driver as a module. You would get an error like:
error: ‘__mod_platform_device_table’ aliased to undefined symbol ‘s3c24xx_driver_ids’
Regards,
Sylwester
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-28 12:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-24 10:38 [PATCH v3] [media] s5p-g2d: Add support for FIMG2D v4.1 H/W logic Sachin Kamat
2012-04-28 1:59 ` Sachin Kamat
2012-04-28 12:06 ` Sylwester Nawrocki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.