leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add rotator support for s5pv210

Browse Source 
. With this patch series, s5pv210 SoC can use rotator module but
     only NV12 and XRGB8888 formats are supported.
 - Modify e-mail address
   . It changes email address of scaler module author.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJcXBIAAAoJEFc4NIkMQxK4iAAP/0j3lQF8kVhfy5rLicpkwx01
 bWPdoFwSHn6dbkPsJOXHLewVDW0CEz089esowUQptE+ZkKNCghXmlRl9EApsRZGz
 AwNBwz4xrfDrojuEAeO0qeYYMpEZDth+y0LttWtVkhaQlk5hFXU9MkcOuS8hQ3ZH
 zAMd9hvw5GoqxChDhyzGIjkT0xDf1Pznw/6S+tHL39dcKiGivHW+RaRZ0PJHtJTe
 zSghSokC4CtMXcBxm3a1cfZ+WmQs16ZXcOl8HzaM1XIJ0G7UNnvvW3mxgq1XqDR2
 2nkOTRArO1jS8i5lcBafS7pkwyl3FiVt0H8vqzLjjSc0YJMhBMoIHwI9svy5xzh0
 +j66E6mYxzVKVykR2bo4Ny/F0tKdlx+KQkKi82TOnu1FWyI+uvmb6tR0ngeoCso6
 VUpXLoRg0IL6lbwqK+GKUVu16mG291XJSyv/WMXGmnmgc3QZWTEgXb227H9udNP4
 vQ+17R3RjVUPJQpQ6rkjXnKBad+UGmwr5qdPZND8INDnHtMtDTZyriTIHi312fi1
 MnqecZWkEDs6urSsExzdfEDdOSZ8XfM+NsBsyJr6034ZbNufva6mzocZ+ZDIYUY3
 6ma8EDwx+GtUkxJrdOsFDNkGdHYJGBGD+vDqAgnO5RWwJTWKiauj+QBuN2pDSRQz
 C+Nnev9GAExyEQ9Gv1TZ
 =RB/q
 -----END PGP SIGNATURE-----

Merge tag 'exynos-drm-next-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

- Add rotator support for s5pv210
  . With this patch series, s5pv210 SoC can use rotator module but
    only NV12 and XRGB8888 formats are supported.
- Modify e-mail address
  . It changes email address of scaler module author.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/079a9586-9d85-7d38-2658-ce312b6d71e8@samsung.com
This commit is contained in:
Dave Airlie 2019-02-08 10:35:26 +10:00
commit 1e92a2261a
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/devicetree/bindings/gpu/samsung-rotator.txt
View File

@ -2,9 +2,10 @@
Required properties:
- compatible : value should be one of the following:
(a) "samsung,exynos4210-rotator" for Rotator IP in Exynos4210
(b) "samsung,exynos4212-rotator" for Rotator IP in Exynos4212/4412
(c) "samsung,exynos5250-rotator" for Rotator IP in Exynos5250
* "samsung,s5pv210-rotator" for Rotator IP in S5PV210
* "samsung,exynos4210-rotator" for Rotator IP in Exynos4210
* "samsung,exynos4212-rotator" for Rotator IP in Exynos4212/4412
* "samsung,exynos5250-rotator" for Rotator IP in Exynos5250
- reg : Physical base address of the IP registers and length of memory
mapped region.

23
drivers/gpu/drm/exynos/exynos_drm_rotator.c
View File

@ -356,6 +356,11 @@ static int rotator_runtime_resume(struct device *dev)
}
#endif
static const struct drm_exynos_ipp_limit rotator_s5pv210_rbg888_limits[] = {
{ IPP_SIZE_LIMIT(BUFFER, .h = { 8, SZ_16K }, .v = { 8, SZ_16K }) },
{ IPP_SIZE_LIMIT(AREA, .h.align = 2, .v.align = 2) },
};
static const struct drm_exynos_ipp_limit rotator_4210_rbg888_limits[] = {
{ IPP_SIZE_LIMIT(BUFFER, .h = { 8, SZ_16K }, .v = { 8, SZ_16K }) },
{ IPP_SIZE_LIMIT(AREA, .h.align = 4, .v.align = 4) },
@ -371,6 +376,11 @@ static const struct drm_exynos_ipp_limit rotator_5250_rbg888_limits[] = {
{ IPP_SIZE_LIMIT(AREA, .h.align = 2, .v.align = 2) },
};
static const struct drm_exynos_ipp_limit rotator_s5pv210_yuv_limits[] = {
{ IPP_SIZE_LIMIT(BUFFER, .h = { 32, SZ_64K }, .v = { 32, SZ_64K }) },
{ IPP_SIZE_LIMIT(AREA, .h.align = 8, .v.align = 8) },
};
static const struct drm_exynos_ipp_limit rotator_4210_yuv_limits[] = {
{ IPP_SIZE_LIMIT(BUFFER, .h = { 32, SZ_64K }, .v = { 32, SZ_64K }) },
{ IPP_SIZE_LIMIT(AREA, .h.align = 8, .v.align = 8) },
@ -381,6 +391,11 @@ static const struct drm_exynos_ipp_limit rotator_4412_yuv_limits[] = {
{ IPP_SIZE_LIMIT(AREA, .h.align = 8, .v.align = 8) },
};
static const struct exynos_drm_ipp_formats rotator_s5pv210_formats[] = {
{ IPP_SRCDST_FORMAT(XRGB8888, rotator_s5pv210_rbg888_limits) },
{ IPP_SRCDST_FORMAT(NV12, rotator_s5pv210_yuv_limits) },
};
static const struct exynos_drm_ipp_formats rotator_4210_formats[] = {
{ IPP_SRCDST_FORMAT(XRGB8888, rotator_4210_rbg888_limits) },
{ IPP_SRCDST_FORMAT(NV12, rotator_4210_yuv_limits) },
@ -396,6 +411,11 @@ static const struct exynos_drm_ipp_formats rotator_5250_formats[] = {
{ IPP_SRCDST_FORMAT(NV12, rotator_4412_yuv_limits) },
};
static const struct rot_variant rotator_s5pv210_data = {
.formats = rotator_s5pv210_formats,
.num_formats = ARRAY_SIZE(rotator_s5pv210_formats),
};
static const struct rot_variant rotator_4210_data = {
.formats = rotator_4210_formats,
.num_formats = ARRAY_SIZE(rotator_4210_formats),
@ -413,6 +433,9 @@ static const struct rot_variant rotator_5250_data = {
static const struct of_device_id exynos_rotator_match[] = {
{
.compatible = "samsung,s5pv210-rotator",
.data = &rotator_s5pv210_data,
}, {
.compatible = "samsung,exynos4210-rotator",
.data = &rotator_4210_data,
}, {

2
drivers/gpu/drm/exynos/exynos_drm_scaler.c
View File

@ -1,7 +1,7 @@
/*
* Copyright (C) 2017 Samsung Electronics Co.Ltd
* Author:
* Andrzej Pietrasiewicz <andrzej.p@samsung.com>
* Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as

2
drivers/gpu/drm/exynos/regs-scaler.h
View File

@ -2,7 +2,7 @@
*
* Copyright (c) 2017 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
* Author: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
* Author: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
*
* Register definition file for Samsung scaler driver
*