Re: [PATCH 14/25] drm/exynos: introduce exynos_drm_plane_config structure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello,

On 2015-11-18 16:40, Tobias Jakobi wrote:
Marek Szyprowski wrote:
On 2015-11-17 19:00, Tobias Jakobi wrote:
Marek Szyprowski wrote:
This patch adds common structure for keeping plane configuration and
capabilities data. This patch is inspired by similar code developed by
Tobias Jakobi.

Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
---
   drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 18 +++++++---
   drivers/gpu/drm/exynos/exynos7_drm_decon.c    | 23 +++++++-----
   drivers/gpu/drm/exynos/exynos_drm_drv.h       | 22 ++++++++++++
   drivers/gpu/drm/exynos/exynos_drm_fimd.c      | 25 ++++++++-----
   drivers/gpu/drm/exynos/exynos_drm_plane.c     | 34 ++++++++----------
   drivers/gpu/drm/exynos/exynos_drm_plane.h     |  7 ++--
   drivers/gpu/drm/exynos/exynos_drm_vidi.c      | 25 ++++++++-----
   drivers/gpu/drm/exynos/exynos_mixer.c         | 51
++++++++++++++++-----------
   8 files changed, 131 insertions(+), 74 deletions(-)

<SNIP>
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c
b/drivers/gpu/drm/exynos/exynos_mixer.c
index 015e85cabcc9..cdec3c1827c6 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -43,7 +43,6 @@
     #define MIXER_WIN_NR        3
   #define VP_DEFAULT_WIN        2
-#define CURSOR_WIN        1
     /* The pixelformats that are natively supported by the mixer. */
   #define MXR_FORMAT_RGB565    4
@@ -112,6 +111,31 @@ struct mixer_drv_data {
       bool                    has_sclk;
   };
   +static const struct exynos_drm_plane_config
plane_configs[MIXER_WIN_NR] = {
+    {
+        .zpos = 0,
+        .type = DRM_PLANE_TYPE_PRIMARY,
+        .pixel_formats = mixer_formats,
+        .num_pixel_formats = ARRAY_SIZE(mixer_formats),
+        .capabilities = EXYNOS_DRM_PLANE_CAP_DOUBLE_X |
+                EXYNOS_DRM_PLANE_CAP_DOUBLE_Y,
+    }, {
+        .zpos = 1,
+        .type = DRM_PLANE_TYPE_CURSOR,
+        .pixel_formats = mixer_formats,
+        .num_pixel_formats = ARRAY_SIZE(mixer_formats),
+        .capabilities = EXYNOS_DRM_PLANE_CAP_DOUBLE_X |
+                EXYNOS_DRM_PLANE_CAP_DOUBLE_Y,
+    }, {
+        .zpos = 2,
+        .type = DRM_PLANE_TYPE_OVERLAY,
+        .pixel_formats = vp_formats,
+        .num_pixel_formats = ARRAY_SIZE(vp_formats),
+        .capabilities = EXYNOS_DRM_PLANE_CAP_DOUBLE_X |
+                EXYNOS_DRM_PLANE_CAP_DOUBLE_Y,
As far as I know the video plane supports arbitrary scaling and provides
no dedicated 'pixel doubling' mode.
Right, I've forgotten that, I will update the code then. BTW, do you
plan to
submit your patches for Mixer, which fixes alpha blending setup?
I'll try to send a new version out this weekend. Any specific branch I
should base these on? (e.g. Inki's exynos-drm-next)

exynos-drm-next will be okay.

Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux SoC Development]     [Linux Rockchip Development]     [Linux USB Development]     [Video for Linux]     [Linux Audio Users]     [Linux SCSI]     [Yosemite News]

  Powered by Linux