Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aecede4c authored by Shaik Ameer Basha's avatar Shaik Ameer Basha Committed by Mauro Carvalho Chehab
Browse files

[media] exynos-gsc: Adding tiled multi-planar format to G-Scaler 



Adding V4L2_PIX_FMT_NV12MT_16X16 to G-Scaler supported formats.
If the output or input format is V4L2_PIX_FMT_NV12MT_16X16, configure
G-Scaler to use GSC_IN_TILE_MODE.

[s.nawrocki: shortened the pixel format description]

Signed-off-by: default avatarShaik Ameer Basha <shaik.ameer@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4bb891eb

drivers/media/platform/exynos-gsc/gsc-core.c

+9 −0
Original line number Diff line number Diff line
@@ -185,6 +185,15 @@ static const struct gsc_fmt gsc_formats[] = { 
		.corder		= GSC_CRCB,

		.num_planes	= 3,

		.num_comp	= 3,

	}, {

		.name		= "YUV 4:2:0 n.c. 2p, Y/CbCr tiled",

		.pixelformat	= V4L2_PIX_FMT_NV12MT_16X16,

		.depth		= { 8, 4 },

		.color		= GSC_YUV420,

		.yorder		= GSC_LSB_Y,

		.corder		= GSC_CBCR,

		.num_planes	= 2,

		.num_comp	= 2,

	}

};

drivers/media/platform/exynos-gsc/gsc-core.h

+5 −0
Original line number Diff line number Diff line
@@ -427,6 +427,11 @@ static inline void gsc_ctx_state_lock_clear(u32 state, struct gsc_ctx *ctx) 
	spin_unlock_irqrestore(&ctx->gsc_dev->slock, flags);

}



static inline int is_tiled(const struct gsc_fmt *fmt)

{

	return fmt->pixelformat == V4L2_PIX_FMT_NV12MT_16X16;

}



static inline void gsc_hw_enable_control(struct gsc_dev *dev, bool on)

{

	u32 cfg = readl(dev->regs + GSC_ENABLE);

drivers/media/platform/exynos-gsc/gsc-regs.c

+6 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ void gsc_hw_set_in_image_format(struct gsc_ctx *ctx) 
		break;

	}



	if (is_tiled(frame->fmt))

		cfg |= GSC_IN_TILE_C_16x8 | GSC_IN_TILE_MODE;



	writel(cfg, dev->regs + GSC_IN_CON);

}
@@ -334,6 +337,9 @@ void gsc_hw_set_out_image_format(struct gsc_ctx *ctx) 
		break;

	}



	if (is_tiled(frame->fmt))

		cfg |= GSC_OUT_TILE_C_16x8 | GSC_OUT_TILE_MODE;



end_set:

	writel(cfg, dev->regs + GSC_OUT_CON);

}