From patchwork Wed Mar 20 13:06:44 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861551
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B9E2815AC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:16 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90C6D29BDC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:16 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 84E2F28B7B; Wed, 20 Mar 2019 13:07:16 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8041299B6
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:15 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727361AbfCTNHP (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:15 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55139 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726644AbfCTNHP (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:15 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130713euoutp01bbfa871a2eb576b6ffb86e33b635b9b6~NrJw72d020130601306euoutp01G;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130713euoutp01bbfa871a2eb576b6ffb86e33b635b9b6~NrJw72d020130601306euoutp01G
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087233;
        bh=dwjRLFOHufejtcgQ+4y8qgjojqy0dV1UkJPYc5I5Zqc=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=oWcg4AsCtZDbwcvgt7hj4s6G73AC6wCvaRL3HfycUjSvlNULNmS2jWowigijA+yBz
         kN7D0cCt2QIyEOBtj+ik+UI/aWKFKiX/2j/yz86jtFTPmyZ1zm61tSi4LPP7b+pElL
         C8ggQuy67ub1S62eepKDqE9V3c4qXS8dP6EL8At0=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130713eucas1p14176452dd8bdf67dd65f5f7f14cee762~NrJwePyBp2311723117eucas1p1q;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 17.35.04441.00B329C5;
 Wed, 20
        Mar 2019 13:07:12 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130712eucas1p2c98ef5f0f42d422dc711c222fa4da11b~NrJv1zafj0993409934eucas1p20;
        Wed, 20 Mar 2019 13:07:12 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-9c-5c923b00394d
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id C1.AF.04284.00B329C5;
 Wed, 20
        Mar 2019 13:07:12 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:12 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 01/24] drm/exynos: remove exynos_drm_plane.h
 header
Date: Wed, 20 Mar 2019 14:06:44 +0100
Message-id: <20190320130707.25161-2-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djPc7oM1pNiDCadM7a4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZa1rmMha81a2Yt3MzUwPjPvUuRg4OCQETiZUdBl2MXBxCAisYJf6sO8oK
        4XxmlHj2aC1jFyMnWNHD1vssEIlljBKvr/1kg3D+M0r8XL6HCaSKTUBT4u/mm2wgtoiAssSq
        fe3sIEXMAr8ZJaYv38YOkhAW8JdY17oEzGYRUJXoWTSDBcTmFbCQmHr0CTvEOnmJ1RsOMIPY
        nAKWEg/n/AcbJCHwl1Xi7/L5TBBFLhJHd3VC2TISnR0Hoex6ifsrWpghGjoYJbZu2MkMkbCW
        OHz8IiuIzSzAJzFp23RmSAjwSnS0CUGUeEjMvdnBDPFaD6PEwf4XbBMYJRYwMqxiFE8tLc5N
        Ty02zEst1ytOzC0uzUvXS87P3cQIjLDT/45/2sH49VLSIUYBDkYlHt6GNxNihFgTy4orcw8x
        SnAwK4nwRihNihHiTUmsrEotyo8vKs1JLT7EKM3BoiTOW83wIFpIID2xJDU7NbUgtQgmy8TB
        KdXA6HV+6a1WqSmr161WFGRtLw9vXGMqXijEzxkSH5ullrv62aeT959wVNbLT3FdNWViwDyD
        pb2i+nIfdxoH9R69HHPIoe2w+WH+p9VafNt/hL/yOHyCV3Vx+BLJnf3Bs5fVukqvflrI7iq1
        WHnnqiB2k2KriNTZdgmL03+12q87dD40eN+G6ZY3lViKMxINtZiLihMByBqFA6wCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV0G60kxBl93iljcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MNS1zGQve6lbM27mZqYFxn3oXIyeHhICJxMPW+yxdjFwcQgJLGCW6v05m
        h3AamSTu9k5kB6liE9CU+Lv5JhuILSKgLLFqXztYEbPAb0aJzzO+MoMkhAV8JU7/+cEEYrMI
        qEr0LJrBAmLzClhITD36hB1inbzE6g0HwOo5BSwlHs75DxYXAqpZfOIu4wRGngWMDKsYRVJL
        i3PTc4sN9YoTc4tL89L1kvNzNzECg2bbsZ+bdzBe2hh8iFGAg1GJh7fi6YQYIdbEsuLK3EOM
        EhzMSiK8EUqTYoR4UxIrq1KL8uOLSnNSiw8xSnOwKInznjeojBISSE8sSc1OTS1ILYLJMnFw
        SjUw6tteC/tsM0PtcsfKFJ6inT5Hb3hZ6wpWFH8wfnjhqOgWrjeF7Ufm9i9jN/9v9Zh/Wm9P
        CU8lk/6cJUEe9xSkU6fPnHUv47HeoWvvjqXl7zFbk/ZuXsFL5p2snpY/3VStO6s105uOpKbu
        mZ6vuv2GS8T9X3k+VtrTOfW4Vz/gm6TNYM9XZPtEiaU4I9FQi7moOBEAMu8RGxYCAAA=
X-CMS-MailID: 20190320130712eucas1p2c98ef5f0f42d422dc711c222fa4da11b
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130712eucas1p2c98ef5f0f42d422dc711c222fa4da11b
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130712eucas1p2c98ef5f0f42d422dc711c222fa4da11b@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

The header contains only declaration of one function, the rest of exynos
plane declaration is in exynos_drm_drv.h.
Let's merge it together.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c |  1 -
 drivers/gpu/drm/exynos/exynos7_drm_decon.c    |  1 -
 drivers/gpu/drm/exynos/exynos_drm_crtc.c      |  1 -
 drivers/gpu/drm/exynos/exynos_drm_drv.c       |  1 -
 drivers/gpu/drm/exynos/exynos_drm_drv.h       |  4 ++++
 drivers/gpu/drm/exynos/exynos_drm_fimd.c      |  1 -
 drivers/gpu/drm/exynos/exynos_drm_plane.c     |  1 -
 drivers/gpu/drm/exynos/exynos_drm_plane.h     | 14 --------------
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |  1 -
 drivers/gpu/drm/exynos/exynos_mixer.c         |  1 -
 10 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_plane.h

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index bdfec5f977e9..24df0b307b2f 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -24,7 +24,6 @@
 #include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
 #include "exynos_drm_fb.h"
-#include "exynos_drm_plane.h"
 #include "regs-decon5433.h"
 
 #define DSD_CFG_MUX 0x1004
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index 381aa3d60e37..812941b84287 100644
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -27,7 +27,6 @@
 #include <video/of_videomode.h>
 
 #include "exynos_drm_crtc.h"
-#include "exynos_drm_plane.h"
 #include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
 #include "regs-decon7.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 96ee83a798c4..1eebfa3fa8da 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -20,7 +20,6 @@
 
 #include "exynos_drm_crtc.h"
 #include "exynos_drm_drv.h"
-#include "exynos_drm_plane.h"
 
 static void exynos_drm_crtc_atomic_enable(struct drm_crtc *crtc,
 					  struct drm_crtc_state *old_state)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index e1ef9dc9ebf3..2155586646dc 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -26,7 +26,6 @@
 #include "exynos_drm_fbdev.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_gem.h"
-#include "exynos_drm_plane.h"
 #include "exynos_drm_ipp.h"
 #include "exynos_drm_vidi.h"
 #include "exynos_drm_g2d.h"
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 71eb240bc1f4..6e38d0dc4457 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -113,6 +113,10 @@ struct exynos_drm_plane_config {
 	unsigned int capabilities;
 };
 
+int exynos_plane_init(struct drm_device *dev,
+		      struct exynos_drm_plane *exynos_plane, unsigned int index,
+		      const struct exynos_drm_plane_config *config);
+
 /*
  * Exynos drm crtc ops
  *
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 46588a14f0c3..b1a9502a4140 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -31,7 +31,6 @@
 #include "exynos_drm_drv.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_crtc.h"
-#include "exynos_drm_plane.h"
 
 /*
  * FIMD stands for Fully Interactive Mobile Display and
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index df0508e0e49e..8af0eba3f362 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -19,7 +19,6 @@
 #include "exynos_drm_crtc.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_gem.h"
-#include "exynos_drm_plane.h"
 
 /*
  * This function is to get X or Y size shown via screen. This needs length and
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.h b/drivers/gpu/drm/exynos/exynos_drm_plane.h
deleted file mode 100644
index 497047b19614..000000000000
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.Ltd
- * Authors: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-int exynos_plane_init(struct drm_device *dev,
-		      struct exynos_drm_plane *exynos_plane, unsigned int index,
-		      const struct exynos_drm_plane_config *config);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index 29f4c1932aed..ec30d5aca9aa 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -26,7 +26,6 @@
 #include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
 #include "exynos_drm_fb.h"
-#include "exynos_drm_plane.h"
 #include "exynos_drm_vidi.h"
 
 /* VIDI uses fixed refresh rate of 50Hz */
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 0573eab0e190..1faa67fa7e5c 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -39,7 +39,6 @@
 #include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
 #include "exynos_drm_fb.h"
-#include "exynos_drm_plane.h"
 
 #define MIXER_WIN_NR		3
 #define VP_DEFAULT_WIN		2

From patchwork Wed Mar 20 13:06:45 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861553
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AAB3317EF
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:17 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9024F28957
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:17 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 8478B28BA9; Wed, 20 Mar 2019 13:07:17 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D04A29BE1
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:16 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726506AbfCTNHP (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:15 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58154 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727141AbfCTNHP (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:15 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130713euoutp02622d48d5ecd7222704398d85e8743f58~NrJxS9zMB1535315353euoutp02H;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130713euoutp02622d48d5ecd7222704398d85e8743f58~NrJxS9zMB1535315353euoutp02H
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087233;
        bh=Fb9dJxV68DaagoJOU6h5yb3yQu7u/2u38FlqOTjxzss=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=K+qtYausFGiy0rqzJ1HMTZq8YH8n7C1xcLH4sMx26MJoOczOhqmK39sCWasZ7OKhZ
         di/x1JMHdSkbQnKQO4NpmLKpHSECZiZeTvMzQvV8ZKlA6Rfs88KB34d+gZgM1BngDN
         ZdWLzqZDr4omOR/21JS7Y4/d1Eq7IJc6rGCNyRtA=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130713eucas1p118ab0e9afb67ee3ddb516cdd9db524be~NrJwx7gyk2311723117eucas1p1u;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id C6.92.04806.10B329C5;
 Wed, 20
        Mar 2019 13:07:13 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130712eucas1p2f3735c6c5afd7117f297ce7f495e4479~NrJwNl8RO0223602236eucas1p2g;
        Wed, 20 Mar 2019 13:07:12 +0000 (GMT)
X-AuditID: cbfec7f5-79db79c0000012c6-17-5c923b016dd8
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 42.AF.04284.00B329C5;
 Wed, 20
        Mar 2019 13:07:12 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:12 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 02/24] drm/exynos: remove spare macro
Date: Wed, 20 Mar 2019 14:06:45 +0100
Message-id: <20190320130707.25161-3-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djP87qM1pNiDD5PZbe4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZq/8tYyzYyVKx/nMvYwPjI+YuRk4OCQETid/XfgDZXBxCAisYJaavuccK
        4XxmlLh2tJ8JpurM4x1MEIlljBKrdzyAcv4zSvxcvgesik1AU+Lv5ptsILaIgLLEqn3t7CBF
        zAK/geYu38YOkhAWsJfYt/QEWBGLgKpE26KNYHFeAQuJnce6GSHWyUus3nAA7EBOAUuJh3P+
        gw2SEPjLKvF05XGgbRxAjovE7bNGEPUyEp0dB6FOrZe4v6KFGaK+g1Fi64adUJ9aSxw+fpEV
        xGYW4JOYtG06M8QcXomONiGIEg+J3XPPskB81sMosffTU/YJjBILGBlWMYqnlhbnpqcWG+el
        lusVJ+YWl+al6yXn525iBEbY6X/Hv+5g3Pcn6RCjAAejEg/vhecTYoRYE8uKK3MPMUpwMCuJ
        8EYoTYoR4k1JrKxKLcqPLyrNSS0+xCjNwaIkzlvN8CBaSCA9sSQ1OzW1ILUIJsvEwSnVwJiV
        8XnxdD69mfsuTLr++e08neuHn23P2PRD5krpqy88rSxrOLp+Fm1/nhO03eWcWg6n1WOGTd6J
        F2MfJxZdyTrjKRtaucaG/V/Ys8gb09xUz7kuXiP500bfVnBS6e2viQff9q2Zt+O+hO76v2r7
        lB/l/yldnDZVavKCUHaJn28ttJe+yZ/qs8VIiaU4I9FQi7moOBEAPdtW7qwCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV0G60kxBpf36VrcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6M1f+WMRbsZKlY/7mXsYHxEXMXIyeHhICJxJnHO5i6GLk4hASWMEo8f3ua
        BcJpZJK42zuRHaSKTUBT4u/mm2wgtoiAssSqfe3sIEXMAr8ZJT7P+Ao2SljAXmLf0hNgRSwC
        qhJtizaCNfMKWEjsPNbNCLFOXmL1hgNg9ZwClhIP5/wHqxECqll84i7jBEaeBYwMqxhFUkuL
        c9Nziw31ihNzi0vz0vWS83M3MQKDZtuxn5t3MF7aGHyIUYCDUYmHt+LphBgh1sSy4srcQ4wS
        HMxKIrwRSpNihHhTEiurUovy44tKc1KLDzFKc7AoifOeN6iMEhJITyxJzU5NLUgtgskycXBK
        NTA2Tax9a9/H0Tp95/Q96hkGlt8WP3as/JZdLC7cLXrEeOOan+rWr9ZzMRfuKC2NFtg6++6q
        tB9/N1fWb/q9Stb/rfPZK/W1kqdeeiU9TJvjZLDi/e7aifsOHVkTby7zRPu0a2XMl2nbtvmo
        Zkr+OvJJKpOtdmrS4XN3857IZfz6bLU/hCclfa+GEktxRqKhFnNRcSIAdamw1xYCAAA=
X-CMS-MailID: 20190320130712eucas1p2f3735c6c5afd7117f297ce7f495e4479
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130712eucas1p2f3735c6c5afd7117f297ce7f495e4479
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130712eucas1p2f3735c6c5afd7117f297ce7f495e4479@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

MAX_CRTC macro is not used at all.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 6e38d0dc4457..1f6bb5516170 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -18,7 +18,6 @@
 #include <drm/drmP.h>
 #include <linux/module.h>
 
-#define MAX_CRTC	3
 #define MAX_PLANE	5
 #define MAX_FB_BUFFER	4
 

From patchwork Wed Mar 20 13:06:46 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861555
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A1961823
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CB8A2838B
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 1A65828B92; Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF1BA2996A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:16 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1725905AbfCTNHQ (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:16 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58180 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727172AbfCTNHQ (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:16 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130714euoutp02207bf28d06240cfebf4a95f710906a4a~NrJxwSUia1589215892euoutp02i;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130714euoutp02207bf28d06240cfebf4a95f710906a4a~NrJxwSUia1589215892euoutp02i
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087234;
        bh=UR1xPsqq5p6w7wEYsZmeIYJwRrzLGWgQ4s3cBUVmb60=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=i2SUsyRvg65ZmR7WQ7PqLnmbYn2AJ2QKN24hpcoH6JlQAnaCUUKQ+sAugckeIs72n
         aNq4IYn5+VfMdHU22ZEoa0qKpDjFaydL5VbjWYjwzdhFOt+r8H5/qWPjZVRpDFXJ6I
         m6+NA4UFzxJXhHiGF94nxH7TD9iJVjMQ02+gVccE=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130713eucas1p265e029a26728056629a314fad9a40673~NrJxV08xF0223602236eucas1p2i;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id F7.92.04806.10B329C5;
 Wed, 20
        Mar 2019 13:07:13 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130713eucas1p137746c8fcdf13bbe1c897c27a245b22a~NrJw2XuAJ2304123041eucas1p1v;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
X-AuditID: cbfec7f5-367ff700000012c6-1b-5c923b01fc66
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 47.DA.04128.10B329C5;
 Wed, 20
        Mar 2019 13:07:13 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 03/24] drm/exynos: drop exynos_drm_plane_config
 structure
Date: Wed, 20 Mar 2019 14:06:46 +0100
Message-id: <20190320130707.25161-4-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djP87qM1pNiDL716VvcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MvrvyBVNbGSv+bPVvYFyW18XIySEhYCKx5Pcmli5GLg4hgRWMEj2bv7JC
        OJ8ZJe69W8AGU7Vo0VVmiMQyRon9E76xQzj/gVr2nmMEqWIT0JT4u/kmWIeIgLLEqn3tYEXM
        Ar8ZJaYv38YOkhAWCAUa9QbMZhFQlXi0ZwULiM0rYCGx584lqHXyEqs3HGAGsTkFLCUezvkP
        NkhC4C+rxKUtf5ghilwk5v3byQhhy0hcntzNAmHXS9xf0cIM0dDBKLF1w06oBmuJw8cvsoLY
        zAJ8EpO2TQeKcwDFeSU62oQgSjwkTj06Cg2AHkaJUx3z2CYwSixgZFjFKJ5aWpybnlpsnJda
        rlecmFtcmpeul5yfu4kRGGGn/x3/uoNx35+kQ4wCHIxKPLwXnk+IEWJNLCuuzD3EKMHBrCTC
        G6E0KUaINyWxsiq1KD++qDQntfgQozQHi5I4bzXDg2ghgfTEktTs1NSC1CKYLBMHp1QDY+bT
        KV/eVDDEc7y5I/OpSm5v8ZvdZWe2Vlsv/Hlku7ns0ZtHa743SChEGQoqX1x3T6GHMzbH70P2
        IyZhkdd3lors60n5U3FAZFn5/P4+4wShvuoXvw56Hnq8+LSbvM35z0cT1hlsNr7RXpdz97Y2
        34m33K8P/Emt33D+TdWNYnF5idgVKzXeZCqxFGckGmoxFxUnAgDndGFLrAIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4ZV1G60kxBksXc1ncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MvrvyBVNbGSv+bPVvYFyW18XIySEhYCKxaNFVZhBbSGAJo8T/3YldjFxA
        diOTxPlLd5hAEmwCmhJ/N99kA7FFBJQlVu1rZwcpYhb4zSjxecZXsG5hgVCgSW/YQWwWAVWJ
        R3tWsIDYvAIWEnvuXGKD2CYvsXrDAbB6TgFLiYdz/rNDbLaQWHziLuMERp4FjAyrGEVSS4tz
        03OLjfSKE3OLS/PS9ZLzczcxAgNm27GfW3Ywdr0LPsQowMGoxMNb8XRCjBBrYllxZe4hRgkO
        ZiUR3gilSTFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEec8bVEYJCaQnlqRmp6YWpBbBZJk4OKUa
        GGfe2JC44zvP6YfqzvtWpy8X3vzLYk/i9Lx7yc93f3hnwLWxiS/1Ns9GtYhbl1bX/3k4V6qj
        e/7Fv0pbhNd7h7hf/TVn48rVM1I4Tn3q+aebHyeyrf7tU+5TE2yn5oXNXFgtMMV3lfEmkxq9
        TeKT3mheEtbOUrBbd5PHwGYPZ3bVi3D3Lfttvq9VYinOSDTUYi4qTgQAYVB+HhQCAAA=
X-CMS-MailID: 20190320130713eucas1p137746c8fcdf13bbe1c897c27a245b22a
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130713eucas1p137746c8fcdf13bbe1c897c27a245b22a
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130713eucas1p137746c8fcdf13bbe1c897c27a245b22a@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

exynos_drm_plane_config must be present for every plane, and most fields
are redundant with exynos_drm_plane:
- pixel_formats, num_pixel_formats are stored in plane.base.format_*,
- type is stored in plane.base.type,
- zpos is always equal to plane.index.
The only non-redundant field capabilities can be moved to exynos_drm_plane.
As consequence of removing the structure some code should be refactored.
The patch should not have functional changes.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 18 +++---
 drivers/gpu/drm/exynos/exynos7_drm_decon.c    | 11 +---
 drivers/gpu/drm/exynos/exynos_drm_drv.h       | 39 ++++---------
 drivers/gpu/drm/exynos/exynos_drm_fimd.c      | 17 ++----
 drivers/gpu/drm/exynos/exynos_drm_plane.c     | 56 +++++++++---------
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      | 11 +---
 drivers/gpu/drm/exynos/exynos_mixer.c         | 58 +++++++------------
 7 files changed, 76 insertions(+), 134 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 24df0b307b2f..ae0f475eb633 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -56,7 +56,6 @@ struct decon_context {
 	struct drm_device		*drm_dev;
 	struct exynos_drm_crtc		*crtc;
 	struct exynos_drm_plane		planes[WINDOWS_NR];
-	struct exynos_drm_plane_config	configs[WINDOWS_NR];
 	void __iomem			*addr;
 	struct regmap			*sysreg;
 	struct clk			*clks[ARRAY_SIZE(decon_clks_name)];
@@ -608,22 +607,19 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 	struct drm_device *drm_dev = data;
 	struct exynos_drm_plane *exynos_plane;
 	enum exynos_drm_output_type out_type;
-	unsigned int win;
+	unsigned int i;
 	int ret;
 
 	ctx->drm_dev = drm_dev;
 
-	for (win = ctx->first_win; win < WINDOWS_NR; win++) {
-		ctx->configs[win].pixel_formats = decon_formats;
-		ctx->configs[win].num_pixel_formats = ARRAY_SIZE(decon_formats);
-		ctx->configs[win].zpos = win - ctx->first_win;
-		ctx->configs[win].type = decon_win_types[win];
-		ctx->configs[win].capabilities = EXYNOS_DRM_PLANE_CAP_ZPOS
+	for (i = ctx->first_win; i < WINDOWS_NR; i++) {
+		ctx->planes[i].index = i - ctx->first_win;
+		ctx->planes[i].capabilities = EXYNOS_DRM_PLANE_CAP_ZPOS
 					| EXYNOS_DRM_PLANE_CAP_WIN_BLEND
 					| EXYNOS_DRM_PLANE_CAP_PIX_BLEND;
-
-		ret = exynos_plane_init(drm_dev, &ctx->planes[win], win,
-					&ctx->configs[win]);
+		ret = exynos_plane_init(drm_dev, &ctx->planes[i],
+			decon_formats, ARRAY_SIZE(decon_formats),
+			decon_win_types[i]);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index 812941b84287..6d462f057531 100644
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -44,7 +44,6 @@ struct decon_context {
 	struct drm_device		*drm_dev;
 	struct exynos_drm_crtc		*crtc;
 	struct exynos_drm_plane		planes[WINDOWS_NR];
-	struct exynos_drm_plane_config	configs[WINDOWS_NR];
 	struct clk			*pclk;
 	struct clk			*aclk;
 	struct clk			*eclk;
@@ -626,13 +625,9 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 	}
 
 	for (i = 0; i < WINDOWS_NR; i++) {
-		ctx->configs[i].pixel_formats = decon_formats;
-		ctx->configs[i].num_pixel_formats = ARRAY_SIZE(decon_formats);
-		ctx->configs[i].zpos = i;
-		ctx->configs[i].type = decon_win_types[i];
-
-		ret = exynos_plane_init(drm_dev, &ctx->planes[i], i,
-					&ctx->configs[i]);
+		ctx->planes[i].index = i;
+		ret = exynos_plane_init(drm_dev, &ctx->planes[i], decon_formats,
+			ARRAY_SIZE(decon_formats), decon_win_types[i]);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 1f6bb5516170..1d4ef0245958 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -71,11 +71,19 @@ to_exynos_plane_state(struct drm_plane_state *state)
 	return container_of(state, struct exynos_drm_plane_state, base);
 }
 
+#define EXYNOS_DRM_PLANE_CAP_DOUBLE	(1 << 0)
+#define EXYNOS_DRM_PLANE_CAP_SCALE	(1 << 1)
+#define EXYNOS_DRM_PLANE_CAP_ZPOS	(1 << 2)
+#define EXYNOS_DRM_PLANE_CAP_TILE	(1 << 3)
+#define EXYNOS_DRM_PLANE_CAP_PIX_BLEND	(1 << 4)
+#define EXYNOS_DRM_PLANE_CAP_WIN_BLEND	(1 << 5)
+
 /*
  * Exynos drm common overlay structure.
  *
  * @base: plane object
  * @index: hardware index of the overlay layer
+ * @capabilities: supported features (see EXYNOS_DRM_PLANE_CAP_*)
  *
  * this structure is common to exynos SoC and its contents would be copied
  * to hardware specific overlay info.
@@ -83,38 +91,13 @@ to_exynos_plane_state(struct drm_plane_state *state)
 
 struct exynos_drm_plane {
 	struct drm_plane base;
-	const struct exynos_drm_plane_config *config;
 	unsigned int index;
-};
-
-#define EXYNOS_DRM_PLANE_CAP_DOUBLE	(1 << 0)
-#define EXYNOS_DRM_PLANE_CAP_SCALE	(1 << 1)
-#define EXYNOS_DRM_PLANE_CAP_ZPOS	(1 << 2)
-#define EXYNOS_DRM_PLANE_CAP_TILE	(1 << 3)
-#define EXYNOS_DRM_PLANE_CAP_PIX_BLEND	(1 << 4)
-#define EXYNOS_DRM_PLANE_CAP_WIN_BLEND	(1 << 5)
-
-/*
- * Exynos DRM plane configuration structure.
- *
- * @zpos: initial z-position of the plane.
- * @type: type of the plane (primary, cursor or overlay).
- * @pixel_formats: supported pixel formats.
- * @num_pixel_formats: number of elements in 'pixel_formats'.
- * @capabilities: supported features (see EXYNOS_DRM_PLANE_CAP_*)
- */
-
-struct exynos_drm_plane_config {
-	unsigned int zpos;
-	enum drm_plane_type type;
-	const uint32_t *pixel_formats;
-	unsigned int num_pixel_formats;
 	unsigned int capabilities;
 };
 
-int exynos_plane_init(struct drm_device *dev,
-		      struct exynos_drm_plane *exynos_plane, unsigned int index,
-		      const struct exynos_drm_plane_config *config);
+int exynos_plane_init(struct drm_device *dev, struct exynos_drm_plane *plane,
+		      const uint32_t *pixel_formats, int num_pixel_formats,
+		      enum drm_plane_type type);
 
 /*
  * Exynos drm crtc ops
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index b1a9502a4140..2d34ca375ee1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -171,7 +171,6 @@ struct fimd_context {
 	struct drm_device		*drm_dev;
 	struct exynos_drm_crtc		*crtc;
 	struct exynos_drm_plane		planes[WINDOWS_NR];
-	struct exynos_drm_plane_config	configs[WINDOWS_NR];
 	struct clk			*bus_clk;
 	struct clk			*lcd_clk;
 	void __iomem			*regs;
@@ -1044,16 +1043,12 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
 	ctx->drm_dev = drm_dev;
 
 	for (i = 0; i < WINDOWS_NR; i++) {
-		ctx->configs[i].pixel_formats = fimd_formats;
-		ctx->configs[i].num_pixel_formats = ARRAY_SIZE(fimd_formats);
-		ctx->configs[i].zpos = i;
-		ctx->configs[i].type = fimd_win_types[i];
-		ctx->configs[i].capabilities = EXYNOS_DRM_PLANE_CAP_ZPOS
-					     | EXYNOS_DRM_PLANE_CAP_WIN_BLEND
-					     | EXYNOS_DRM_PLANE_CAP_PIX_BLEND;
-
-		ret = exynos_plane_init(drm_dev, &ctx->planes[i], i,
-					&ctx->configs[i]);
+		ctx->planes[i].index = i;
+		ctx->planes[i].capabilities = EXYNOS_DRM_PLANE_CAP_ZPOS
+					    | EXYNOS_DRM_PLANE_CAP_WIN_BLEND
+					    | EXYNOS_DRM_PLANE_CAP_PIX_BLEND;
+		ret = exynos_plane_init(drm_dev, &ctx->planes[i], fimd_formats,
+				ARRAY_SIZE(fimd_formats), fimd_win_types[i]);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 8af0eba3f362..e1aa504539fa 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -138,7 +138,7 @@ static void exynos_drm_plane_reset(struct drm_plane *plane)
 	exynos_state = kzalloc(sizeof(*exynos_state), GFP_KERNEL);
 	if (exynos_state) {
 		__drm_atomic_helper_plane_reset(plane, &exynos_state->base);
-		plane->state->zpos = exynos_plane->config->zpos;
+		plane->state->zpos = exynos_plane->index;
 	}
 }
 
@@ -176,14 +176,14 @@ static struct drm_plane_funcs exynos_plane_funcs = {
 };
 
 static int
-exynos_drm_plane_check_format(const struct exynos_drm_plane_config *config,
-			      struct exynos_drm_plane_state *state)
+exynos_drm_plane_check_format(struct exynos_drm_plane_state *state)
 {
+	struct exynos_drm_plane *plane = to_exynos_plane(state->base.plane);
 	struct drm_framebuffer *fb = state->base.fb;
 
 	switch (fb->modifier) {
 	case DRM_FORMAT_MOD_SAMSUNG_64_32_TILE:
-		if (!(config->capabilities & EXYNOS_DRM_PLANE_CAP_TILE))
+		if (!(plane->capabilities & EXYNOS_DRM_PLANE_CAP_TILE))
 			return -ENOTSUPP;
 		break;
 
@@ -199,12 +199,12 @@ exynos_drm_plane_check_format(const struct exynos_drm_plane_config *config,
 }
 
 static int
-exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
-			    struct exynos_drm_plane_state *state)
+exynos_drm_plane_check_size(struct exynos_drm_plane_state *state)
 {
+	struct exynos_drm_plane *plane = to_exynos_plane(state->base.plane);
 	bool width_ok = false, height_ok = false;
 
-	if (config->capabilities & EXYNOS_DRM_PLANE_CAP_SCALE)
+	if (plane->capabilities & EXYNOS_DRM_PLANE_CAP_SCALE)
 		return 0;
 
 	if (state->src.w == state->crtc.w)
@@ -213,11 +213,11 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
 	if (state->src.h == state->crtc.h)
 		height_ok = true;
 
-	if ((config->capabilities & EXYNOS_DRM_PLANE_CAP_DOUBLE) &&
+	if ((plane->capabilities & EXYNOS_DRM_PLANE_CAP_DOUBLE) &&
 	    state->h_ratio == (1 << 15))
 		width_ok = true;
 
-	if ((config->capabilities & EXYNOS_DRM_PLANE_CAP_DOUBLE) &&
+	if ((plane->capabilities & EXYNOS_DRM_PLANE_CAP_DOUBLE) &&
 	    state->v_ratio == (1 << 15))
 		height_ok = true;
 
@@ -231,7 +231,6 @@ exynos_drm_plane_check_size(const struct exynos_drm_plane_config *config,
 static int exynos_plane_atomic_check(struct drm_plane *plane,
 				     struct drm_plane_state *state)
 {
-	struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
 	struct exynos_drm_plane_state *exynos_state =
 						to_exynos_plane_state(state);
 	int ret = 0;
@@ -242,11 +241,11 @@ static int exynos_plane_atomic_check(struct drm_plane *plane,
 	/* translate state into exynos_state */
 	exynos_plane_mode_set(exynos_state);
 
-	ret = exynos_drm_plane_check_format(exynos_plane->config, exynos_state);
+	ret = exynos_drm_plane_check_format(exynos_state);
 	if (ret)
 		return ret;
 
-	ret = exynos_drm_plane_check_size(exynos_plane->config, exynos_state);
+	ret = exynos_drm_plane_check_size(exynos_state);
 	return ret;
 }
 
@@ -292,40 +291,37 @@ static void exynos_plane_attach_zpos_property(struct drm_plane *plane,
 		drm_plane_create_zpos_property(plane, zpos, 0, MAX_PLANE - 1);
 }
 
-int exynos_plane_init(struct drm_device *dev,
-		      struct exynos_drm_plane *exynos_plane, unsigned int index,
-		      const struct exynos_drm_plane_config *config)
+int exynos_plane_init(struct drm_device *dev, struct exynos_drm_plane *plane,
+		      const uint32_t *pixel_formats, int num_pixel_formats,
+		      enum drm_plane_type type)
 {
 	int err;
 	unsigned int supported_modes = BIT(DRM_MODE_BLEND_PIXEL_NONE) |
 				       BIT(DRM_MODE_BLEND_PREMULTI) |
 				       BIT(DRM_MODE_BLEND_COVERAGE);
-	struct drm_plane *plane = &exynos_plane->base;
+	struct drm_plane *bplane = &plane->base;
 
-	err = drm_universal_plane_init(dev, &exynos_plane->base,
+	err = drm_universal_plane_init(dev, bplane,
 				       1 << dev->mode_config.num_crtc,
 				       &exynos_plane_funcs,
-				       config->pixel_formats,
-				       config->num_pixel_formats,
-				       NULL, config->type, NULL);
+				       pixel_formats,
+				       num_pixel_formats,
+				       NULL, type, NULL);
 	if (err) {
 		DRM_ERROR("failed to initialize plane\n");
 		return err;
 	}
 
-	drm_plane_helper_add(&exynos_plane->base, &plane_helper_funcs);
-
-	exynos_plane->index = index;
-	exynos_plane->config = config;
+	drm_plane_helper_add(bplane, &plane_helper_funcs);
 
-	exynos_plane_attach_zpos_property(&exynos_plane->base, config->zpos,
-			   !(config->capabilities & EXYNOS_DRM_PLANE_CAP_ZPOS));
+	exynos_plane_attach_zpos_property(bplane, plane->index,
+			   !(plane->capabilities & EXYNOS_DRM_PLANE_CAP_ZPOS));
 
-	if (config->capabilities & EXYNOS_DRM_PLANE_CAP_PIX_BLEND)
-		drm_plane_create_blend_mode_property(plane, supported_modes);
+	if (plane->capabilities & EXYNOS_DRM_PLANE_CAP_PIX_BLEND)
+		drm_plane_create_blend_mode_property(bplane, supported_modes);
 
-	if (config->capabilities & EXYNOS_DRM_PLANE_CAP_WIN_BLEND)
-		drm_plane_create_alpha_property(plane);
+	if (plane->capabilities & EXYNOS_DRM_PLANE_CAP_WIN_BLEND)
+		drm_plane_create_alpha_property(bplane);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index ec30d5aca9aa..b61ae3415b8c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -378,21 +378,14 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
 	struct drm_device *drm_dev = data;
 	struct drm_encoder *encoder = &ctx->encoder;
 	struct exynos_drm_plane *exynos_plane;
-	struct exynos_drm_plane_config plane_config = { 0 };
 	unsigned int i;
 	int ret;
 
 	ctx->drm_dev = drm_dev;
 
-	plane_config.pixel_formats = formats;
-	plane_config.num_pixel_formats = ARRAY_SIZE(formats);
-
 	for (i = 0; i < WINDOWS_NR; i++) {
-		plane_config.zpos = i;
-		plane_config.type = vidi_win_types[i];
-
-		ret = exynos_plane_init(drm_dev, &ctx->planes[i], i,
-					&plane_config);
+		ret = exynos_plane_init(drm_dev, &ctx->planes[i], formats,
+				        ARRAY_SIZE(formats), vidi_win_types[i]);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 1faa67fa7e5c..750f682e9c31 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -122,37 +122,6 @@ 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 |
-				EXYNOS_DRM_PLANE_CAP_ZPOS |
-				EXYNOS_DRM_PLANE_CAP_PIX_BLEND |
-				EXYNOS_DRM_PLANE_CAP_WIN_BLEND,
-	}, {
-		.zpos = 1,
-		.type = DRM_PLANE_TYPE_CURSOR,
-		.pixel_formats = mixer_formats,
-		.num_pixel_formats = ARRAY_SIZE(mixer_formats),
-		.capabilities = EXYNOS_DRM_PLANE_CAP_DOUBLE |
-				EXYNOS_DRM_PLANE_CAP_ZPOS |
-				EXYNOS_DRM_PLANE_CAP_PIX_BLEND |
-				EXYNOS_DRM_PLANE_CAP_WIN_BLEND,
-	}, {
-		.zpos = 2,
-		.type = DRM_PLANE_TYPE_OVERLAY,
-		.pixel_formats = vp_formats,
-		.num_pixel_formats = ARRAY_SIZE(vp_formats),
-		.capabilities = EXYNOS_DRM_PLANE_CAP_SCALE |
-				EXYNOS_DRM_PLANE_CAP_ZPOS |
-				EXYNOS_DRM_PLANE_CAP_TILE |
-				EXYNOS_DRM_PLANE_CAP_WIN_BLEND,
-	},
-};
-
 static const u8 filter_y_horiz_tap8[] = {
 	0,	-1,	-1,	-1,	-1,	-1,	-1,	-1,
 	-1,	-1,	-1,	-1,	-1,	0,	0,	0,
@@ -1151,18 +1120,33 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 	struct exynos_drm_plane *exynos_plane;
 	unsigned int i;
 	int ret;
+	static enum drm_plane_type types[] = { DRM_PLANE_TYPE_PRIMARY,
+		DRM_PLANE_TYPE_CURSOR, DRM_PLANE_TYPE_OVERLAY };
 
 	ret = mixer_initialize(ctx, drm_dev);
 	if (ret)
 		return ret;
 
-	for (i = 0; i < MIXER_WIN_NR; i++) {
-		if (i == VP_DEFAULT_WIN && !test_bit(MXR_BIT_VP_ENABLED,
-						     &ctx->flags))
-			continue;
+	for (i = 0; i < VP_DEFAULT_WIN; i++) {
+		ctx->planes[i].index = i;
+		ctx->planes[i].capabilities = EXYNOS_DRM_PLANE_CAP_DOUBLE |
+					      EXYNOS_DRM_PLANE_CAP_ZPOS |
+					      EXYNOS_DRM_PLANE_CAP_PIX_BLEND |
+					      EXYNOS_DRM_PLANE_CAP_WIN_BLEND;
+		ret = exynos_plane_init(drm_dev, &ctx->planes[i], mixer_formats,
+			ARRAY_SIZE(mixer_formats), types[i]);
+		if (ret)
+			return ret;
+	}
 
-		ret = exynos_plane_init(drm_dev, &ctx->planes[i], i,
-					&plane_configs[i]);
+	if (test_bit(MXR_BIT_VP_ENABLED, &ctx->flags)) {
+		ctx->planes[i].index = i;
+		ctx->planes[i].capabilities = EXYNOS_DRM_PLANE_CAP_SCALE |
+					      EXYNOS_DRM_PLANE_CAP_ZPOS |
+					      EXYNOS_DRM_PLANE_CAP_TILE |
+					      EXYNOS_DRM_PLANE_CAP_WIN_BLEND;
+		ret = exynos_plane_init(drm_dev, &ctx->planes[i], vp_formats,
+			ARRAY_SIZE(vp_formats), types[i]);
 		if (ret)
 			return ret;
 	}

From patchwork Wed Mar 20 13:06:47 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861571
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A91BE17EF
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DA862838B
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 8C28529077; Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 621D028B63
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:16 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727141AbfCTNHQ (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:16 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55149 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727359AbfCTNHP (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:15 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130714euoutp014f3df7d756bd5ac087d3ad1adebdcfbe~NrJyAW8wt0183101831euoutp01r;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130714euoutp014f3df7d756bd5ac087d3ad1adebdcfbe~NrJyAW8wt0183101831euoutp01r
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087234;
        bh=yzRSaJjb04WXw7ci4RcnQ2/nqT/0CwcF9Ug5GhkIUA4=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=oiALp3Xlv2OcK0NRONHMHfqIJxjdTRTmSsTtm4EXJUlfFjaABMcMensf8S77CNyZm
         4FIQrJp9fL96VKxi5iazbOJ1Qywnvaw1eciAz0L7vd8uMRy811yFmR/mezZy7fqvJB
         pP/AXGHWPjz0X/YESpTSLK1cPAhBX/7LkpxZlGWw=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130714eucas1p2f0138d261aac8abf3d24c0d93afa5b31~NrJxnmcGd1038110381eucas1p2w;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 88.92.04806.20B329C5;
 Wed, 20
        Mar 2019 13:07:14 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130713eucas1p2dd57732ea0135355863ba26424a8bacf~NrJxDaQqc1479814798eucas1p2M;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-1c-5c923b02e228
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 13.AF.04284.10B329C5;
 Wed, 20
        Mar 2019 13:07:13 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 04/24] drm/exynos: add exynos_drm_crtc_init
 function
Date: Wed, 20 Mar 2019 14:06:47 +0100
Message-id: <20190320130707.25161-5-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprGIsWRmVeSWpSXmKPExsWy7djP87pM1pNiDDraWCxurTvHarFxxnpW
        iytf37NZTLo/gcXi/PkN7BYzzu9jslh75C67A7vHplWdbB73u48zefRtWcXo8XmTXABLFJdN
        SmpOZllqkb5dAldG162fjAUP+Su6751naWA8yNvFyM4hIWAicZ61i5GLQ0hgBaPEjzNngBxO
        IOczo8Tc3pwuRg6wkoWnVCBqljFK3G2eBNXwn1GiZ+85RpAGNgFNib+bb7KB2CICyhKr9rWz
        gxQxC/xmlJi+fBs7SEJYIEDiaVcDWAOLgKrErZknwLbxClhIXPxzCCwuISAvsXrDAWYQm1PA
        UuLhnP9ggyQEGtkk9k66zwZR5CKxZf8CdghbRqKz4yAThF0vcX9FCzNEQwejxNYNO5khEtYS
        h49fBNvGLMAnMWnbdGaI33glOtqEIEo8JDadfckI8VoPo0Tvm4WsExglFjAyrGIUTy0tzk1P
        LTbOSy3XK07MLS7NS9dLzs/dxAiMrdP/jn/dwbjvT9IhRgEORiUe3gvPJ8QIsSaWFVfmHmKU
        4GBWEuGNUJoUI8SbklhZlVqUH19UmpNafIhRmoNFSZy3muFBtJBAemJJanZqakFqEUyWiYNT
        qoExx189aXMUw0+u3sfHTZSvTVjRGjJp9i/WPQt9/nMqO9iabmBaq2hfPG3liQ33Yn6vzl1v
        LriST2Tz14lXFnMq5CjPc9l0WCUkpnyn0Gyv047xHg1Z33Q6Fpka3bruese6b56WT4aLYcS2
        Rsb2G/Kt7OweJgd4th5i2s733Gib83qrTa/XbFiuxFKckWioxVxUnAgAAMOznakCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpiluLIzCtJLcpLzFFi42I5/e/4ZV1G60kxBu17lSxurTvHarFxxnpW
        iytf37NZTLo/gcXi/PkN7BYzzu9jslh75C67A7vHplWdbB73u48zefRtWcXo8XmTXABLFJdN
        SmpOZllqkb5dAldG162fjAUP+Su6751naWA8yNvFyMEhIWAisfCUShcjF4eQwBJGiZ9Lb7NB
        OI1MEucv3WHqYuTkYBPQlPi7+SYbiC0ioCyxal87O0gRs8BvRonPM74ygySEBfwkFlyfxAhi
        swioStyaeYIVxOYVsJC4+OcQWFxCQF5i9YYDYPWcApYSD+f8ZwexhYBqFp+4yziBkWcBI8Mq
        RpHU0uLc9NxiQ73ixNzi0rx0veT83E2MwJDZduzn5h2MlzYGH2IU4GBU4uGteDohRog1say4
        MvcQowQHs5IIb4TSpBgh3pTEyqrUovz4otKc1OJDjNIcLErivOcNKqOEBNITS1KzU1MLUotg
        skwcnFINjLzl503CBcQzHV3+54VV2mbJTb/Cc0pc1tS690fCW3nhX1+jNgSv7A3/+SB99b6j
        6y/LLF/1wX2yV9H6B8e5rA/fl7xs261b+1zXXLHzg8kt71SmdevTD93j2xkUZcF3unXx0x2c
        LmfmLpmcv+zey2mzL3CffTOhKFtQsW89r2ST/pFub0Gby0osxRmJhlrMRcWJAEmmZVwVAgAA
X-CMS-MailID: 20190320130713eucas1p2dd57732ea0135355863ba26424a8bacf
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130713eucas1p2dd57732ea0135355863ba26424a8bacf
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130713eucas1p2dd57732ea0135355863ba26424a8bacf@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Since exynos_drm_crtc is a struct which maps 1:1 to underlying device it
is better to put it directly into device's context instead of allocating
it separately. Another benefit is possibility of initialisation of
its fields directly, without expanding exynos_drm_crtc_create which is
already overloaded with number of arguments.
As a first step of the transition initialisation function should be
created.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ++++++++++
 drivers/gpu/drm/exynos/exynos_drm_crtc.h |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 1eebfa3fa8da..4ff1e0ff2255 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -172,6 +172,16 @@ static const struct drm_crtc_funcs exynos_crtc_funcs = {
 	.disable_vblank = exynos_drm_crtc_disable_vblank,
 };
 
+int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc,
+			 struct drm_device *drm_dev)
+{
+	struct drm_crtc *crtc = &exynos_crtc->base;
+
+	drm_crtc_helper_add(crtc, &exynos_crtc_helper_funcs);
+	return drm_crtc_init_with_planes(drm_dev, crtc, NULL, NULL,
+					 &exynos_crtc_funcs, NULL);
+}
+
 struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
 					struct drm_plane *plane,
 					enum exynos_drm_output_type type,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.h b/drivers/gpu/drm/exynos/exynos_drm_crtc.h
index dec446109e6c..9e35a9e02332 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.h
@@ -18,6 +18,8 @@
 
 #include "exynos_drm_drv.h"
 
+int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc,
+			 struct drm_device *drm_dev);
 struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
 					struct drm_plane *plane,
 					enum exynos_drm_output_type out_type,

From patchwork Wed Mar 20 13:06:48 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861557
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 715E315AC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58A4428B92
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 5642329858; Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB50728BA9
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727492AbfCTNHR (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:17 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58194 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727137AbfCTNHR (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:17 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130715euoutp025f4c2c326b952617a1c9cb86dc2e5842~NrJyj9gSj1589415894euoutp02f;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130715euoutp025f4c2c326b952617a1c9cb86dc2e5842~NrJyj9gSj1589415894euoutp02f
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087235;
        bh=4GagIZ6u+HzP7LKOOqaJeqOA7ziodwQif9IXyvp30QE=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=TAzsPghAgP2eM1Pv1hudk6h8v1bkVXv35URzWjh16I0UBXghDGhNLMvtn2BXpk+9Y
         KOdY4pSH/uvUSVFYT56KWngUPnq2e4D0E8hxBskAav+f+L1E4SHw/OgPgHpGmATYzH
         1fz9j6GmiOF1327w+mxI4DiZUKyEYscHxc6uwU8I=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130714eucas1p2c871758d756c36265bd0fe817a1e8ec0~NrJx8LVY80212202122eucas1p2W;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id AA.91.04294.20B329C5;
 Wed, 20
        Mar 2019 13:07:14 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130714eucas1p1c0b414ed76d7d0d78da56c9c0a6c8973~NrJxZButZ2311723117eucas1p1w;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
X-AuditID: cbfec7f4-835ff700000010c6-af-5c923b02d6e3
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id D7.DA.04128.10B329C5;
 Wed, 20
        Mar 2019 13:07:13 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:13 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 05/24] drm/exynos/decon5433: embed exynos_drm_crtc
 directly into context
Date: Wed, 20 Mar 2019 14:06:48 +0100
Message-id: <20190320130707.25161-6-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djPc7pM1pNiDPoWS1rcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6Mzz8fsRe8M6uYMvM7cwPjbt0uRk4OCQETibenFrF2MXJxCAmsYJSYduwq
        E4TzmVHi/4aP7DBV/Zt3s0AkljFKXLx0EqrqP6NEz95zjCBVbAKaEn8332QDsUUElCVW7Wtn
        ByliFvjNKDF9+TawUcICKRKr1vaDFbEIqEo863jHDGLzClhI9E9vZoJYJy+xesMBsDingKXE
        wzn/wQZJCPxllVh1cicjRJGLxJo7D1ggbBmJy5O7oex6ifsrWpghGjoYJbZu2MkMkbCWOHz8
        IiuIzSzAJzFp23SgOAdQnFeio00IosRD4t3dSWBzhAR6GCU2T7CfwCixgJFhFaN4amlxbnpq
        sVFearlecWJucWleul5yfu4mRmCEnf53/MsOxl1/kg4xCnAwKvHwXng+IUaINbGsuDL3EKME
        B7OSCG+E0qQYId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rzVDA+ihQTSE0tSs1NTC1KLYLJMHJxS
        DYyJYskLuW7fOHzD+spLaW//55I3Au2uihwu0yzprVv6/qckU/ZMrY0HTQKXBLof/nSXd956
        9mrPO65LH2y1/PpX0vXPR9V9TIfcWivnbXM8p7KxSaH81b+LVW82hRhlRX82dd5+8uj7hy8a
        giqO3r2v/Tdfy/BdxZR4we9vC7pXPXLqPF8pUe2kxFKckWioxVxUnAgARBVYfawCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpiluLIzCtJLcpLzFFi42I5/e/4ZV1G60kxBk3/rSxurTvHarFxxnpW
        iytf37NZTLo/gcXi/PkN7BYzzu9jslh75C67A7vHplWdbB73u48zefRtWcXo8XmTXABLFJdN
        SmpOZllqkb5dAlfG55+P2AvemVVMmfmduYFxt24XIyeHhICJRP/m3SwgtpDAEkaJPzu1uxi5
        gOxGJonzl+4wgSTYBDQl/m6+yQZiiwgoS6za184OUsQs8JtR4vOMr8wgCWGBFIlVa/vBilgE
        VCWedbwDi/MKWEj0T29mgtgmL7F6wwGwOKeApcTDOf/ZITZbSCw+cZdxAiPPAkaGVYwiqaXF
        uem5xUZ6xYm5xaV56XrJ+bmbGIEhs+3Yzy07GLveBR9iFOBgVOLhrXg6IUaINbGsuDL3EKME
        B7OSCG+E0qQYId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rznDSqjhATSE0tSs1NTC1KLYLJMHJxS
        DYynxBNaRGf2Zvi1Hvc20DaUEc3MYXV6llCZNI1Z7dXnlhgjyXtJAXUlMyJefhae7Frc6PLE
        kI+ne7Lg2ZfnF206//KgwG3humobppiT6eUcP96zTOOzaMyMfRX7hE94h6x0wMcL3qdmTj3z
        8Cffned332YnKjac9jNlFWD9ynrxwNmF8z/PslRiKc5INNRiLipOBADQKOy7FQIAAA==
X-CMS-MailID: 20190320130714eucas1p1c0b414ed76d7d0d78da56c9c0a6c8973
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130714eucas1p1c0b414ed76d7d0d78da56c9c0a6c8973
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130714eucas1p1c0b414ed76d7d0d78da56c9c0a6c8973@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Since crtc maps 1:1 to the device there is no point in allocating it
separately, another benefit is possibility of direct initialisation
of its fields which is more readable and allows further expansion.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index ae0f475eb633..0d409f453923 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -54,7 +54,7 @@ static const char * const decon_clks_name[] = {
 struct decon_context {
 	struct device			*dev;
 	struct drm_device		*drm_dev;
-	struct exynos_drm_crtc		*crtc;
+	struct exynos_drm_crtc		crtc;
 	struct exynos_drm_plane		planes[WINDOWS_NR];
 	void __iomem			*addr;
 	struct regmap			*sysreg;
@@ -69,6 +69,8 @@ struct decon_context {
 	u32				frame_id;
 };
 
+#define to_decon(ptr) container_of(ptr, struct decon_context, ptr)
+
 static const uint32_t decon_formats[] = {
 	DRM_FORMAT_XRGB1555,
 	DRM_FORMAT_RGB565,
@@ -90,7 +92,7 @@ static inline void decon_set_bits(struct decon_context *ctx, u32 reg, u32 mask,
 
 static int decon_enable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	u32 val;
 
 	val = VIDINTCON0_INTEN;
@@ -110,7 +112,7 @@ static int decon_enable_vblank(struct exynos_drm_crtc *crtc)
 
 static void decon_disable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 
 	if (!(ctx->out_type & I80_HW_TRG))
 		disable_irq_nosync(ctx->te_irq);
@@ -143,7 +145,7 @@ static u32 decon_get_frame_count(struct decon_context *ctx, bool end)
 
 	switch (status & (VIDCON1_VSTATUS_MASK | VIDCON1_I80_ACTIVE)) {
 	case VIDCON1_VSTATUS_VS:
-		if (!(ctx->crtc->i80_mode))
+		if (!(ctx->crtc.i80_mode))
 			--frm;
 		break;
 	case VIDCON1_VSTATUS_BP:
@@ -163,7 +165,7 @@ static u32 decon_get_frame_count(struct decon_context *ctx, bool end)
 
 static void decon_setup_trigger(struct decon_context *ctx)
 {
-	if (!ctx->crtc->i80_mode && !(ctx->out_type & I80_HW_TRG))
+	if (!ctx->crtc.i80_mode && !(ctx->out_type & I80_HW_TRG))
 		return;
 
 	if (!(ctx->out_type & I80_HW_TRG)) {
@@ -183,7 +185,7 @@ static void decon_setup_trigger(struct decon_context *ctx)
 
 static void decon_commit(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	struct drm_display_mode *m = &crtc->base.mode;
 	bool interlaced = false;
 	u32 val;
@@ -377,7 +379,7 @@ static void decon_shadow_protect(struct decon_context *ctx, bool protect)
 
 static void decon_atomic_begin(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 
 	decon_shadow_protect(ctx, true);
 }
@@ -391,7 +393,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
 {
 	struct exynos_drm_plane_state *state =
 				to_exynos_plane_state(plane->base.state);
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	struct drm_framebuffer *fb = state->base.fb;
 	unsigned int win = state->base.normalized_zpos + ctx->first_win;
 	unsigned int cpp = fb->format->cpp[0];
@@ -445,7 +447,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
 
 static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	unsigned long flags;
 	int win = hweight32(crtc->base.state->plane_mask) + ctx->first_win;
 
@@ -502,7 +504,7 @@ static void decon_swreset(struct decon_context *ctx)
 
 static void decon_enable(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 
 	pm_runtime_get_sync(ctx->dev);
 
@@ -510,12 +512,12 @@ static void decon_enable(struct exynos_drm_crtc *crtc)
 
 	decon_swreset(ctx);
 
-	decon_commit(ctx->crtc);
+	decon_commit(&ctx->crtc);
 }
 
 static void decon_disable(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	int i;
 
 	if (!(ctx->out_type & I80_HW_TRG))
@@ -548,7 +550,7 @@ static irqreturn_t decon_te_irq_handler(int irq, void *dev_id)
 
 static void decon_clear_channels(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	int win, i, ret;
 
 	DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -577,7 +579,7 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc)
 static enum drm_mode_status decon_mode_valid(struct exynos_drm_crtc *crtc,
 		const struct drm_display_mode *mode)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 
 	ctx->irq = crtc->i80_mode ? ctx->irq_lcd_sys : ctx->irq_vsync;
 
@@ -605,8 +607,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 {
 	struct decon_context *ctx = dev_get_drvdata(dev);
 	struct drm_device *drm_dev = data;
-	struct exynos_drm_plane *exynos_plane;
-	enum exynos_drm_output_type out_type;
 	unsigned int i;
 	int ret;
 
@@ -624,15 +624,15 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 			return ret;
 	}
 
-	exynos_plane = &ctx->planes[PRIMARY_WIN];
-	out_type = (ctx->out_type & IFTYPE_HDMI) ? EXYNOS_DISPLAY_TYPE_HDMI
-						  : EXYNOS_DISPLAY_TYPE_LCD;
-	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,
-			out_type, &decon_crtc_ops, ctx);
-	if (IS_ERR(ctx->crtc))
-		return PTR_ERR(ctx->crtc);
+	ctx->crtc.type = (ctx->out_type & IFTYPE_HDMI)
+		       ? EXYNOS_DISPLAY_TYPE_HDMI : EXYNOS_DISPLAY_TYPE_LCD;
+	ctx->crtc.ops = &decon_crtc_ops;
+	ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
+	if (ret)
+		return ret;
+	ctx->crtc.base.primary = &ctx->planes[PRIMARY_WIN].base;
 
-	decon_clear_channels(ctx->crtc);
+	decon_clear_channels(&ctx->crtc);
 
 	return exynos_drm_register_dma(drm_dev, dev);
 }
@@ -641,7 +641,7 @@ static void decon_unbind(struct device *dev, struct device *master, void *data)
 {
 	struct decon_context *ctx = dev_get_drvdata(dev);
 
-	decon_disable(ctx->crtc);
+	decon_disable(&ctx->crtc);
 
 	/* detach this sub driver from iommu mapping if supported. */
 	exynos_drm_unregister_dma(ctx->drm_dev, ctx->dev);
@@ -663,7 +663,7 @@ static void decon_handle_vblank(struct decon_context *ctx)
 	if (frm != ctx->frame_id) {
 		/* handle only if incremented, take care of wrap-around */
 		if ((s32)(frm - ctx->frame_id) > 0)
-			drm_crtc_handle_vblank(&ctx->crtc->base);
+			drm_crtc_handle_vblank(&ctx->crtc.base);
 		ctx->frame_id = frm;
 	}
 

From patchwork Wed Mar 20 13:06:49 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861559
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8AEB517EF
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7106E28BF1
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 6E4E629BE1; Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D77F528BF1
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727137AbfCTNHR (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:17 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58196 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727415AbfCTNHR (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:17 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130715euoutp0295dfc442b5b36604f1f6d2106e26abbd~NrJyv44wk1589215892euoutp02j;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130715euoutp0295dfc442b5b36604f1f6d2106e26abbd~NrJyv44wk1589215892euoutp02j
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087235;
        bh=uZvrClUPHfriRADK0ELl4qfX0XMk6sY0DwYeawi6/rs=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=lvwIMTCWhfwWU+a8ICQL902fA8rwGRabJD7GHiFomt+AhJ+dgDdUieLzjmtUh0CJW
         zWVYxMCNpixiRiDMip73u8vjUJcGCiL0wDkdBpRCNRAJGB43E9Dz+dVg6sKQkR6uy5
         Q8kGxLdJ7zTDH7nhF64eGdF8CNg0KB1W7bThH5+I=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130715eucas1p1a36d4449ac57191e764fe9eb3e556462~NrJyXwx2x2311723117eucas1p1x;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 19.92.04806.20B329C5;
 Wed, 20
        Mar 2019 13:07:14 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130714eucas1p2e4f96fe67486283560c7b6a8627b769c~NrJxy-h7C1665716657eucas1p2L;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-20-5c923b0243b3
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 93.AF.04284.20B329C5;
 Wed, 20
        Mar 2019 13:07:14 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 06/24] drm/exynos/decon7: embed exynos_drm_crtc
 directly into context
Date: Wed, 20 Mar 2019 14:06:49 +0100
Message-id: <20190320130707.25161-7-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djP87pM1pNiDD4+M7W4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZLWcvshXMMa348uQZewPjD+0uRk4OCQETia0fbzN1MXJxCAmsYJS4enka
        G4TzmVFiy7a57DBV+3r/s0AkljFK3Nx6jh3C+c8osXztbCaQKjYBTYm/m2+ygdgiAsoSq/a1
        gxUxC/xmlJi+fBvYKGGBRIml0xeC2SwCqhIL3v4Bsjk4eAUsJP5/SYfYJi+xesMBZhCbU8BS
        4uGc/2BzJAT+sko8PnObGaLIRWLeq+uMELaMRGfHQSYIu17i/ooWZoiGDkaJrRt2QjVYSxw+
        fpEVxGYW4JOYtG06M8hiCQFeiY42IYgSD4lLi/YwQ3zWwyhx4vBclgmMEgsYGVYxiqeWFuem
        pxYb56WW6xUn5haX5qXrJefnbmIERtjpf8e/7mDc9yfpEKMAB6MSD++F5xNihFgTy4orcw8x
        SnAwK4nwRihNihHiTUmsrEotyo8vKs1JLT7EKM3BoiTOW83wIFpIID2xJDU7NbUgtQgmy8TB
        KdXAqMnRlZp19Pppyed2/2fZs4bK5T9db3Nke2dL24nbz4Oj6ud95Tvb5yCW3fpVj1OM+8KC
        F1viux/sjUgPqGXrWqwvof/8d7Aww14r0yczORQKf11YPEtmv5RcuFt57euNLt3F79V0dVrv
        Giw9k+G54kXnwa55VnYn3nFZFN4MFTb1XBLa8Oy7EktxRqKhFnNRcSIAoZEe46wCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4ZV0m60kxBvuXiVncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MlrMX2QrmmFZ8efKMvYHxh3YXIyeHhICJxL7e/ywgtpDAEkaJ811RXYxc
        QHYjk0TPivvsIAk2AU2Jv5tvsoHYIgLKEqv2tbODFDEL/GaU+DzjKzNIQlggUWLp9IVgDSwC
        qhIL3v4Bsjk4eAUsJP5/SYdYJi+xesMBsHJOAUuJh3P+s0MstpBYfOIu4wRGngWMDKsYRVJL
        i3PTc4sN9YoTc4tL89L1kvNzNzECA2bbsZ+bdzBe2hh8iFGAg1GJh7fi6YQYIdbEsuLK3EOM
        EhzMSiK8EUqTYoR4UxIrq1KL8uOLSnNSiw8xSnOwKInznjeojBISSE8sSc1OTS1ILYLJMnFw
        SjUwVmpIPPi44abLkY2tM+669B2Z33/h08T48t7sgs9Rx+fP+j7RtspFMYL76M2Od7ENjZOO
        WX2Z/tG/9ZDQZyaJrV1sYj5vbX6erJ7jcryMn3fB1mf+JU3Sh5ueamh9rFS4d6Lnle3nw17J
        s9eI71jhGtd0zb7ut9/TSxnBL3yUFYo8rv7zXxiZocRSnJFoqMVcVJwIAMfEbN0UAgAA
X-CMS-MailID: 20190320130714eucas1p2e4f96fe67486283560c7b6a8627b769c
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130714eucas1p2e4f96fe67486283560c7b6a8627b769c
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130714eucas1p2e4f96fe67486283560c7b6a8627b769c@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Since crtc maps 1:1 to the device there is no point in allocating it
separately, another benefit is possibility of direct initialisation
of its fields which is more readable and allows further expansion.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos7_drm_decon.c | 50 +++++++++++-----------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index 6d462f057531..22659f2da755 100644
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -42,7 +42,7 @@
 struct decon_context {
 	struct device			*dev;
 	struct drm_device		*drm_dev;
-	struct exynos_drm_crtc		*crtc;
+	struct exynos_drm_crtc		crtc;
 	struct exynos_drm_plane		planes[WINDOWS_NR];
 	struct clk			*pclk;
 	struct clk			*aclk;
@@ -58,6 +58,8 @@ struct decon_context {
 	struct drm_encoder *encoder;
 };
 
+#define to_decon(ptr) container_of(ptr, struct decon_context, ptr)
+
 static const struct of_device_id decon_driver_dt_match[] = {
 	{.compatible = "samsung,exynos7-decon"},
 	{},
@@ -83,7 +85,7 @@ static const enum drm_plane_type decon_win_types[WINDOWS_NR] = {
 
 static void decon_wait_for_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 
 	if (ctx->suspended)
 		return;
@@ -102,7 +104,7 @@ static void decon_wait_for_vblank(struct exynos_drm_crtc *crtc)
 
 static void decon_clear_channels(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	unsigned int win, ch_enabled = 0;
 
 	DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -120,7 +122,7 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc)
 
 	/* Wait for vsync, as disable channel takes effect at next vsync */
 	if (ch_enabled)
-		decon_wait_for_vblank(ctx->crtc);
+		decon_wait_for_vblank(&ctx->crtc);
 }
 
 static int decon_ctx_initialize(struct decon_context *ctx,
@@ -128,7 +130,7 @@ static int decon_ctx_initialize(struct decon_context *ctx,
 {
 	ctx->drm_dev = drm_dev;
 
-	decon_clear_channels(ctx->crtc);
+	decon_clear_channels(&ctx->crtc);
 
 	return exynos_drm_register_dma(drm_dev, ctx->dev);
 }
@@ -153,7 +155,7 @@ static u32 decon_calc_clkdiv(struct decon_context *ctx,
 
 static void decon_commit(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	struct drm_display_mode *mode = &crtc->base.state->adjusted_mode;
 	u32 val, clkdiv;
 
@@ -218,7 +220,7 @@ static void decon_commit(struct exynos_drm_crtc *crtc)
 
 static int decon_enable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	u32 val;
 
 	if (ctx->suspended)
@@ -243,7 +245,7 @@ static int decon_enable_vblank(struct exynos_drm_crtc *crtc)
 
 static void decon_disable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	u32 val;
 
 	if (ctx->suspended)
@@ -368,7 +370,7 @@ static void decon_shadow_protect_win(struct decon_context *ctx,
 
 static void decon_atomic_begin(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	int i;
 
 	if (ctx->suspended)
@@ -383,7 +385,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
 {
 	struct exynos_drm_plane_state *state =
 				to_exynos_plane_state(plane->base.state);
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	struct drm_framebuffer *fb = state->base.fb;
 	int padding;
 	unsigned long val, alpha;
@@ -479,7 +481,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
 static void decon_disable_plane(struct exynos_drm_crtc *crtc,
 				struct exynos_drm_plane *plane)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	unsigned int win = plane->index;
 	u32 val;
 
@@ -501,7 +503,7 @@ static void decon_disable_plane(struct exynos_drm_crtc *crtc,
 
 static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	int i;
 
 	if (ctx->suspended)
@@ -531,7 +533,7 @@ static void decon_init(struct decon_context *ctx)
 
 static void decon_enable(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 
 	if (!ctx->suspended)
 		return;
@@ -542,16 +544,16 @@ static void decon_enable(struct exynos_drm_crtc *crtc)
 
 	/* if vblank was enabled status, enable it again. */
 	if (test_and_clear_bit(0, &ctx->irq_flags))
-		decon_enable_vblank(ctx->crtc);
+		decon_enable_vblank(&ctx->crtc);
 
-	decon_commit(ctx->crtc);
+	decon_commit(&ctx->crtc);
 
 	ctx->suspended = false;
 }
 
 static void decon_disable(struct exynos_drm_crtc *crtc)
 {
-	struct decon_context *ctx = crtc->ctx;
+	struct decon_context *ctx = to_decon(crtc);
 	int i;
 
 	if (ctx->suspended)
@@ -598,7 +600,7 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id)
 		goto out;
 
 	if (!ctx->i80_if) {
-		drm_crtc_handle_vblank(&ctx->crtc->base);
+		drm_crtc_handle_vblank(&ctx->crtc.base);
 
 		/* set wait vsync event to zero and wake up queue. */
 		if (atomic_read(&ctx->wait_vsync_event)) {
@@ -614,7 +616,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 {
 	struct decon_context *ctx = dev_get_drvdata(dev);
 	struct drm_device *drm_dev = data;
-	struct exynos_drm_plane *exynos_plane;
 	unsigned int i;
 	int ret;
 
@@ -632,13 +633,14 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 			return ret;
 	}
 
-	exynos_plane = &ctx->planes[DEFAULT_WIN];
-	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,
-			EXYNOS_DISPLAY_TYPE_LCD, &decon_crtc_ops, ctx);
-	if (IS_ERR(ctx->crtc)) {
+	ctx->crtc.type = EXYNOS_DISPLAY_TYPE_LCD;
+	ctx->crtc.ops = &decon_crtc_ops;
+	ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
+	if (ret) {
 		decon_ctx_remove(ctx);
-		return PTR_ERR(ctx->crtc);
+		return ret;
 	}
+	ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
 	if (ctx->encoder)
 		exynos_dpi_bind(drm_dev, ctx->encoder);
@@ -652,7 +654,7 @@ static void decon_unbind(struct device *dev, struct device *master,
 {
 	struct decon_context *ctx = dev_get_drvdata(dev);
 
-	decon_disable(ctx->crtc);
+	decon_disable(&ctx->crtc);
 
 	if (ctx->encoder)
 		exynos_dpi_remove(ctx->encoder);

From patchwork Wed Mar 20 13:06:50 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861567
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5963115AC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34C7329858
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 32A5329BEB; Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D75D29858
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727172AbfCTNHS (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:18 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55158 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727359AbfCTNHR (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:17 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130715euoutp015a1ad0b72396be23f9540134f3fd9c5f~NrJzGNRcj0192201922euoutp01e;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130715euoutp015a1ad0b72396be23f9540134f3fd9c5f~NrJzGNRcj0192201922euoutp01e
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087235;
        bh=HLWtj5gpnxYOt1cQ0328ti+3eXRQqGE+sXdo+C8YpoQ=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=RXyNAqglBv7NRhvymLgtNhhtTxWfp9vE584q/tufc1zDB+mUdBagPKRztZj26KbLU
         sYD3EeSGjvMVgRSmSmnIlYcoxaf63WnIqn3rZ9P97Zn2l3owDYfcLbnjtxnVCmFk7D
         po0pMP0qRdZpZfUtR9/AQtHizigSnnMkETBAjCs0=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130715eucas1p224b9cd46c91d1175a1b01c49ff497921~NrJytGNRw1038210382eucas1p2z;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id E9.92.04806.30B329C5;
 Wed, 20
        Mar 2019 13:07:15 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130714eucas1p1d3ab6fceec849f22bab69df1e46b972d~NrJyLi-6A2303723037eucas1p19;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-22-5c923b03cea3
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 98.DA.04128.20B329C5;
 Wed, 20
        Mar 2019 13:07:14 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:14 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 07/24] drm/exynos/fimd: embed exynos_drm_crtc
 directly into context
Date: Wed, 20 Mar 2019 14:06:50 +0100
Message-id: <20190320130707.25161-8-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djPc7rM1pNiDB5s4LW4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZj+beZSv4ZF0xZd5l5gbGM4ZdjJwcEgImEt8XnmXvYuTiEBJYwSjx8PQJ
        JgjnM6PEsXfNbDBV374+ZYNILGOUuHb3OpTzn1Fi+drZTCBVbAKaEn833wTrEBFQlli1rx1s
        LrPAb0aJ6cu3sYMkhAXiJXYuucwMYrMIqErcnLyMtYuRg4NXwELi3qNUiG3yEqs3HAAr4RSw
        lHg45z/YHAmBv6wSq1q6GSGKXCROL7vADmHLSFye3M0CYddL3F/RwgzR0MEosXXDTmaIhLXE
        4eMXWUFsZgE+iUnbpjODLJYQ4JXoaBOCKPGQuLXsLdT/PYwSi47+ZJnAKLGAkWEVo3hqaXFu
        emqxcV5quV5xYm5xaV66XnJ+7iZGYISd/nf86w7GfX+SDjEKcDAq8fBeeD4hRog1say4MvcQ
        owQHs5IIb4TSpBgh3pTEyqrUovz4otKc1OJDjNIcLErivNUMD6KFBNITS1KzU1MLUotgskwc
        nFINjPcmSwiu45x//I9o1u2ZLbsbdn6aEqeWJRmlZHHlstEXGc0PoiqKcVJZ6XNbClUjL6X9
        9s9dzeJlmz1la0rPp/ktQvVlXRynW6feW3mfPfWrWNutaZ8jZ6WyOdzXWvElcOXLwuJ7rVdc
        BAtPGpze2vfYSej8NnYVow1Ja5ZfYu2ZLdMaafZ2rRJLcUaioRZzUXEiAN7S3S2sAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpiluLIzCtJLcpLzFFi42I5/e/4ZV0m60kxBms26lvcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MR3PvshV8sq6YMu8ycwPjGcMuRk4OCQETiW9fn7J1MXJxCAksYZToefgQ
        ymlkkuhZcZ8dpIpNQFPi7+abbCC2iICyxKp97ewgRcwCvxklPs/4ygySEBaIl9i55DKYzSKg
        KnFz8jLWLkYODl4BC4l7j1IhtslLrN5wAKyEU8BS4uGc/2DzhYBKFp+4yziBkWcBI8MqRpHU
        0uLc9NxiI73ixNzi0rx0veT83E2MwJDZduznlh2MXe+CDzEKcDAq8fBWPJ0QI8SaWFZcmXuI
        UYKDWUmEN0JpUowQb0piZVVqUX58UWlOavEhRmkOFiVx3vMGlVFCAumJJanZqakFqUUwWSYO
        TqkGxhw+ZamEZY4uLG6JyTfm/5vpwHr82dPw57sSNn3qmHtcdO11zqj9OicC93wVeKFxqT5n
        x2pZS56FeX/OJ6SsX25oW/Sa95B9kuN+TiX3L9rRml9f2p2484x/k7Xi106d//4iYcpWLULv
        eEI2h0xi3WFdI28t+MDFZuHKHbsOXOmMMRbKDXtgpcRSnJFoqMVcVJwIAGOTfpEVAgAA
X-CMS-MailID: 20190320130714eucas1p1d3ab6fceec849f22bab69df1e46b972d
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130714eucas1p1d3ab6fceec849f22bab69df1e46b972d
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130714eucas1p1d3ab6fceec849f22bab69df1e46b972d@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Since crtc maps 1:1 to the device there is no point in allocating it
separately, another benefit is possibility of direct initialisation
of its fields which is more readable and allows further expansion.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_fimd.c | 60 ++++++++++++------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 2d34ca375ee1..8ea1cfd51736 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -169,7 +169,7 @@ static struct fimd_driver_data exynos5420_fimd_driver_data = {
 struct fimd_context {
 	struct device			*dev;
 	struct drm_device		*drm_dev;
-	struct exynos_drm_crtc		*crtc;
+	struct exynos_drm_crtc		crtc;
 	struct exynos_drm_plane		planes[WINDOWS_NR];
 	struct clk			*bus_clk;
 	struct clk			*lcd_clk;
@@ -193,6 +193,8 @@ struct fimd_context {
 	struct exynos_drm_clk		dp_clk;
 };
 
+#define to_fimd(ptr) container_of(ptr, struct fimd_context, ptr)
+
 static const struct of_device_id fimd_driver_dt_match[] = {
 	{ .compatible = "samsung,s3c6400-fimd",
 	  .data = &s3c64xx_fimd_driver_data },
@@ -235,7 +237,7 @@ static inline void fimd_set_bits(struct fimd_context *ctx, u32 reg, u32 mask,
 
 static int fimd_enable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	u32 val;
 
 	if (ctx->suspended)
@@ -267,7 +269,7 @@ static int fimd_enable_vblank(struct exynos_drm_crtc *crtc)
 
 static void fimd_disable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	u32 val;
 
 	if (ctx->suspended)
@@ -291,7 +293,7 @@ static void fimd_disable_vblank(struct exynos_drm_crtc *crtc)
 
 static void fimd_wait_for_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 
 	if (ctx->suspended)
 		return;
@@ -345,7 +347,7 @@ static void fimd_disable_win(struct fimd_context *ctx, int win)
 
 static void fimd_clear_channels(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	unsigned int win, ch_enabled = 0;
 
 	DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -370,9 +372,9 @@ static void fimd_clear_channels(struct exynos_drm_crtc *crtc)
 	if (ch_enabled) {
 		ctx->suspended = false;
 
-		fimd_enable_vblank(ctx->crtc);
-		fimd_wait_for_vblank(ctx->crtc);
-		fimd_disable_vblank(ctx->crtc);
+		fimd_enable_vblank(&ctx->crtc);
+		fimd_wait_for_vblank(&ctx->crtc);
+		fimd_disable_vblank(&ctx->crtc);
 
 		ctx->suspended = true;
 	}
@@ -388,7 +390,7 @@ static int fimd_atomic_check(struct exynos_drm_crtc *crtc,
 		struct drm_crtc_state *state)
 {
 	struct drm_display_mode *mode = &state->adjusted_mode;
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	unsigned long ideal_clk, lcd_rate;
 	u32 clkdiv;
 
@@ -448,7 +450,7 @@ static void fimd_setup_trigger(struct fimd_context *ctx)
 
 static void fimd_commit(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	struct drm_display_mode *mode = &crtc->base.state->adjusted_mode;
 	const struct fimd_driver_data *driver_data = ctx->driver_data;
 	void *timing_base = ctx->regs + driver_data->timing_base;
@@ -754,7 +756,7 @@ static void fimd_shadow_protect_win(struct fimd_context *ctx,
 
 static void fimd_atomic_begin(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	int i;
 
 	if (ctx->suspended)
@@ -766,7 +768,7 @@ static void fimd_atomic_begin(struct exynos_drm_crtc *crtc)
 
 static void fimd_atomic_flush(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	int i;
 
 	if (ctx->suspended)
@@ -789,7 +791,7 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc,
 {
 	struct exynos_drm_plane_state *state =
 				to_exynos_plane_state(plane->base.state);
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	struct drm_framebuffer *fb = state->base.fb;
 	dma_addr_t dma_addr;
 	unsigned long val, size, offset;
@@ -878,7 +880,7 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc,
 
 static void fimd_enable(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 
 	if (!ctx->suspended)
 		return;
@@ -889,14 +891,14 @@ static void fimd_enable(struct exynos_drm_crtc *crtc)
 
 	/* if vblank was enabled status, enable it again. */
 	if (test_and_clear_bit(0, &ctx->irq_flags))
-		fimd_enable_vblank(ctx->crtc);
+		fimd_enable_vblank(&ctx->crtc);
 
-	fimd_commit(ctx->crtc);
+	fimd_commit(&ctx->crtc);
 }
 
 static void fimd_disable(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	int i;
 
 	if (ctx->suspended)
@@ -951,7 +953,7 @@ static void fimd_trigger(struct device *dev)
 
 static void fimd_te_handler(struct exynos_drm_crtc *crtc)
 {
-	struct fimd_context *ctx = crtc->ctx;
+	struct fimd_context *ctx = to_fimd(crtc);
 	u32 trg_type = ctx->driver_data->trg_type;
 
 	/* Checks the crtc is detached already from encoder */
@@ -976,7 +978,7 @@ static void fimd_te_handler(struct exynos_drm_crtc *crtc)
 	}
 
 	if (test_bit(0, &ctx->irq_flags))
-		drm_crtc_handle_vblank(&ctx->crtc->base);
+		drm_crtc_handle_vblank(&ctx->crtc.base);
 }
 
 static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable)
@@ -1015,7 +1017,7 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id)
 		goto out;
 
 	if (!ctx->i80_if)
-		drm_crtc_handle_vblank(&ctx->crtc->base);
+		drm_crtc_handle_vblank(&ctx->crtc.base);
 
 	if (ctx->i80_if) {
 		/* Exits triggering mode */
@@ -1036,7 +1038,6 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
 {
 	struct fimd_context *ctx = dev_get_drvdata(dev);
 	struct drm_device *drm_dev = data;
-	struct exynos_drm_plane *exynos_plane;
 	unsigned int i;
 	int ret;
 
@@ -1053,22 +1054,23 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
 			return ret;
 	}
 
-	exynos_plane = &ctx->planes[DEFAULT_WIN];
-	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,
-			EXYNOS_DISPLAY_TYPE_LCD, &fimd_crtc_ops, ctx);
-	if (IS_ERR(ctx->crtc))
-		return PTR_ERR(ctx->crtc);
+	ctx->crtc.type = EXYNOS_DISPLAY_TYPE_LCD;
+	ctx->crtc.ops = &fimd_crtc_ops;
+	ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
+	if (ret)
+		return ret;
+	ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
 	if (ctx->driver_data->has_dp_clk) {
 		ctx->dp_clk.enable = fimd_dp_clock_enable;
-		ctx->crtc->pipe_clk = &ctx->dp_clk;
+		ctx->crtc.pipe_clk = &ctx->dp_clk;
 	}
 
 	if (ctx->encoder)
 		exynos_dpi_bind(drm_dev, ctx->encoder);
 
 	if (is_drm_iommu_supported(drm_dev))
-		fimd_clear_channels(ctx->crtc);
+		fimd_clear_channels(&ctx->crtc);
 
 	return exynos_drm_register_dma(drm_dev, dev);
 }
@@ -1078,7 +1080,7 @@ static void fimd_unbind(struct device *dev, struct device *master,
 {
 	struct fimd_context *ctx = dev_get_drvdata(dev);
 
-	fimd_disable(ctx->crtc);
+	fimd_disable(&ctx->crtc);
 
 	exynos_drm_unregister_dma(ctx->drm_dev, ctx->dev);
 

From patchwork Wed Mar 20 13:06:51 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861563
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBF2B18EC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1177299B6
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id B589229BD8; Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CDD129BE7
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727619AbfCTNHR (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:17 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55162 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727172AbfCTNHR (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:17 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130716euoutp011d234c4aefe6ff2704d9f7e16af47f05~NrJzbkQXd0192801928euoutp01c;
        Wed, 20 Mar 2019 13:07:16 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130716euoutp011d234c4aefe6ff2704d9f7e16af47f05~NrJzbkQXd0192801928euoutp01c
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087236;
        bh=bQCAlj48koAMC69VP17ExVvUrMe7ZRRaujUvGSzX0JI=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=Iyj57Dncrkw4VksGJ42ozuXnwcqy8iEJXVVvPTlaDlllxSdni3EHFH710yDGrpflG
         9y/MhmTwQUIKZOlS5NyBJ0L3us4QbgJndX17UND6wNrxr+M6nA9Y32HgzSxQLPg8KB
         GXKd+G1pZlrZeu04q5ffOvMlKOP0mjD4p/pke494=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130715eucas1p2e361abd74eb658b02c4b519deab9566e~NrJzFBmQJ1665816658eucas1p2R;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 69.35.04441.30B329C5;
 Wed, 20
        Mar 2019 13:07:15 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130715eucas1p250b6b902360896cd36bff8536b6292bf~NrJyixDPu0312903129eucas1p2e;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-a6-5c923b03c9f2
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id B4.AF.04284.30B329C5;
 Wed, 20
        Mar 2019 13:07:15 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 08/24] drm/exynos/mixer: embed exynos_drm_crtc
 directly into context
Date: Wed, 20 Mar 2019 14:06:51 +0100
Message-id: <20190320130707.25161-9-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprOIsWRmVeSWpSXmKPExsWy7djPc7rM1pNiDHrblC1urTvHarFxxnpW
        iytf37NZTLo/gcXi/PkN7BYzzu9jslh75C67A7vHplWdbB73u48zefRtWcXo8XmTXABLFJdN
        SmpOZllqkb5dAlfG5nttjAXN+hXdh7+yNTBOVe9i5OSQEDCRmH3gL1sXIxeHkMAKRonHv9+x
        gSSEBD4zSuxqd4Epur1yGiNE0TJGiYdX5zBDOP8ZJWb86ADrYBPQlPi7+SaYLSKgLLFqXzs7
        SBGzwG9GienLt7GDJIQFEiT2LuxhAbFZBFQlrkxqZupi5ODgFbCQWPxIA2KbvMTqDQeYQWxO
        AUuJh3P+g82REGhkk/jT+JoRoshFovfLUTYIW0ais+MgE4RdL3F/RQszREMHo8TWDTuZIRLW
        EoePX2QFsZkF+CQmbZvODLJYQoBXoqNNCML0kFi6iBPisR5GiUdnu5gmMEosYGRYxSieWlqc
        m55abJiXWq5XnJhbXJqXrpecn7uJERhdp/8d/7SD8eulpEOMAhyMSjy8DW8mxAixJpYVV+Ye
        YpTgYFYS4Y1QmhQjxJuSWFmVWpQfX1Sak1p8iFGag0VJnLea4UG0kEB6YklqdmpqQWoRTJaJ
        g1OqgXHZkbcLdbzOV/fPfivwx/N8rFmZ3apExZb/3JMfts9tfaeXUbC//N8C/8A792cEbu7v
        le2tvWB6X6ma+6bXQrflUwLO2b1svH/wwvwvpuUlmvlnWF9fnb24aFn2DeEVLQV3PHfd0rp9
        x8Ccg4Wf1/Xrn4sc7/VeZXz+L3ru3gKxuaJhXsvKtKOUWIozEg21mIuKEwFf9iX1qgIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4ZV1m60kxBl9vcVncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MzffaGAua9Su6D39la2Ccqt7FyMkhIWAicXvlNMYuRi4OIYEljBIPLnax
        giSEBBqZJGYsLwax2QQ0Jf5uvskGYosIKEus2tfODtLALPCbUeLzjK/MIAlhgQSJvQt7WEBs
        FgFViSuTmpm6GDk4eAUsJBY/0oBYJi+xesMBsHJOAUuJh3P+s0PsAio5cZdxAiPPAkaGVYwi
        qaXFuem5xYZ6xYm5xaV56XrJ+bmbGIEBs+3Yz807GC9tDD7EKMDBqMTDW/F0QowQa2JZcWXu
        IUYJDmYlEd4IpUkxQrwpiZVVqUX58UWlOanFhxilOViUxHnPG1RGCQmkJ5akZqemFqQWwWSZ
        ODilGhjLy3d5vKg2Wer0x2Jjqsa+BZ2aJ9WZJ0ybJN961jfuvdbjo+I1Cqs1dzsmOcRYSmg1
        TXzndvq70LHljzO2PfgXzLW7fi/HrkdmnRYuF6eyay2bvzK30pj/eXzF7KTSzTeVGLbU//ou
        ETCjkv/1loW8IbclWXSvTxBW/bf27yI2LbGW2XM/B85QYinOSDTUYi4qTgQA3o3iDBQCAAA=
X-CMS-MailID: 20190320130715eucas1p250b6b902360896cd36bff8536b6292bf
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130715eucas1p250b6b902360896cd36bff8536b6292bf
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130715eucas1p250b6b902360896cd36bff8536b6292bf@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Since crtc maps 1:1 to the device there is no point in allocating it
separately, another benefit is possibility of direct initialisation
of its fields which is more readable and allows further expansion.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_mixer.c | 39 ++++++++++++++-------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 750f682e9c31..946d62ae83e3 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -98,7 +98,7 @@ struct mixer_context {
 	struct platform_device *pdev;
 	struct device		*dev;
 	struct drm_device	*drm_dev;
-	struct exynos_drm_crtc	*crtc;
+	struct exynos_drm_crtc	crtc;
 	struct exynos_drm_plane	planes[MIXER_WIN_NR];
 	unsigned long		flags;
 
@@ -116,6 +116,8 @@ struct mixer_context {
 	int			scan_value;
 };
 
+#define to_mixer(ptr) container_of(ptr, struct mixer_context, ptr)
+
 struct mixer_drv_data {
 	enum mixer_version_id	version;
 	bool					is_vp_enabled;
@@ -426,7 +428,7 @@ static void mixer_stop(struct mixer_context *ctx)
 
 static void mixer_commit(struct mixer_context *ctx)
 {
-	struct drm_display_mode *mode = &ctx->crtc->base.state->adjusted_mode;
+	struct drm_display_mode *mode = &ctx->crtc.base.state->adjusted_mode;
 
 	mixer_cfg_scan(ctx, mode->hdisplay, mode->vdisplay);
 	mixer_cfg_rgb_fmt(ctx, mode);
@@ -712,7 +714,7 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg)
 				goto out;
 		}
 
-		drm_crtc_handle_vblank(&ctx->crtc->base);
+		drm_crtc_handle_vblank(&ctx->crtc.base);
 	}
 
 out:
@@ -856,7 +858,7 @@ static void mixer_ctx_remove(struct mixer_context *mixer_ctx)
 
 static int mixer_enable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct mixer_context *mixer_ctx = crtc->ctx;
+	struct mixer_context *mixer_ctx = to_mixer(crtc);
 
 	__set_bit(MXR_BIT_VSYNC, &mixer_ctx->flags);
 	if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
@@ -871,7 +873,7 @@ static int mixer_enable_vblank(struct exynos_drm_crtc *crtc)
 
 static void mixer_disable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct mixer_context *mixer_ctx = crtc->ctx;
+	struct mixer_context *mixer_ctx = to_mixer(crtc);
 
 	__clear_bit(MXR_BIT_VSYNC, &mixer_ctx->flags);
 
@@ -885,7 +887,7 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc)
 
 static void mixer_atomic_begin(struct exynos_drm_crtc *crtc)
 {
-	struct mixer_context *mixer_ctx = crtc->ctx;
+	struct mixer_context *mixer_ctx = to_mixer(crtc);
 
 	if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
 		return;
@@ -896,7 +898,7 @@ static void mixer_atomic_begin(struct exynos_drm_crtc *crtc)
 static void mixer_update_plane(struct exynos_drm_crtc *crtc,
 			       struct exynos_drm_plane *plane)
 {
-	struct mixer_context *mixer_ctx = crtc->ctx;
+	struct mixer_context *mixer_ctx = to_mixer(crtc);
 
 	DRM_DEBUG_KMS("win: %d\n", plane->index);
 
@@ -912,7 +914,7 @@ static void mixer_update_plane(struct exynos_drm_crtc *crtc,
 static void mixer_disable_plane(struct exynos_drm_crtc *crtc,
 				struct exynos_drm_plane *plane)
 {
-	struct mixer_context *mixer_ctx = crtc->ctx;
+	struct mixer_context *mixer_ctx = to_mixer(crtc);
 	unsigned long flags;
 
 	DRM_DEBUG_KMS("win: %d\n", plane->index);
@@ -927,7 +929,7 @@ static void mixer_disable_plane(struct exynos_drm_crtc *crtc,
 
 static void mixer_atomic_flush(struct exynos_drm_crtc *crtc)
 {
-	struct mixer_context *mixer_ctx = crtc->ctx;
+	struct mixer_context *mixer_ctx = to_mixer(crtc);
 
 	if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))
 		return;
@@ -938,7 +940,7 @@ static void mixer_atomic_flush(struct exynos_drm_crtc *crtc)
 
 static void mixer_enable(struct exynos_drm_crtc *crtc)
 {
-	struct mixer_context *ctx = crtc->ctx;
+	struct mixer_context *ctx = to_mixer(crtc);
 
 	if (test_bit(MXR_BIT_POWERED, &ctx->flags))
 		return;
@@ -967,7 +969,7 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)
 
 static void mixer_disable(struct exynos_drm_crtc *crtc)
 {
-	struct mixer_context *ctx = crtc->ctx;
+	struct mixer_context *ctx = to_mixer(crtc);
 	int i;
 
 	if (!test_bit(MXR_BIT_POWERED, &ctx->flags))
@@ -989,7 +991,7 @@ static void mixer_disable(struct exynos_drm_crtc *crtc)
 static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
 		const struct drm_display_mode *mode)
 {
-	struct mixer_context *ctx = crtc->ctx;
+	struct mixer_context *ctx = to_mixer(crtc);
 	u32 w = mode->hdisplay, h = mode->vdisplay;
 
 	DRM_DEBUG_KMS("xres=%d, yres=%d, refresh=%d, intl=%d\n", w, h,
@@ -1015,7 +1017,7 @@ static bool mixer_mode_fixup(struct exynos_drm_crtc *crtc,
 		   const struct drm_display_mode *mode,
 		   struct drm_display_mode *adjusted_mode)
 {
-	struct mixer_context *ctx = crtc->ctx;
+	struct mixer_context *ctx = to_mixer(crtc);
 	int width = mode->hdisplay, height = mode->vdisplay, i;
 
 	struct {
@@ -1117,7 +1119,6 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 {
 	struct mixer_context *ctx = dev_get_drvdata(dev);
 	struct drm_device *drm_dev = data;
-	struct exynos_drm_plane *exynos_plane;
 	unsigned int i;
 	int ret;
 	static enum drm_plane_type types[] = { DRM_PLANE_TYPE_PRIMARY,
@@ -1151,14 +1152,14 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 			return ret;
 	}
 
-	exynos_plane = &ctx->planes[DEFAULT_WIN];
-	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,
-			EXYNOS_DISPLAY_TYPE_HDMI, &mixer_crtc_ops, ctx);
-	if (IS_ERR(ctx->crtc)) {
+	ctx->crtc.type = EXYNOS_DISPLAY_TYPE_HDMI;
+	ctx->crtc.ops = &mixer_crtc_ops;
+	ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
+	if (ret) {
 		mixer_ctx_remove(ctx);
-		ret = PTR_ERR(ctx->crtc);
 		goto free_ctx;
 	}
+	ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
 	return 0;
 

From patchwork Wed Mar 20 13:06:52 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861575
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E48015AC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32A3228B7B
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 265912996A; Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 197F429BE7
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727497AbfCTNHS (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:18 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55167 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727471AbfCTNHS (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:18 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130716euoutp01ccbd8743dedf289b9fc234cca2a52c46~NrJz3s77a0130601306euoutp01H;
        Wed, 20 Mar 2019 13:07:16 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130716euoutp01ccbd8743dedf289b9fc234cca2a52c46~NrJz3s77a0130601306euoutp01H
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087236;
        bh=Zx2XHvFYWorS20Vhy6iLAPZJeMHhraLAeZL9/r6Pzvk=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=J9DpfMl1v+UHZktpOan7Gef2DMFBxAH2JO7Qp2Xl5kXgkuE6o862IEHyaOKgKBbqC
         48TAz1cmU++rIWbIrGzAlE2PSi+w9u28saeIbqhSVQQJtsJfTgLdtMTNXPLFvVm3dH
         tPGZHVC21JW2c6QLKZhsCcYQTnqgFHaPC0pDkn/M=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130716eucas1p129f2447d2c2d57359a9236d9261605c0~NrJzglogp2304123041eucas1p10;
        Wed, 20 Mar 2019 13:07:16 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 0A.35.04441.40B329C5;
 Wed, 20
        Mar 2019 13:07:16 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130715eucas1p2ab0449e8b243fcfa2d63524363eb8544~NrJy4tCef1665716657eucas1p2M;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-a8-5c923b04f6c9
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 26.AF.04284.30B329C5;
 Wed, 20
        Mar 2019 13:07:15 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 09/24] drm/exynos/vidi: embed exynos_drm_crtc
 directly into context
Date: Wed, 20 Mar 2019 14:06:52 +0100
Message-id: <20190320130707.25161-10-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsWy7djPc7os1pNiDE58YLa4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZi68+YyyYJ1exb+4+pgbGPskuRk4OCQETiYfnHrJ1MXJxCAmsYJQ43b6b
        ESQhJPCZUeLe7yiYojd9DUwQRcsYJdoudTBDOP8ZJWb86GADqWIT0JT4u/kmmC0ioCyxal87
        O0gRs8BvRonpy7exgySEBeIlTq19wtLFyMHBIqAqse+uPEiYV8BSYtL5P2wQ2+QlVm84wAxi
        cwLFH875DzZHQuAvq8TtjxMYIYpcJJ717meHsGUkOjsOMkHY9RL3V7QwQzR0MEps3bCTGSJh
        LXH4+EVWEJtZgE9i0rbpzCBHSAjwSnS0CUGUeEi0vHkJ9WYPo8SC55PYJgApRoZVjOKppcW5
        6anFhnmp5XrFibnFpXnpesn5uZsYgfF1+t/xTzsYv15KOsQowMGoxMPb8GZCjBBrYllxZe4h
        RgkOZiUR3gilSTFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeasZHkQLCaQnlqRmp6YWpBbBZJk4
        OKUaGNVuaE4zt154KKLJ9Ej9DuNCKTPlWWtm3njbttd+X9PTN7/1vge4eV25MefgwqjJPuIS
        lhoxr6IfBh/afFqFZ9GbSRfvyAU53m03bbxzZHXtNZdrd3anJS43EjRseeQ7b97MpI+x+Zov
        lyoY8Z+1SQrpZLxwh/3qvtjPO9kcMvavNCxLaf4TxKjEUpyRaKjFXFScCACBaPgwqwIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpgluLIzCtJLcpLzFFi42I5/e/4ZV1m60kxBl39yha31p1jtdg4Yz2r
        xZWv79ksJt2fwGJx/vwGdosZ5/cxWaw9cpfdgd1j06pONo/73ceZPPq2rGL0+LxJLoAlissm
        JTUnsyy1SN8ugStj8dVnjAXz5Cr2zd3H1MDYJ9nFyMkhIWAi8aavgQnEFhJYwijxZnU+hN3I
        JDFjeTGIzSagKfF38002EFtEQFli1b529i5GLg5mgd+MEp9nfGUGSQgLxEucWvuEpYuRg4NF
        QFVi3115kDCvgKXEpPN/2CB2yUus3nAArJwTKP5wzn92iF0WEotP3GWcwMizgJFhFaNIamlx
        bnpusaFecWJucWleul5yfu4mRmC4bDv2c/MOxksbgw8xCnAwKvHwVjydECPEmlhWXJl7iFGC
        g1lJhDdCaVKMEG9KYmVValF+fFFpTmrxIUZpDhYlcd7zBpVRQgLpiSWp2ampBalFMFkmDk6p
        BkZ+jraNZ/cyX50+sfHg0pr/+SU7/CZc03tl/ir+IGvm6nVfe4O2p660mxe4jfMM737ZZYXW
        Zmsf71L6EJp2ROLu8+6D9h1i9gnq/p/qPvAGqYplzF73buLstcEX+C8+eLnfZeE/gSe1MTwC
        T+4x7ZNdkS9T8Tzgwoo++ezwe5e51n/3Ur6zNWaVEktxRqKhFnNRcSIAGx3qyxMCAAA=
X-CMS-MailID: 20190320130715eucas1p2ab0449e8b243fcfa2d63524363eb8544
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130715eucas1p2ab0449e8b243fcfa2d63524363eb8544
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130715eucas1p2ab0449e8b243fcfa2d63524363eb8544@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Since crtc maps 1:1 to the device there is no point in allocating it
separately, another benefit is possibility of direct initialisation
of its fields which is more readable and allows further expansion.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_vidi.c | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index b61ae3415b8c..377aae5f7631 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -41,7 +41,7 @@ struct vidi_context {
 	struct drm_encoder		encoder;
 	struct platform_device		*pdev;
 	struct drm_device		*drm_dev;
-	struct exynos_drm_crtc		*crtc;
+	struct exynos_drm_crtc		crtc;
 	struct drm_connector		connector;
 	struct exynos_drm_plane		planes[WINDOWS_NR];
 	struct edid			*raw_edid;
@@ -57,6 +57,8 @@ static inline struct vidi_context *encoder_to_vidi(struct drm_encoder *e)
 	return container_of(e, struct vidi_context, encoder);
 }
 
+#define to_vidi(ptr) container_of(ptr, struct vidi_context, ptr)
+
 static const char fake_edid_info[] = {
 	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x4c, 0x2d, 0x05, 0x05,
 	0x00, 0x00, 0x00, 0x00, 0x30, 0x12, 0x01, 0x03, 0x80, 0x10, 0x09, 0x78,
@@ -96,7 +98,7 @@ static const enum drm_plane_type vidi_win_types[WINDOWS_NR] = {
 
 static int vidi_enable_vblank(struct exynos_drm_crtc *crtc)
 {
-	struct vidi_context *ctx = crtc->ctx;
+	struct vidi_context *ctx = to_vidi(crtc);
 
 	if (ctx->suspended)
 		return -EPERM;
@@ -115,7 +117,7 @@ static void vidi_update_plane(struct exynos_drm_crtc *crtc,
 			      struct exynos_drm_plane *plane)
 {
 	struct drm_plane_state *state = plane->base.state;
-	struct vidi_context *ctx = crtc->ctx;
+	struct vidi_context *ctx = to_vidi(crtc);
 	dma_addr_t addr;
 
 	if (ctx->suspended)
@@ -127,7 +129,7 @@ static void vidi_update_plane(struct exynos_drm_crtc *crtc,
 
 static void vidi_enable(struct exynos_drm_crtc *crtc)
 {
-	struct vidi_context *ctx = crtc->ctx;
+	struct vidi_context *ctx = to_vidi(crtc);
 
 	mutex_lock(&ctx->lock);
 
@@ -140,7 +142,7 @@ static void vidi_enable(struct exynos_drm_crtc *crtc)
 
 static void vidi_disable(struct exynos_drm_crtc *crtc)
 {
-	struct vidi_context *ctx = crtc->ctx;
+	struct vidi_context *ctx = to_vidi(crtc);
 
 	drm_crtc_vblank_off(&crtc->base);
 
@@ -164,7 +166,7 @@ static void vidi_fake_vblank_timer(struct timer_list *t)
 {
 	struct vidi_context *ctx = from_timer(ctx, t, timer);
 
-	if (drm_crtc_handle_vblank(&ctx->crtc->base))
+	if (drm_crtc_handle_vblank(&ctx->crtc.base))
 		mod_timer(&ctx->timer,
 			jiffies + msecs_to_jiffies(VIDI_REFRESH_TIME) - 1);
 }
@@ -377,7 +379,6 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
 	struct vidi_context *ctx = dev_get_drvdata(dev);
 	struct drm_device *drm_dev = data;
 	struct drm_encoder *encoder = &ctx->encoder;
-	struct exynos_drm_plane *exynos_plane;
 	unsigned int i;
 	int ret;
 
@@ -390,13 +391,14 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
 			return ret;
 	}
 
-	exynos_plane = &ctx->planes[DEFAULT_WIN];
-	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,
-			EXYNOS_DISPLAY_TYPE_VIDI, &vidi_crtc_ops, ctx);
-	if (IS_ERR(ctx->crtc)) {
+	ctx->crtc.type = EXYNOS_DISPLAY_TYPE_VIDI;
+	ctx->crtc.ops = &vidi_crtc_ops;
+	ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
+	if (ret) {
 		DRM_ERROR("failed to create crtc.\n");
-		return PTR_ERR(ctx->crtc);
+		return ret;
 	}
+	ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
 	drm_encoder_init(drm_dev, encoder, &exynos_vidi_encoder_funcs,
 			 DRM_MODE_ENCODER_TMDS, NULL);

From patchwork Wed Mar 20 13:06:53 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861573
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D360A18EC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC5C028B92
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id AAC4928B63; Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4248129BEF
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727471AbfCTNHT (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:19 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58210 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727415AbfCTNHS (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:18 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130717euoutp02e5747295fd162ae597c69615f523e6c2~NrJ0QODvS1534915349euoutp02B;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130717euoutp02e5747295fd162ae597c69615f523e6c2~NrJ0QODvS1534915349euoutp02B
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087237;
        bh=9zdtxfQqxoDOd9wB0DSn3fjTzZ7lLYD5+W5lsoJ63Kg=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=DhSbSHhQTr2rlVDTJCVb73A2+qbpq7aiJPtlV641Ied558KotVL2kmUvpQLKlz8Is
         W9u568lr9rvP5EYrOFTqk5+/iKGTHWn10dfa3A22knMUrD/Gvu3U8eQ1xjzAJiIUqN
         jH9AgLwKTssC4HDWwdoByCi36g/tTtgqU54cO0Xo=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130716eucas1p2d7e12124aa59c76f3e9cd67f38bf505b~NrJzzGOrl1666516665eucas1p2M;
        Wed, 20 Mar 2019 13:07:16 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 8B.35.04441.40B329C5;
 Wed, 20
        Mar 2019 13:07:16 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130715eucas1p1cc35aa50021848a6f3d5459bb0c6d1bf~NrJzOd3Qw2442724427eucas1p12;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-aa-5c923b047bb1
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 19.DA.04128.30B329C5;
 Wed, 20
        Mar 2019 13:07:15 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:15 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 10/24] drm/exynos: remove standalone
 exynos_drm_crtc leftovers
Date: Wed, 20 Mar 2019 14:06:53 +0100
Message-id: <20190320130707.25161-11-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsWy7djPc7os1pNiDFo/i1vcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MbZvmsRU8kKyY1b+UrYHxqmgXIyeHhICJxNGee0xdjFwcQgIrGCV+dX1g
        g3A+M0rcnzSHFa5q5TQ2EFtIYBmjxLMzGhBF/xklZvzoAEuwCWhK/N18E8wWEVCWWLWvnR2k
        iFngN6PE9OXb2EESwgJREtsbHoLZLAKqEv0/7zF2MXJw8ApYSmxZmA6xTF5i9YYDzCA2J1D4
        4Zz/YHMkBBrZJDb1TWSCKHKROPZ0FTuELSNxeXI3C4RdL3F/RQszREMHo8TWDTuZIRLWEoeP
        XwR7h1mAT2LStunMIIslBHglOtqEIEo8JC6+O8oK8VkP0GdPFjJPYJRYwMiwilE8tbQ4Nz21
        2DAvtVyvODG3uDQvXS85P3cTIzC+Tv87/mkH49dLSYcYBTgYlXh4G95MiBFiTSwrrsw9xCjB
        wawkwhuhNClGiDclsbIqtSg/vqg0J7X4EKM0B4uSOG81w4NoIYH0xJLU7NTUgtQimCwTB6dU
        A2OMZDznfOG0/+I+Zy2uyni65fkL+W+5sTPgsx/7ggghx/387xf5sPGwPuFpVv6sH3eebXPy
        lxsrSkN82EOfXhH3UOV+FN4XwcYsElB6+6n68d0LigRylp5ZupOdN31hgNH+5QJ7ti67xfVi
        98yJKj9Keb7OmKX5KHK3VoKra96dA9mMgradwUosxRmJhlrMRcWJAOg0x0mrAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4ZV1m60kxBvdPWlvcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MbZvmsRU8kKyY1b+UrYHxqmgXIyeHhICJxNGV09i6GLk4hASWMEqsWNbJ
        BpIQEmhkkpixvBjEZhPQlPi7+SZYXERAWWLVvnZ2kAZmgd+MEp9nfGUGSQgLREk8PgGS4ORg
        EVCV6P95j7GLkYODV8BSYsvCdIhl8hKrNxwAK+cECj+c858dYpeFxOITdxknMPIsYGRYxSiS
        Wlqcm55bbKRXnJhbXJqXrpecn7uJERgw24793LKDsetd8CFGAQ5GJR7eiqcTYoRYE8uKK3MP
        MUpwMCuJ8EYoTYoR4k1JrKxKLcqPLyrNSS0+xCjNwaIkznveoDJKSCA9sSQ1OzW1ILUIJsvE
        wSnVwHhgqcBc26961jbneQM+TZrjLVOyl3O69oUzz1jCzA+7LQ6+GLGh6ZxuatWvnurLVk+n
        G+++k7Quu+ie/D7T/hWfYtKf7n12KWdPZWVqaKZZZ8vCh6vPqrbMuv+q2O9EdBbzpYcXJH1X
        CFxTj7a99ISD3zdP/f+mTZqxcXuTV4U8mJ1WlawsJ6jEUpyRaKjFXFScCADcn3nrFAIAAA==
X-CMS-MailID: 20190320130715eucas1p1cc35aa50021848a6f3d5459bb0c6d1bf
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130715eucas1p1cc35aa50021848a6f3d5459bb0c6d1bf
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130715eucas1p1cc35aa50021848a6f3d5459bb0c6d1bf@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Since exynos_drm_crtc is always embedded exynos_drm_crtc_create helper and
ctx field can be removed.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_crtc.c | 35 ------------------------
 drivers/gpu/drm/exynos/exynos_drm_crtc.h |  5 ----
 drivers/gpu/drm/exynos/exynos_drm_drv.h  |  2 --
 3 files changed, 42 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 4ff1e0ff2255..72e224e80565 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -182,41 +182,6 @@ int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc,
 					 &exynos_crtc_funcs, NULL);
 }
 
-struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
-					struct drm_plane *plane,
-					enum exynos_drm_output_type type,
-					const struct exynos_drm_crtc_ops *ops,
-					void *ctx)
-{
-	struct exynos_drm_crtc *exynos_crtc;
-	struct drm_crtc *crtc;
-	int ret;
-
-	exynos_crtc = kzalloc(sizeof(*exynos_crtc), GFP_KERNEL);
-	if (!exynos_crtc)
-		return ERR_PTR(-ENOMEM);
-
-	exynos_crtc->type = type;
-	exynos_crtc->ops = ops;
-	exynos_crtc->ctx = ctx;
-
-	crtc = &exynos_crtc->base;
-
-	ret = drm_crtc_init_with_planes(drm_dev, crtc, plane, NULL,
-					&exynos_crtc_funcs, NULL);
-	if (ret < 0)
-		goto err_crtc;
-
-	drm_crtc_helper_add(crtc, &exynos_crtc_helper_funcs);
-
-	return exynos_crtc;
-
-err_crtc:
-	plane->funcs->destroy(plane);
-	kfree(exynos_crtc);
-	return ERR_PTR(ret);
-}
-
 struct exynos_drm_crtc *exynos_drm_crtc_get_by_type(struct drm_device *drm_dev,
 				       enum exynos_drm_output_type out_type)
 {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.h b/drivers/gpu/drm/exynos/exynos_drm_crtc.h
index 9e35a9e02332..7b0c964521fa 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.h
@@ -20,11 +20,6 @@
 
 int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc,
 			 struct drm_device *drm_dev);
-struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
-					struct drm_plane *plane,
-					enum exynos_drm_output_type out_type,
-					const struct exynos_drm_crtc_ops *ops,
-					void *context);
 void exynos_drm_crtc_wait_pending_update(struct exynos_drm_crtc *exynos_crtc);
 void exynos_drm_crtc_finish_update(struct exynos_drm_crtc *exynos_crtc,
 				   struct exynos_drm_plane *exynos_plane);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 1d4ef0245958..82af112be03d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -147,14 +147,12 @@ struct exynos_drm_clk {
  * @base: crtc object.
  * @type: one of EXYNOS_DISPLAY_TYPE_LCD and HDMI.
  * @ops: pointer to callbacks for exynos drm specific functionality
- * @ctx: A pointer to the crtc's implementation specific context
  * @pipe_clk: A pointer to the crtc's pipeline clock.
  */
 struct exynos_drm_crtc {
 	struct drm_crtc			base;
 	enum exynos_drm_output_type	type;
 	const struct exynos_drm_crtc_ops	*ops;
-	void				*ctx;
 	struct exynos_drm_clk		*pipe_clk;
 	bool				i80_mode : 1;
 };

From patchwork Wed Mar 20 13:06:54 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861569
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86D651575
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C6C329077
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 605A32838B; Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EACB32996A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727626AbfCTNHS (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:18 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55162 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727497AbfCTNHS (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:18 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130717euoutp010e5181f180bb9b6e511b01c07e437403~NrJ0n8h2d0192201922euoutp01f;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130717euoutp010e5181f180bb9b6e511b01c07e437403~NrJ0n8h2d0192201922euoutp01f
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087237;
        bh=qmmEzu6FVJs+Gsjerof7TDemZM9DzvAQr1WXPMY40Ec=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=IKV3XYap2hPpLu+LR7DlBQXfoYIOfjUQH3qJRjZAQyEVQyb/vNlxbaq2GIskr4/pP
         V4MZSw6zWDVFfghiBSTgQphn2WVCWp5T/sm1DZOyOCnACfD/i9CCYsdBJR8Hap5dfH
         e/BMeJKr+u/ptQ3KGWuolzjy4PTQiGXlU80t+TMc=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130717eucas1p1aa83eaa06ca53817675722333cb8c423~NrJ0Oio7m2302523025eucas1p16;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id FA.92.04806.40B329C5;
 Wed, 20
        Mar 2019 13:07:16 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130716eucas1p2fa37979f7715c411e079d146b96628cb~NrJzqRmQQ1665816658eucas1p2T;
        Wed, 20 Mar 2019 13:07:16 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-28-5c923b04f335
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id A6.AF.04284.40B329C5;
 Wed, 20
        Mar 2019 13:07:16 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:16 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 11/24] drm/exynos/vidi: remove encoder_to_vidi
 helper
Date: Wed, 20 Mar 2019 14:06:54 +0100
Message-id: <20190320130707.25161-12-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsWy7djP87os1pNiDHa9M7G4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZfx9GFfzmqJg34QprA+MZ9i5GTg4JAROJzgXngGwuDiGBFYwSE2cdY4Nw
        PjNK9J7uZoap+nvoB1RiGaPE7RP9rBDOf0aJab8fM4FUsQloSvzdfJMNxBYRUJZYta8dbC6z
        wG9GienLt4EtFBYIlNj4/wLYWBYBVYl7+7+DNfAKWEqsb25lhVgnL7F6wwGwGk6g+MM5/8EG
        SQj8ZJXY/Xs71E0uErs+/oKyZSQ6Ow4yQdj1EvdXtDBDNHQwSmzdsBOqyFri8PGLYBuYBfgk
        Jm2bDhTnAIrzSnS0CUGUeEicerod7CAhgR5GiS2rVCYwSixgZFjFKJ5aWpybnlpsnJdarlec
        mFtcmpeul5yfu4kRGF+n/x3/uoNx35+kQ4wCHIxKPLwXnk+IEWJNLCuuzD3EKMHBrCTCG6E0
        KUaINyWxsiq1KD++qDQntfgQozQHi5I4bzXDg2ghgfTEktTs1NSC1CKYLBMHp1QDo79eaIRS
        4KnAGtkwRdOILAXt2eHq6pbx3GrPpiYG/JibtPFP/tH4NWaX7ihMf/XFi+WR/qWz0bVTdr2c
        sP3RqzLvCdMfe7nVMP+p+DBjZdmCkMA1Ue+uSrsttJnnrLnrzI6cvjfcb8SCQjsaZe4lBUeK
        ZMY9jHnxf0HKzweeLGz6kY4H2LhNlFiKMxINtZiLihMBUqyih6sCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4ZV0W60kxBmfei1ncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6Mvw+jCn5zVMybcIW1gfEMexcjJ4eEgInE30M/2LoYuTiEBJYwSvx/swQs
        ISTQyCTx6b0iiM0moCnxd/NNNhBbREBZYtW+dnaQBmaB34wSn2d8ZQZJCAv4S1zt7wOzWQRU
        Je7t/w7WwCtgKbG+uZUVYpu8xOoNB8BqOIHiD+f8h1pmIbH4xF3GCYw8CxgZVjGKpJYW56bn
        FhvqFSfmFpfmpesl5+duYgQGzLZjPzfvYLy0MfgQowAHoxIPb8XTCTFCrIllxZW5hxglOJiV
        RHgjlCbFCPGmJFZWpRblxxeV5qQWH2KU5mBREuc9b1AZJSSQnliSmp2aWpBaBJNl4uCUamAM
        XlvP1xJ1T3x7qaNpidltt6TJy/8v7J3Zss6HcxL7gX1n6x6oXr1gYTHJoDXeT3qeEKM++8Ho
        12vq8jU2H+ds5njMuaN97RXzHyavNnRIKTuL3tro/nL2oTpDdjEfjV2qxy1SW6MjqqSevY49
        xc8Z7Rq5RfHogqnbp4R2fGJOvi/GYPnlm7sSS3FGoqEWc1FxIgB7/DEXFAIAAA==
X-CMS-MailID: 20190320130716eucas1p2fa37979f7715c411e079d146b96628cb
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130716eucas1p2fa37979f7715c411e079d146b96628cb
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130716eucas1p2fa37979f7715c411e079d146b96628cb@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

It can be replaced by recently introduced to_vidi helper.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index 377aae5f7631..2579462aec70 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -52,11 +52,6 @@ struct vidi_context {
 	struct mutex			lock;
 };
 
-static inline struct vidi_context *encoder_to_vidi(struct drm_encoder *e)
-{
-	return container_of(e, struct vidi_context, encoder);
-}
-
 #define to_vidi(ptr) container_of(ptr, struct vidi_context, ptr)
 
 static const char fake_edid_info[] = {
@@ -331,7 +326,7 @@ static const struct drm_connector_helper_funcs vidi_connector_helper_funcs = {
 
 static int vidi_create_connector(struct drm_encoder *encoder)
 {
-	struct vidi_context *ctx = encoder_to_vidi(encoder);
+	struct vidi_context *ctx = to_vidi(encoder);
 	struct drm_connector *connector = &ctx->connector;
 	int ret;
 

From patchwork Wed Mar 20 13:06:55 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861577
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F0CF1575
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64C642838B
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 62F1F29BDC; Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A339129BD8
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:19 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727661AbfCTNHT (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:19 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58196 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727625AbfCTNHT (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:19 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130717euoutp022e7a463f02dd3b22a6ec47b3b844c463~NrJ1Ag8mp1589215892euoutp02l;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130717euoutp022e7a463f02dd3b22a6ec47b3b844c463~NrJ1Ag8mp1589215892euoutp02l
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087237;
        bh=PgbKR/w9TRKewd4GHl+53PaABxvCvoMv24+YVVR5Zf8=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=dRxi3Hcyxwb5D0R2/UB8TFCHZRU7YHHRhUctwFjUTzGEsifa/Q+1+DSTroJOmO3PH
         Ad1latgSrJBmdU21R0qrTnZV6wc+TS04jh1jXLs/oV1vdxsqQwvztKXykyqpltch1F
         KFSYkycdTMhzXsppamWI8SLsDZnDu7T8An6a8Eyc=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130717eucas1p227fc4e1a5deedc250ec1daff4fd04e23~NrJ0on8NI1479814798eucas1p2R;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 2C.35.04441.50B329C5;
 Wed, 20
        Mar 2019 13:07:17 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130716eucas1p121bc6480ad28d1c0c79c195ae943ee55~NrJ0C6qVg2302623026eucas1p19;
        Wed, 20 Mar 2019 13:07:16 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-ae-5c923b05b7fd
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id E9.DA.04128.40B329C5;
 Wed, 20
        Mar 2019 13:07:16 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:16 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 12/24] drm/exynos: unify plane type assignment
Date: Wed, 20 Mar 2019 14:06:55 +0100
Message-id: <20190320130707.25161-13-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djP87qs1pNiDFa+47e4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZL7YnF+ywq/g/6wBLA+Nd4y5GTg4JAROJ22d2snUxcnEICaxglHjYuI0Z
        wvnMKDFl7jQmmKr+CTdZIRLLGCXerp/MBOH8Z5SY9vsxWBWbgKbE38032UBsEQFliVX72tlB
        ipgFfjNKTF++jR0kISzgIdH37j0LiM0ioCpx92QrI4jNK2ApMfX9b3aIdfISqzccYAaxOYHi
        D+f8BxskIfCTVWLenMNQN7lI/Pr5jhnClpG4PLmbBcKul7i/ooUZoqGDUWLrhp1QRdYSh49f
        ZAWxmQX4JCZtmw4U5wCK80p0tAlBlHhIbLnyBRoaPYwSf1vbmCYwSixgZFjFKJ5aWpybnlps
        mJdarlecmFtcmpeul5yfu4kRGGGn/x3/tIPx66WkQ4wCHIxKPLwNbybECLEmlhVX5h5ilOBg
        VhLhjVCaFCPEm5JYWZValB9fVJqTWnyIUZqDRUmct5rhQbSQQHpiSWp2ampBahFMlomDU6qB
        Ua5v+3IF+ZlpIjxXy7UNjPbJzPikte+yw03jSAXOl6sXrbez3icd97nz47eUJE3JhMUPBQ+r
        z+Z5Haq1M861nPHpi68hx4L7WB+KH/eobj899ccV8VlX8nd5H2u5a/j7oUOXgeq5kNxdyf+m
        nsoXZO8/bHdtC5v3ZC9uzWfzJ70td+vntNvzX4mlOCPRUIu5qDgRAIKkk+2sAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpgluLIzCtJLcpLzFFi42I5/e/4ZV0W60kxBlc36FvcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MF9uTC3bYVfyfdYClgfGucRcjJ4eEgIlE/4SbrCC2kMASRolnizUh7EYm
        iU/vFUFsNgFNib+bb7KB2CICyhKr9rWzdzFycTAL/GaU+DzjKzNIQljAQ6Lv3XsWEJtFQFXi
        7slWRhCbV8BSYur73+wQy+QlVm84AFbPCRR/OOc/O8QyC4nFJ+4yTmDkWcDIsIpRJLW0ODc9
        t9hIrzgxt7g0L10vOT93EyMwXLYd+7llB2PXu+BDjAIcjEo8vBVPJ8QIsSaWFVfmHmKU4GBW
        EuGNUJoUI8SbklhZlVqUH19UmpNafIhRmoNFSZz3vEFllJBAemJJanZqakFqEUyWiYNTqoHx
        WKV1/bOzp0O32sUL3JW8Hcdw8KDJM8mwFf+3vfmwbNuE48LrspZOmiOS47jN30FeOcV8Drvz
        0wenP5wu4izkMYz4ra+kmT/5UUjudO0b6lpFOv9+TO95dOzJGYYuhoiCM7882R8/PZr4v1a5
        faam9duF1wVDqkNmNUx5Hi15N+DFpwItsU0sSizFGYmGWsxFxYkAXJHprRMCAAA=
X-CMS-MailID: 20190320130716eucas1p121bc6480ad28d1c0c79c195ae943ee55
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130716eucas1p121bc6480ad28d1c0c79c195ae943ee55
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130716eucas1p121bc6480ad28d1c0c79c195ae943ee55@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Since all Exynos CRTCs uses the first plane as primary plane and the last
one as cursor plane we can drop custom assignments per CRTC and replace it
with common code.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c |  7 +------
 drivers/gpu/drm/exynos/exynos7_drm_decon.c    |  7 +------
 drivers/gpu/drm/exynos/exynos_drm_drv.h       |  2 +-
 drivers/gpu/drm/exynos/exynos_drm_fimd.c      | 10 +---------
 drivers/gpu/drm/exynos/exynos_drm_plane.c     | 19 +++++++++++++------
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |  8 +-------
 drivers/gpu/drm/exynos/exynos_mixer.c         |  6 ++----
 7 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 0d409f453923..663446ca2d09 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -78,11 +78,6 @@ static const uint32_t decon_formats[] = {
 	DRM_FORMAT_ARGB8888,
 };
 
-static const enum drm_plane_type decon_win_types[WINDOWS_NR] = {
-	[PRIMARY_WIN] = DRM_PLANE_TYPE_PRIMARY,
-	[CURSON_WIN] = DRM_PLANE_TYPE_CURSOR,
-};
-
 static inline void decon_set_bits(struct decon_context *ctx, u32 reg, u32 mask,
 				  u32 val)
 {
@@ -619,7 +614,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 					| EXYNOS_DRM_PLANE_CAP_PIX_BLEND;
 		ret = exynos_plane_init(drm_dev, &ctx->planes[i],
 			decon_formats, ARRAY_SIZE(decon_formats),
-			decon_win_types[i]);
+			WINDOWS_NR - ctx->first_win);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index 22659f2da755..b6ad2faed159 100644
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -78,11 +78,6 @@ static const uint32_t decon_formats[] = {
 	DRM_FORMAT_BGRA8888,
 };
 
-static const enum drm_plane_type decon_win_types[WINDOWS_NR] = {
-	DRM_PLANE_TYPE_PRIMARY,
-	DRM_PLANE_TYPE_CURSOR,
-};
-
 static void decon_wait_for_vblank(struct exynos_drm_crtc *crtc)
 {
 	struct decon_context *ctx = to_decon(crtc);
@@ -628,7 +623,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 	for (i = 0; i < WINDOWS_NR; i++) {
 		ctx->planes[i].index = i;
 		ret = exynos_plane_init(drm_dev, &ctx->planes[i], decon_formats,
-			ARRAY_SIZE(decon_formats), decon_win_types[i]);
+			ARRAY_SIZE(decon_formats), WINDOWS_NR);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 82af112be03d..23b27b82de6e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -97,7 +97,7 @@ struct exynos_drm_plane {
 
 int exynos_plane_init(struct drm_device *dev, struct exynos_drm_plane *plane,
 		      const uint32_t *pixel_formats, int num_pixel_formats,
-		      enum drm_plane_type type);
+		      int win_count);
 
 /*
  * Exynos drm crtc ops
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 8ea1cfd51736..b3c11bca5aed 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -212,14 +212,6 @@ static const struct of_device_id fimd_driver_dt_match[] = {
 };
 MODULE_DEVICE_TABLE(of, fimd_driver_dt_match);
 
-static const enum drm_plane_type fimd_win_types[WINDOWS_NR] = {
-	DRM_PLANE_TYPE_PRIMARY,
-	DRM_PLANE_TYPE_OVERLAY,
-	DRM_PLANE_TYPE_OVERLAY,
-	DRM_PLANE_TYPE_OVERLAY,
-	DRM_PLANE_TYPE_CURSOR,
-};
-
 static const uint32_t fimd_formats[] = {
 	DRM_FORMAT_C8,
 	DRM_FORMAT_XRGB1555,
@@ -1049,7 +1041,7 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
 					    | EXYNOS_DRM_PLANE_CAP_WIN_BLEND
 					    | EXYNOS_DRM_PLANE_CAP_PIX_BLEND;
 		ret = exynos_plane_init(drm_dev, &ctx->planes[i], fimd_formats,
-				ARRAY_SIZE(fimd_formats), fimd_win_types[i]);
+				ARRAY_SIZE(fimd_formats), WINDOWS_NR);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index e1aa504539fa..5f8f56b69369 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -291,9 +291,18 @@ static void exynos_plane_attach_zpos_property(struct drm_plane *plane,
 		drm_plane_create_zpos_property(plane, zpos, 0, MAX_PLANE - 1);
 }
 
+static inline enum drm_plane_type exynos_plane_type(int index, int count)
+{
+	if (count && !index)
+		return DRM_PLANE_TYPE_PRIMARY;
+	if (index == count - 1)
+		return DRM_PLANE_TYPE_CURSOR;
+	return DRM_PLANE_TYPE_OVERLAY;
+}
+
 int exynos_plane_init(struct drm_device *dev, struct exynos_drm_plane *plane,
 		      const uint32_t *pixel_formats, int num_pixel_formats,
-		      enum drm_plane_type type)
+		      int win_count)
 {
 	int err;
 	unsigned int supported_modes = BIT(DRM_MODE_BLEND_PIXEL_NONE) |
@@ -302,11 +311,9 @@ int exynos_plane_init(struct drm_device *dev, struct exynos_drm_plane *plane,
 	struct drm_plane *bplane = &plane->base;
 
 	err = drm_universal_plane_init(dev, bplane,
-				       1 << dev->mode_config.num_crtc,
-				       &exynos_plane_funcs,
-				       pixel_formats,
-				       num_pixel_formats,
-				       NULL, type, NULL);
+		1 << dev->mode_config.num_crtc,
+		&exynos_plane_funcs, pixel_formats, num_pixel_formats,NULL,
+		exynos_plane_type(plane->index, win_count), NULL);
 	if (err) {
 		DRM_ERROR("failed to initialize plane\n");
 		return err;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index 2579462aec70..eb1fd3a2cdf3 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -85,12 +85,6 @@ static const uint32_t formats[] = {
 	DRM_FORMAT_NV12,
 };
 
-static const enum drm_plane_type vidi_win_types[WINDOWS_NR] = {
-	DRM_PLANE_TYPE_PRIMARY,
-	DRM_PLANE_TYPE_OVERLAY,
-	DRM_PLANE_TYPE_CURSOR,
-};
-
 static int vidi_enable_vblank(struct exynos_drm_crtc *crtc)
 {
 	struct vidi_context *ctx = to_vidi(crtc);
@@ -381,7 +375,7 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
 
 	for (i = 0; i < WINDOWS_NR; i++) {
 		ret = exynos_plane_init(drm_dev, &ctx->planes[i], formats,
-				        ARRAY_SIZE(formats), vidi_win_types[i]);
+				        ARRAY_SIZE(formats), WINDOWS_NR);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 946d62ae83e3..d0dcbbfc67e5 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1121,8 +1121,6 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 	struct drm_device *drm_dev = data;
 	unsigned int i;
 	int ret;
-	static enum drm_plane_type types[] = { DRM_PLANE_TYPE_PRIMARY,
-		DRM_PLANE_TYPE_CURSOR, DRM_PLANE_TYPE_OVERLAY };
 
 	ret = mixer_initialize(ctx, drm_dev);
 	if (ret)
@@ -1135,7 +1133,7 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 					      EXYNOS_DRM_PLANE_CAP_PIX_BLEND |
 					      EXYNOS_DRM_PLANE_CAP_WIN_BLEND;
 		ret = exynos_plane_init(drm_dev, &ctx->planes[i], mixer_formats,
-			ARRAY_SIZE(mixer_formats), types[i]);
+			ARRAY_SIZE(mixer_formats), VP_DEFAULT_WIN);
 		if (ret)
 			return ret;
 	}
@@ -1147,7 +1145,7 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 					      EXYNOS_DRM_PLANE_CAP_TILE |
 					      EXYNOS_DRM_PLANE_CAP_WIN_BLEND;
 		ret = exynos_plane_init(drm_dev, &ctx->planes[i], vp_formats,
-			ARRAY_SIZE(vp_formats), types[i]);
+			ARRAY_SIZE(vp_formats), VP_DEFAULT_WIN);
 		if (ret)
 			return ret;
 	}

From patchwork Wed Mar 20 13:06:56 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861581
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3463E1575
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:21 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CA4528B92
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:21 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 1B29129810; Wed, 20 Mar 2019 13:07:21 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DF1E28BCD
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727688AbfCTNHU (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:20 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55158 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727359AbfCTNHT (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:19 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130718euoutp01bf9e248e084e9e8703956d8f5b8518cb~NrJ1Sh1v30192201922euoutp01g;
        Wed, 20 Mar 2019 13:07:18 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130718euoutp01bf9e248e084e9e8703956d8f5b8518cb~NrJ1Sh1v30192201922euoutp01g
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087238;
        bh=meC7I0GRSlUX3fy/YAv8N+qsjVbZJhfXTLKQtOPk/CQ=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=t30hDu8f+NLP6/Zqenun+9pbANc2xEA/1Zhg+sG+fgb6QguZhsr/xKo/SYsIuwCW/
         9LyW948GOL7xW5QITlUPgPEX3U2IgN4p2kaMPv7kq0OC0oq31DGaRz+swSNqSo8FeR
         XHdkxTPmmMCVR2arcDb3AM0YeKk9FT9FLPlFLSZU=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130717eucas1p2fb84e1cd116c34c73b3fbb364f39cfe1~NrJ04XwyA0993409934eucas1p27;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 2C.92.04806.50B329C5;
 Wed, 20
        Mar 2019 13:07:17 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130717eucas1p2a2a480a8c5d71fc66741410829a0d016~NrJ0W8cJy1665816658eucas1p2U;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
X-AuditID: cbfec7f5-367ff700000012c6-2b-5c923b0543d3
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 27.AF.04284.50B329C5;
 Wed, 20
        Mar 2019 13:07:17 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 13/24] drm/exynos: set primary plane in
 exynos_drm_crtc_init
Date: Wed, 20 Mar 2019 14:06:56 +0100
Message-id: <20190320130707.25161-14-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprOIsWRmVeSWpSXmKPExsWy7djPc7qs1pNiDNqbFSxurTvHarFxxnpW
        iytf37NZTLo/gcXi/PkN7BYzzu9jslh75C67A7vHplWdbB73u48zefRtWcXo8XmTXABLFJdN
        SmpOZllqkb5dAlfG1499LAX/VCu+X3rJ0sB4Q6GLkZNDQsBEYv3UHlYQW0hgBaPEnPeyXYxc
        QPZnRokvEx8wwRTdPP6MDSKxjFFi6b67zBDOf0aJ/gOP2EGq2AQ0Jf5uvskGYosIKEus2tfO
        DlLELPCbUWL68m1gRcICERIbNi0B28cioCrx4Ng6oAYODl4BS4meS7YQ2+QlVm84wAxicwKF
        H875DzZHQuAvq8STWQfYIYpcJD7cPs8MYctIdHYchDq1XuL+ihZmiIYORomtG3ZCFVlLHD5+
        EWwxswCfxKRt05lBFksI8Ep0tAlBmB4ST75mQjzWA/TYwuUsExglFjAyrGIUTy0tzk1PLTbO
        Sy3XK07MLS7NS9dLzs/dxAiMrtP/jn/dwbjvT9IhRgEORiUe3gvPJ8QIsSaWFVfmHmKU4GBW
        EuGNUJoUI8SbklhZlVqUH19UmpNafIhRmoNFSZy3muFBtJBAemJJanZqakFqEUyWiYNTqoGx
        9sVRxUzZeSG2TT8euF25MDE0fj+nW82iiHOKRu5szuEs3KY73j2wPGPQd/AWQ+O5XS+St56t
        fZa9tt7acrMeR1ZRTFnu5Uap7PnNPw8yfPl69wq7hBBDktf2nKqiXH/Haw+Kf9+Ym7lzt9tc
        85eXpv+ZYlPCcCjXdfuatui0mf3ePXbLOiKVWIozEg21mIuKEwGsmGp0qgIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpkluLIzCtJLcpLzFFi42I5/e/4ZV1W60kxBoducFncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6Mrx/7WAr+qVZ8v/SSpYHxhkIXIyeHhICJxM3jz9hAbCGBJYwS75cldTFy
        AdmNTBJnnu5lBUmwCWhK/N18E6xIREBZYtW+dnaQImaB34wSn2d8ZQZJCAtESGzYtASsgUVA
        VeLBsXVADRwcvAKWEj2XbCGWyUus3nAArJwTKPxwzn92iMUWEotP3GWcwMizgJFhFaNIamlx
        bnpusaFecWJucWleul5yfu4mRmDAbDv2c/MOxksbgw8xCnAwKvHwVjydECPEmlhWXJl7iFGC
        g1lJhDdCaVKMEG9KYmVValF+fFFpTmrxIUZpDhYlcd7zBpVRQgLpiSWp2ampBalFMFkmDk6p
        BsYK9WMxbA8eWU7eVXH+dVue05mARGGBs8c+hmw7lvonfkpN0fMMZo8FK7av/Z1cXsrF8Fbq
        QshjwVTZ89V9akpvZ/P6/IxQnLXKWkZ3At+Xsuk2Fz20ri9wc/ba39EVpLntxS67Say58c+Y
        7m3V/Lv8glKFuITv6xVsxzeUrm9zb7j18eDrwB4lluKMREMt5qLiRABpH5mrFAIAAA==
X-CMS-MailID: 20190320130717eucas1p2a2a480a8c5d71fc66741410829a0d016
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130717eucas1p2a2a480a8c5d71fc66741410829a0d016
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130717eucas1p2a2a480a8c5d71fc66741410829a0d016@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

exynos_drm_crtc_init has all information necessary to discover primary
plane. Let's move logic for setting primary plane into this function.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c |  3 ---
 drivers/gpu/drm/exynos/exynos7_drm_decon.c    |  1 -
 drivers/gpu/drm/exynos/exynos_drm_crtc.c      | 10 +++++++++-
 drivers/gpu/drm/exynos/exynos_drm_drv.h       |  2 --
 drivers/gpu/drm/exynos/exynos_drm_fimd.c      |  1 -
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |  1 -
 drivers/gpu/drm/exynos/exynos_mixer.c         |  1 -
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 663446ca2d09..958972e3ee1e 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -30,8 +30,6 @@
 #define DSD_CFG_MUX_TE_UNMASK_GLOBAL BIT(13)
 
 #define WINDOWS_NR	5
-#define PRIMARY_WIN	2
-#define CURSON_WIN	4
 
 #define MIN_FB_WIDTH_FOR_16WORD_BURST	128
 
@@ -625,7 +623,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 	ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
 	if (ret)
 		return ret;
-	ctx->crtc.base.primary = &ctx->planes[PRIMARY_WIN].base;
 
 	decon_clear_channels(&ctx->crtc);
 
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index b6ad2faed159..3d8c96f0b02a 100644
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -635,7 +635,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data)
 		decon_ctx_remove(ctx);
 		return ret;
 	}
-	ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
 	if (ctx->encoder)
 		exynos_dpi_bind(drm_dev, ctx->encoder);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 72e224e80565..ec1319781b8b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -176,9 +176,17 @@ int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc,
 			 struct drm_device *drm_dev)
 {
 	struct drm_crtc *crtc = &exynos_crtc->base;
+	struct drm_plane *primary = NULL, *plane;
+
+	drm_for_each_plane(plane, drm_dev) {
+		if (plane->possible_crtcs != BIT(drm_dev->mode_config.num_crtc))
+			continue;
+		if (!primary && plane->type == DRM_PLANE_TYPE_PRIMARY)
+			primary = plane;
+	}
 
 	drm_crtc_helper_add(crtc, &exynos_crtc_helper_funcs);
-	return drm_crtc_init_with_planes(drm_dev, crtc, NULL, NULL,
+	return drm_crtc_init_with_planes(drm_dev, crtc, primary, NULL,
 					 &exynos_crtc_funcs, NULL);
 }
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 23b27b82de6e..6643db865500 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -21,8 +21,6 @@
 #define MAX_PLANE	5
 #define MAX_FB_BUFFER	4
 
-#define DEFAULT_WIN	0
-
 #define to_exynos_crtc(x)	container_of(x, struct exynos_drm_crtc, base)
 #define to_exynos_plane(x)	container_of(x, struct exynos_drm_plane, base)
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index b3c11bca5aed..14e70971547a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -1051,7 +1051,6 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
 	ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev);
 	if (ret)
 		return ret;
-	ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
 	if (ctx->driver_data->has_dp_clk) {
 		ctx->dp_clk.enable = fimd_dp_clock_enable;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index eb1fd3a2cdf3..19cd7275b20f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -387,7 +387,6 @@ static int vidi_bind(struct device *dev, struct device *master, void *data)
 		DRM_ERROR("failed to create crtc.\n");
 		return ret;
 	}
-	ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
 	drm_encoder_init(drm_dev, encoder, &exynos_vidi_encoder_funcs,
 			 DRM_MODE_ENCODER_TMDS, NULL);
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index d0dcbbfc67e5..8bb31a0e572e 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1157,7 +1157,6 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data)
 		mixer_ctx_remove(ctx);
 		goto free_ctx;
 	}
-	ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base;
 
 	return 0;
 

From patchwork Wed Mar 20 13:06:57 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861579
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C67561823
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB92128B92
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id A96DF29BD8; Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47F4928B92
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:20 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727625AbfCTNHT (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:19 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55162 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727415AbfCTNHT (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:19 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130718euoutp016fa2c297dcaff59e79d0ea02df99f1a4~NrJ18pz-Q0130601306euoutp01J;
        Wed, 20 Mar 2019 13:07:18 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130718euoutp016fa2c297dcaff59e79d0ea02df99f1a4~NrJ18pz-Q0130601306euoutp01J
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087238;
        bh=xJ8hSSxDM9O2iw0E931zTbBjtcba1ypqvQ9ZdfpdH00=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=Rvnz1HyYmhSjnpnaPKVLF68dZHwE34xa5inkY5pO2mhxYkiLXIesYksPa8L5opcyI
         oVk3112PtWAEhHT7rGNfZ6rCogK2HohS8DAZOZK6BYw78W/t+KSF+9HxSUa2y7zySF
         3fjbGSzT0Rh/GaFiN2U8hGw3yVmzHpC5DIiP7BM8=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130718eucas1p1c6d40ce57564fe5d72f0f924c702182d~NrJ1hmkGk2305023050eucas1p1z;
        Wed, 20 Mar 2019 13:07:18 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id DD.91.04294.60B329C5;
 Wed, 20
        Mar 2019 13:07:18 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130717eucas1p2c75749455fa4b34b4d21f9873b3d9cb6~NrJ08oxTK0223602236eucas1p2p;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
X-AuditID: cbfec7f4-84fff700000010c6-be-5c923b06e9f9
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id E7.AF.04284.50B329C5;
 Wed, 20
        Mar 2019 13:07:17 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:17 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 14/24] drm/exynos: set cursor plane in
 exynos_drm_crtc_init
Date: Wed, 20 Mar 2019 14:06:57 +0100
Message-id: <20190320130707.25161-15-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWy7djP87ps1pNiDJ6+5Le4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZxxevZS2YKlzRPPssawPjGoEuRk4OCQETiYWv9rN1MXJxCAmsYJQ49LKX
        EcL5zCjx7XsDG0zVs39voaqWMUocOPGSFcL5zyjRf+ARO0gVm4CmxN/NN8E6RASUJVbta2cH
        KWIW+M0oMX35NrAiYYFwia6WH8wgNouAqsS2S3+YQGxeAUuJyVtWskKsk5dYveEAWA0nUPzh
        nP9ggyQEGtkknm/8wwhR5CLRv3MblC0j0dlxkAnCrpe4v6KFGaKhg1Fi64adzBAJa4nDxy+C
        bWAW4JOYtG06UJwDKM4r0dEmBFHiIXHj1lIWiNd6GCWefN/HOoFRYgEjwypG8dTS4tz01GKj
        vNRyveLE3OLSvHS95PzcTYzAGDv97/iXHYy7/iQdYhTgYFTi4b3wfEKMEGtiWXFl7iFGCQ5m
        JRHeCKVJMUK8KYmVValF+fFFpTmpxYcYpTlYlMR5qxkeRAsJpCeWpGanphakFsFkmTg4pRoY
        V1QxTK5J5Dqd+OJl8b4oXqFvR/zUkiI+y2r0TUtjKwz+cdO76cSPjVknL+g16SzlfH7s8b2a
        H4q8UgH9Kf0NlaZNi1LtLfe82fBG3KNKcx1P7evEKOvK77zTqjSzl39M11+XH/et6rj5zILf
        r7ftF/FW//7IWbhZWd2lQe6p6Xn1VoH34jeVWIozEg21mIuKEwHZJU8QrQIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV1W60kxBhtX6lvcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6M44vXshZMFa5onn2WtYFxjUAXIyeHhICJxLN/b9m6GLk4hASWMErsnzOX
        FcJpZJI483QvK0gVm4CmxN/NN9lAbBEBZYlV+9rZQYqYBX4zSnye8ZUZJCEsEC7R1fIDzGYR
        UJXYdukPE4jNK2ApMXnLSlaIdfISqzccAKvhBIo/nPOfHcQWErCQWHziLuMERp4FjAyrGEVS
        S4tz03OLDfWKE3OLS/PS9ZLzczcxAoNm27Gfm3cwXtoYfIhRgINRiYe34umEGCHWxLLiytxD
        jBIczEoivBFKk2KEeFMSK6tSi/Lji0pzUosPMUpzsCiJ8543qIwSEkhPLEnNTk0tSC2CyTJx
        cEo1MM7eG3FuvpyBuvHGpia1ErErofFHKm8wlUsJSmdfcp1xtf3K5b+1lVPybS11fv/Pra+7
        skgreuHpgPbmzJXMf1Yd2DFz0n+ht1P7Vabee36Y6yjzx8anrFpu0W/DrbqXnC+9d/X3tNSz
        71YJM1/Sqzu/n+VgOvc9q9AZhp9SVk+f/nVujHTS2R9KLMUZiYZazEXFiQCr08uwFgIAAA==
X-CMS-MailID: 20190320130717eucas1p2c75749455fa4b34b4d21f9873b3d9cb6
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130717eucas1p2c75749455fa4b34b4d21f9873b3d9cb6
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130717eucas1p2c75749455fa4b34b4d21f9873b3d9cb6@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

The patch configures cursor plane in exynos_drm_crtc_init.
Since Exynos DRM does not support fast/async path for cursor update,
it must be disabled.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_crtc.c |  6 ++++--
 drivers/gpu/drm/exynos/exynos_drm_fb.c   | 10 +++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index ec1319781b8b..303df018f0a1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -176,17 +176,19 @@ int exynos_drm_crtc_init(struct exynos_drm_crtc *exynos_crtc,
 			 struct drm_device *drm_dev)
 {
 	struct drm_crtc *crtc = &exynos_crtc->base;
-	struct drm_plane *primary = NULL, *plane;
+	struct drm_plane *primary = NULL, *cursor = NULL, *plane;
 
 	drm_for_each_plane(plane, drm_dev) {
 		if (plane->possible_crtcs != BIT(drm_dev->mode_config.num_crtc))
 			continue;
 		if (!primary && plane->type == DRM_PLANE_TYPE_PRIMARY)
 			primary = plane;
+		if (!cursor && plane->type == DRM_PLANE_TYPE_CURSOR)
+			cursor = plane;
 	}
 
 	drm_crtc_helper_add(crtc, &exynos_crtc_helper_funcs);
-	return drm_crtc_init_with_planes(drm_dev, crtc, primary, NULL,
+	return drm_crtc_init_with_planes(drm_dev, crtc, primary, cursor,
 					 &exynos_crtc_funcs, NULL);
 }
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 1f11ab0f8e9d..d705e363f703 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -155,11 +155,19 @@ static struct drm_mode_config_helper_funcs exynos_drm_mode_config_helpers = {
 	.atomic_commit_tail = drm_atomic_helper_commit_tail_rpm,
 };
 
+int exynos_drm_atomic_helper_commit(struct drm_device *dev,
+				    struct drm_atomic_state *state,
+				    bool nonblock)
+{
+	state->legacy_cursor_update = false;
+	return drm_atomic_helper_commit(dev, state, nonblock);
+}
+
 static const struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {
 	.fb_create = exynos_user_fb_create,
 	.output_poll_changed = drm_fb_helper_output_poll_changed,
 	.atomic_check = drm_atomic_helper_check,
-	.atomic_commit = drm_atomic_helper_commit,
+	.atomic_commit = exynos_drm_atomic_helper_commit,
 };
 
 void exynos_drm_mode_config_init(struct drm_device *dev)

From patchwork Wed Mar 20 13:06:58 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861583
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38FF31575
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 207372838B
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 1EB8E29858; Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4A352838B
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:21 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727739AbfCTNHV (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:21 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58242 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727663AbfCTNHV (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:21 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130719euoutp02c52dfa136eadc42463c097604bc0befc~NrJ2ZVWhk1534915349euoutp02D;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130719euoutp02c52dfa136eadc42463c097604bc0befc~NrJ2ZVWhk1534915349euoutp02D
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087239;
        bh=ga2SLg3yv9wsqZ8MVIaXNymZsZ9/UV+lZIuI9VL5Rsg=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=oRb8Kg94biEVx8/kulfPlzvd4YZqGO1mayh/3XwSna0PN8z5NF7l2NggOXqVT2mv4
         knNYIwDR0aaA7NVpRlq2jQInSgwYZXhPy9pUk0qLvQGoT/cWhdKCUpuce8b48mwIs5
         LHJ7dwPcge3fT1m1D/26Qkp3lzhXVI7H5hh2A+Vs=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130719eucas1p2da9f31c8a639272c2dd0cce203e96f68~NrJ2D6seO1479814798eucas1p2T;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 8D.35.04441.60B329C5;
 Wed, 20
        Mar 2019 13:07:18 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130718eucas1p15d440d88365fa5ea213f592b97e6f226~NrJ1WXXIs2312123121eucas1p10;
        Wed, 20 Mar 2019 13:07:18 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-b4-5c923b0675cb
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id CB.DA.04128.60B329C5;
 Wed, 20
        Mar 2019 13:07:18 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:18 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 15/24] drm/exynos: add plane update/disable
 callbacks for planes
Date: Wed, 20 Mar 2019 14:06:58 +0100
Message-id: <20190320130707.25161-16-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djP87ps1pNiDI4vMrK4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZm18/ZCk4zVlxsv0HawPjRI4uRk4OCQETiUN7p7GB2EICKxglnr+u7GLk
        ArI/M0o8WnycDabo2oz5bBCJZYwSS99eZ4Jw/jNKrDnRxgxSxSagKfF3802wDhEBZYlV+9rZ
        QYqYBX4zSkxfvo0dJCEsECOx+tJ2FhCbRUBVYsuCGWANvAKWErfuN7FArJOXWL3hANhQTqD4
        wzn/wQZJCPxllXjxdR3UTS4SVxo/Q9kyEpcnd0M110vcX9HCDNHQwSixdcNOZoiEtcTh4xdZ
        QWxmAT6JSdumA8U5gOK8Eh1tQhAlHhJLl8+G+rOHUaLpyj7GCYwSCxgZVjGKp5YW56anFhvm
        pZbrFSfmFpfmpesl5+duYgRG2Ol/xz/tYPx6KekQowAHoxIPb8ObCTFCrIllxZW5hxglOJiV
        RHgjlCbFCPGmJFZWpRblxxeV5qQWH2KU5mBREuetZngQLSSQnliSmp2aWpBaBJNl4uCUamDc
        /z78ilvl8pVxh06fjhcuy6jRvvvY7p191kVr112Fv5Laql78L4g3C83Pt/Ba7hV5tut8VrM+
        p36u8S3V+zf/X2w1uFC6cleB1nuDvV8l3t5WnJLM8pQxnN3ggtvJfYsEP9/UnfOs1PX0o+qz
        /393pST9n36dmaWh/5GMa0Bx3NzVqozLsu4rsRRnJBpqMRcVJwIAESQN/KwCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpiluLIzCtJLcpLzFFi42I5/e/4ZV0260kxBhPuclncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6Mza8fshSc5qw42f6DtYFxIkcXIyeHhICJxLUZ89m6GLk4hASWMErMaFrE
        DuE0Mkn8nfSEDaSKTUBT4u/mm2C2iICyxKp97WBFzAK/GSU+z/jK3MXIwSEsECPxeqEUSA2L
        gKrElgUzwOp5BSwlbt1vYoHYJi+xesMBZhCbEyj+cM5/dhBbSMBCYvGJu4wTGHkWMDKsYhRJ
        LS3OTc8tNtIrTswtLs1L10vOz93ECAyZbcd+btnB2PUu+BCjAAejEg9vxdMJMUKsiWXFlbmH
        GCU4mJVEeCOUJsUI8aYkVlalFuXHF5XmpBYfYpTmYFES5z1vUBklJJCeWJKanZpakFoEk2Xi
        4JRqYFy+ump5URgTT1OuOfu6DctKpzZ+uaq+MKDCJVsi7MZyF2Ghzt49i1e6dBX4ftvP53ma
        47ff3oK3rtI6czLbZKvPzYnt52yV0Sj12mSWs8i2QKDrTT6vlugzBWZLox18Ui8XH7lTf7n7
        sWqMb53xDdbexY5d01WOXtqZ5mKyeFah3rvVR9O0lFiKMxINtZiLihMBlIGpdBUCAAA=
X-CMS-MailID: 20190320130718eucas1p15d440d88365fa5ea213f592b97e6f226
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130718eucas1p15d440d88365fa5ea213f592b97e6f226
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130718eucas1p15d440d88365fa5ea213f592b97e6f226@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Display controllers in Exynos beside native planes/windows can use external
planes provided by other IPs - GSCALER, FIMD, VPP. To add support to them
we will need plane specific callbacks.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 6643db865500..5d06e796dc80 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -76,6 +76,12 @@ to_exynos_plane_state(struct drm_plane_state *state)
 #define EXYNOS_DRM_PLANE_CAP_PIX_BLEND	(1 << 4)
 #define EXYNOS_DRM_PLANE_CAP_WIN_BLEND	(1 << 5)
 
+struct exynos_drm_plane;
+struct exynos_drm_plane_ops {
+	void (*update_plane)(struct exynos_drm_plane *plane);
+	void (*disable_plane)(struct exynos_drm_plane *plane);
+};
+
 /*
  * Exynos drm common overlay structure.
  *
@@ -89,6 +95,7 @@ to_exynos_plane_state(struct drm_plane_state *state)
 
 struct exynos_drm_plane {
 	struct drm_plane base;
+	const struct exynos_drm_plane_ops *ops;
 	unsigned int index;
 	unsigned int capabilities;
 };

From patchwork Wed Mar 20 13:06:59 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861587
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2EB41823
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 975162996A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 8B45029077; Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EC9729BE6
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727750AbfCTNHV (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:21 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55167 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727415AbfCTNHV (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:21 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130719euoutp0180a25b608d15080297db7f60d4d54c46~NrJ2vV7bM0192201922euoutp01h;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130719euoutp0180a25b608d15080297db7f60d4d54c46~NrJ2vV7bM0192201922euoutp01h
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087239;
        bh=etuAz+B4tjFxongWFMq4xgwecflkYEh95FK1Mb0jXrY=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=m6JFTKKIXNgWvzP2GKTBGMV0aPH+1+7+iKwyFuaFZs9HuPIvdGGSt3PxrMrODW/YZ
         20bLJglR//rog7dqrZAIuP+4/zCSixuj1PYr2CjEVFhEDk6z4tGFS4U9Jzvhk0Sr0V
         vZdaiNjBcywWD1M79lxWPXYEousV2iiC0ruB/Hvo=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130719eucas1p2aeffb168f1d74ae49ad30d8aefe20989~NrJ2XtqF60270202702eucas1p2V;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id FC.92.04806.70B329C5;
 Wed, 20
        Mar 2019 13:07:19 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130718eucas1p1e42feb422bda24a2db733d50eb41ea47~NrJ1uNY2f2311623116eucas1p18;
        Wed, 20 Mar 2019 13:07:18 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-30-5c923b07af05
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 6C.DA.04128.60B329C5;
 Wed, 20
        Mar 2019 13:07:18 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:18 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 16/24] drm/exynos: add GSCALER plane capability
Date: Wed, 20 Mar 2019 14:06:59 +0100
Message-id: <20190320130707.25161-17-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprOIsWRmVeSWpSXmKPExsWy7djP87rs1pNiDNY+YrW4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZ8y9fZCpYJVTR1f2YuYFxK38XIyeHhICJxN8F0xhBbCGBFYwSL+ZldjFy
        AdmfGSWm7Ghmgyla/+wlG0TRMkaJB4eiIIr+M0qsOdHGDJJgE9CU+Lv5JliRiICyxKp97ewg
        RcwCvxklpi/fxg6SEBbwlGhvm8EEYrMIqEp0btwGtJqDg1fAUuLE1jiIZfISqzccAJvJCRR+
        OOc/2BwJgb+sEvP+djBCFLlIPGtezQRhy0hcntzNAmHXS9xf0cIM0dDBKLF1w05miIS1xOHj
        F1lBbGYBPolJ26YzgyyWEOCV6GgTgijxkPh34TQ7xGc9jBIdX9cxT2CUWMDIsIpRPLW0ODc9
        tdg4L7Vcrzgxt7g0L10vOT93EyMwuk7/O/51B+O+P0mHGAU4GJV4eC88nxAjxJpYVlyZe4hR
        goNZSYQ3QmlSjBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeaoYH0UIC6YklqdmpqQWpRTBZJg5O
        qQZGk/Kg6/zx1SknleT8NGwy9pRu8tyo57+s4ureJ9oLl95fJV/zv8nl4FZFRZsjacwXm7e9
        jjy65nFduJd5827Ze0sdHm2ZUCr95N/Znwobdr67vjV6AvcO4wWBt6VzysM9+HJCpx4JL3jJ
        PfOl5Z39sT899U8oqQRX3l+m+yFlh3BIp/65yMR0JZbijERDLeai4kQAk5WksaoCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpiluLIzCtJLcpLzFFi42I5/e/4ZV0260kxBu1HlCxurTvHarFxxnpW
        iytf37NZTLo/gcXi/PkN7BYzzu9jslh75C67A7vHplWdbB73u48zefRtWcXo8XmTXABLFJdN
        SmpOZllqkb5dAlfG/MsXmQpWCVV0dT9mbmDcyt/FyMkhIWAisf7ZS7YuRi4OIYEljBJL1j+B
        chqZJP5OAnE4OdgENCX+br4JZosIKEus2tfODlLELPCbUeLzjK/MIAlhAU+J9rYZTCA2i4Cq
        ROfGbYxdjBwcvAKWEie2xkFsk5dYveEAWDknUPjhnP/sILaQgIXE4hN3GScw8ixgZFjFKJJa
        WpybnltspFecmFtcmpeul5yfu4kRGDLbjv3csoOx613wIUYBDkYlHt6KpxNihFgTy4orcw8x
        SnAwK4nwRihNihHiTUmsrEotyo8vKs1JLT7EKM3BoiTOe96gMkpIID2xJDU7NbUgtQgmy8TB
        KdXAeL3GP1Mp3fDLz4iOv8J1oanJ7pzT5FfO2F17rnTX8kt7eoRW+z5k7P5k+DZY49KFZPcf
        x090soa6i7nfETh/Os9ZsqBAaZn4Dnne1QbKuQsVuh8kTFDlPvHzp7mS1Ie7kRu5ReI71iY+
        +XthZXFaYXjocpcfRsvnym37onwt99q0vefqWVO1lViKMxINtZiLihMBzIblIhUCAAA=
X-CMS-MailID: 20190320130718eucas1p1e42feb422bda24a2db733d50eb41ea47
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130718eucas1p1e42feb422bda24a2db733d50eb41ea47
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130718eucas1p1e42feb422bda24a2db733d50eb41ea47@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

This bit will indicate the plane is provided by GSCALER.
Tests shows that GSCALER does not like to convert from/to too small
buffers. Since exact constraints are not provided by documentation
rough estimate of 64 pixel has been applied.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.h   |  1 +
 drivers/gpu/drm/exynos/exynos_drm_plane.c | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 5d06e796dc80..7bdbac639b2b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -75,6 +75,7 @@ to_exynos_plane_state(struct drm_plane_state *state)
 #define EXYNOS_DRM_PLANE_CAP_TILE	(1 << 3)
 #define EXYNOS_DRM_PLANE_CAP_PIX_BLEND	(1 << 4)
 #define EXYNOS_DRM_PLANE_CAP_WIN_BLEND	(1 << 5)
+#define EXYNOS_DRM_PLANE_CAP_GSCALER	(1 << 6)
 
 struct exynos_drm_plane;
 struct exynos_drm_plane_ops {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 5f8f56b69369..89168157e1e2 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -198,6 +198,11 @@ exynos_drm_plane_check_format(struct exynos_drm_plane_state *state)
 	return 0;
 }
 
+static bool is_in_range(int val, int min, int max)
+{
+	return (val >= min) && (val < max);
+}
+
 static int
 exynos_drm_plane_check_size(struct exynos_drm_plane_state *state)
 {
@@ -205,7 +210,7 @@ exynos_drm_plane_check_size(struct exynos_drm_plane_state *state)
 	bool width_ok = false, height_ok = false;
 
 	if (plane->capabilities & EXYNOS_DRM_PLANE_CAP_SCALE)
-		return 0;
+		width_ok = height_ok = true;
 
 	if (state->src.w == state->crtc.w)
 		width_ok = true;
@@ -221,6 +226,13 @@ exynos_drm_plane_check_size(struct exynos_drm_plane_state *state)
 	    state->v_ratio == (1 << 15))
 		height_ok = true;
 
+	if (plane->capabilities & EXYNOS_DRM_PLANE_CAP_GSCALER) {
+		width_ok = is_in_range(state->src.w, 64, 4800) &&
+			   is_in_range(state->crtc.w, 64, 4800);
+		height_ok = is_in_range(state->src.h, 64, 3344) &&
+			    is_in_range(state->crtc.h, 64, 3344);
+	}
+
 	if (width_ok && height_ok)
 		return 0;
 

From patchwork Wed Mar 20 13:07:00 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861585
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 771BF17EF
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C30428B09
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 5ABD529BD8; Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1ED128B09
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:21 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727748AbfCTNHV (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:21 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58251 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727359AbfCTNHV (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:21 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130720euoutp02322b062d7ecd91bbc083198e792299ad~NrJ3BMxP11589615896euoutp02j;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130720euoutp02322b062d7ecd91bbc083198e792299ad~NrJ3BMxP11589615896euoutp02j
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087240;
        bh=EDMDwUaiU6twXfERSDZPZXY/mOmWI2xG0PbTbogkuUA=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=MetQlsvvK+bYLHUFyF5JLDR/m8ItJRjZ51nE68MVA2lx2p1OP/7JGL6pbp/Ci6KTy
         Zppo9QX62rUjPgXoKwQlkD706aJoPFUo4RsVIYq6XoxRPcKX5QzXrkyvPFOGr7NIYy
         wgz/YZB7pw6O5eIPnbRYKMKpcHL2f+1KAlzHRHY0=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130719eucas1p19d77150d57cf0da5d22322e6273b8b6b~NrJ2pH1-S2312123121eucas1p12;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id 1F.91.04294.70B329C5;
 Wed, 20
        Mar 2019 13:07:19 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130719eucas1p1b411bcd1e32a500202a19a24a4ba92a6~NrJ2GDHY22303623036eucas1p1p;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
X-AuditID: cbfec7f4-835ff700000010c6-c3-5c923b077506
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id EC.DA.04128.60B329C5;
 Wed, 20
        Mar 2019 13:07:18 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:18 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 17/24] drm/exynos/gscaler: fix id assignement
Date: Wed, 20 Mar 2019 14:07:00 +0100
Message-id: <20190320130707.25161-18-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWy7djP87rs1pNiDH5skLC4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZO5+cZi5Ywlqxd8pLtgbGvSxdjJwcEgImEnMX/mfsYuTiEBJYwSix5OwO
        VgjnM6PE7IV3GWGqvj68ywKRWMYo8WHTW3YI5z+jxJoTbcwgVWwCmhJ/N99kA7FFBJQlVu1r
        BytiFvjNKDF9+TZ2kISwgLvElOXbmEBsFgFViY+7HrGC2LwClhKvrp9mhlgnL7F6wwEwmxMo
        /nDOf7BBEgI/WSWmPVzCBlHkIjF56Rl2CFtG4vLkbqiP6iXur2hhhmjoYJTYumEn1FRricPH
        L4JtYxbgk5i0bTpQnAMozivR0SYEUeIhsez5JKg/exglbn7fzDSBUWIBI8MqRvHU0uLc9NRi
        o7zUcr3ixNzi0rx0veT83E2MwBg7/e/4lx2Mu/4kHWIU4GBU4uG98HxCjBBrYllxZe4hRgkO
        ZiUR3gilSTFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeasZHkQLCaQnlqRmp6YWpBbBZJk4OKUa
        GDfs+imn0CawXtKi98TtHbP9LTnVnogz/xdhesEe7pvEsiXgQ4fo2rN6AQIdC3a+uGphdrN8
        lW1/MA/vsstvX3fcjKqM+pj/h3dy2veIvLSUNr6/SrPfFsrm+CSFLTmkXBcR9ubHIpenOzZO
        chctCHCyW/feVH0hI/9bJekll0uLvOxavKyOKbEUZyQaajEXFScCAH2BbsetAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpiluLIzCtJLcpLzFFi42I5/e/4ZV0260kxBiePWFvcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MnU9OMxcsYa3YO+UlWwPjXpYuRk4OCQETia8P74LZQgJLGCVOTzTsYuQC
        shuZJP5OesIGkmAT0JT4u/kmmC0ioCyxal87O0gRs8BvRonPM74ygySEBdwlpizfxgRiswio
        Snzc9YgVxOYVsJR4df00M8Q2eYnVGw6A2ZxA8Ydz/rNDbLaQWHziLuMERp4FjAyrGEVSS4tz
        03OLjfSKE3OLS/PS9ZLzczcxAkNm27GfW3Ywdr0LPsQowMGoxMNb8XRCjBBrYllxZe4hRgkO
        ZiUR3gilSTFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEec8bVEYJCaQnlqRmp6YWpBbBZJk4OKUa
        GBmbNHsf3pqgofUodGOAqlq+8Jfje+/r/CzLTovfUVfyPpJJ46mircV6fanmekOzNfl/N6Vx
        WN4IveHGV1R2neXJH80JPqfe5Co/ENu3Yo3Sz7hlvwTWKr29L97VkfCfvf/7p679Jz5di0uR
        j2b6t1NSWDptWWXvgZB1BsxJjT3tE7qqg35PVWIpzkg01GIuKk4EACOvWDEVAgAA
X-CMS-MailID: 20190320130719eucas1p1b411bcd1e32a500202a19a24a4ba92a6
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130719eucas1p1b411bcd1e32a500202a19a24a4ba92a6
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130719eucas1p1b411bcd1e32a500202a19a24a4ba92a6@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Id should be assigned based on OF alias.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index f048d97fe9e2..8d5aa70c8ab8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -1287,7 +1287,7 @@ static int gsc_probe(struct platform_device *pdev)
 	}
 
 	/* context initailization */
-	ctx->id = pdev->id;
+	ctx->id = of_alias_get_id(dev->of_node, "gsc");
 
 	platform_set_drvdata(pdev, ctx);
 

From patchwork Wed Mar 20 13:07:01 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861589
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15BEC15AC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:23 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFBE429928
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id EDBC029BE6; Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 921CB29928
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727755AbfCTNHW (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:22 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55162 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727591AbfCTNHV (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:21 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130720euoutp012f350a9f614baab49fb757cad28f8167~NrJ3VwpaZ0130601306euoutp01K;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130720euoutp012f350a9f614baab49fb757cad28f8167~NrJ3VwpaZ0130601306euoutp01K
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087240;
        bh=MvYayiMYt6F6XRoiQC5WSr1zewpSpCqunKSj+HsBjkU=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=qDwdVFSwJ0xNF/eZ6O80sxV1dFSUcrAoqdS8AFAOPE9sfAIlEOfNwKR+lBWXL8Yv7
         UFwfbRLuYWmt+pd3QYGSwUINsx6iq9erK4+uFDTDDF87NDVuWsdVutkkDPe96QA7Lk
         ez9M1guD5aS0ep4aVtTd2hLjNoqOGS5Gh4lyUmKQ=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130720eucas1p249c98ee69e7522ec4d3da185cd7add79~NrJ2_Z5Bb1665816658eucas1p2Y;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id 00.A1.04294.70B329C5;
 Wed, 20
        Mar 2019 13:07:19 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130719eucas1p274be59cfcd798d21ea583bc22f218ff7~NrJ2aNeAa1665816658eucas1p2V;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
X-AuditID: cbfec7f4-c77a99c0000010c6-c6-5c923b077225
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 09.AF.04284.70B329C5;
 Wed, 20
        Mar 2019 13:07:19 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 18/24] arm64: dts: exynos: configure GSCALER
 related clocks
Date: Wed, 20 Mar 2019 14:07:01 +0100
Message-id: <20190320130707.25161-19-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprBIsWRmVeSWpSXmKPExsWy7djP87rs1pNiDPYvMLC4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZE953MxV85K9Yu30TawPjYd4uRg4OCQETia/3yroYuTiEBFYwSlx/1MgK
        4XxmlDj78T5jFyMnWNHpDS8ZIRLLGCW6ry6Gcv4zSjx9vp8NpIpNQFPi7+abYLaIgLLEqn3t
        7CBFzAK/GSWmL9/GDpIQFgiXWHz/AVgRi4CqRNel72AreAUsJTa3P2WHWCcvsXrDAWYQmxMo
        /nDOf7BBEgJ/WSXe3H3MDHG4i8SXTkmIehmJzo6DTBB2vcT9FS3MEPUdjBJbN+xkhkhYSxw+
        fpEVxGYW4JOYtG061BxeiY42IYgSD4nVv46xQXzWA/T/rvfMExglFjAyrGIUTy0tzk1PLTbK
        Sy3XK07MLS7NS9dLzs/dxAiMr9P/jn/ZwbjrT9IhRgEORiUe3gvPJ8QIsSaWFVfmHmKU4GBW
        EuGNUJoUI8SbklhZlVqUH19UmpNafIhRmoNFSZy3muFBtJBAemJJanZqakFqEUyWiYNTqoEx
        bZ1L3tlrn16s2/Lpo6Lby1P8wdtzuiTv+G+b//M98/e1phdN+N6znihaXPeis7E53cMsWSbz
        QNQjhZsSqhavrCViEy7cybA0O/RsgrDVVJMpsdELtEOSbzA2J21aF/eU/dIsjwk8q9553H0Y
        kDT98J+ChOlFtUzzKnXaVafztjxZ/rt6WspSJZbijERDLeai4kQAzF31R6sCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV1260kxBou+iFncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MCe+7mQo+8les3b6JtYHxMG8XIyeHhICJxOkNLxm7GLk4hASWMEqc3f4L
        ymlkkljTNY8ZpIpNQFPi7+abbCC2iICyxKp97ewgRcwCvxklPs/4ClYkLBAucXrZSzCbRUBV
        ouvSd0YQm1fAUmJz+1N2iHXyEqs3HACr4QSKP5zzHywuJGAhsfjEXcYJjDwLGBlWMYqklhbn
        pucWG+oVJ+YWl+al6yXn525iBAbNtmM/N+9gvLQx+BCjAAejEg9vxdMJMUKsiWXFlbmHGCU4
        mJVEeCOUJsUI8aYkVlalFuXHF5XmpBYfYpTmYFES5z1vUBklJJCeWJKanZpakFoEk2Xi4JRq
        YEx9LGeyzHJ3vEOdQnjIFGf+NXELjY9/mVNscHaG7nFjlcIHv9Zal4stPBa2dVt64c2D+2Lf
        TOf75TDR5lBXQ/fqsk2frVU6jyys4zpTtJf9o73wmquBZ5iyKw0dLgmpc61T/mo5a0rcTf1J
        X/j3My3hfxj8/KGtQbnVv2nRv5fPY6ybMHlJsbISS3FGoqEWc1FxIgBg8c6LFgIAAA==
X-CMS-MailID: 20190320130719eucas1p274be59cfcd798d21ea583bc22f218ff7
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130719eucas1p274be59cfcd798d21ea583bc22f218ff7
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130719eucas1p274be59cfcd798d21ea583bc22f218ff7@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

GSCALER should be feed with clock at certain rates.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 6 ++++++
 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts         | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index d88e2f0e179a..d2de16645e10 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -289,6 +289,12 @@
 	assigned-clock-parents = <&cmu_top CLK_ACLK_MFC_400>;
 };
 
+&cmu_mif {
+	assigned-clocks = <&cmu_mif CLK_MOUT_SCLK_DSD_A>, <&cmu_mif CLK_DIV_SCLK_DSD>;
+	assigned-clock-parents = <&cmu_mif CLK_MOUT_MFC_PLL_DIV2>;
+	assigned-clock-rates = <0>, <333000000>;
+};
+
 &cmu_mscl {
 	assigned-clocks = <&cmu_mscl CLK_MOUT_ACLK_MSCL_400_USER>,
 			  <&cmu_mscl CLK_MOUT_SCLK_JPEG_USER>,
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
index 3d7e0a782243..dda5d2746a74 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts
@@ -33,7 +33,8 @@
 			  <&cmu_disp CLK_MOUT_DISP_PLL>,
 			  <&cmu_mif CLK_MOUT_SCLK_DECON_TV_ECLK_A>,
 			  <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>,
-			  <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK>;
+			  <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK>,
+			  <&cmu_disp CLK_MOUT_SCLK_DSD_USER>;
 	assigned-clock-parents = <0>, <0>,
 				 <&cmu_mif CLK_ACLK_DISP_333>,
 				 <&cmu_mif CLK_SCLK_DSIM0_DISP>,
@@ -45,7 +46,8 @@
 				 <&cmu_disp CLK_FOUT_DISP_PLL>,
 				 <&cmu_mif CLK_MOUT_BUS_PLL_DIV2>,
 				 <&cmu_mif CLK_SCLK_DECON_TV_ECLK_DISP>,
-				 <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>;
+				 <&cmu_disp CLK_MOUT_SCLK_DECON_TV_ECLK_USER>,
+				 <&cmu_mif CLK_SCLK_DSD_DISP>;
 	assigned-clock-rates = <250000000>, <400000000>;
 };
 

From patchwork Wed Mar 20 13:07:02 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861591
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6353117EF
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:23 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44B2228B09
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:23 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 4303E29BDC; Wed, 20 Mar 2019 13:07:23 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D371828B09
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:22 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727591AbfCTNHW (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:22 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55209 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727663AbfCTNHW (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:22 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130720euoutp01ac4078e391e379f4410bfa5667d6cb4f~NrJ302Bdj0192801928euoutp01f;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130720euoutp01ac4078e391e379f4410bfa5667d6cb4f~NrJ302Bdj0192801928euoutp01f
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087240;
        bh=Dy+VGQ0HF20VIsRN7nb/J+fk3IZ2gY4XCMx+YNQRV/g=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=FXljM1Rog5Iw6V5BMdCe6LXHSYbSRxE0D3rN66MI6HjG/Hpr5ydt+cKX/bDSi8m1c
         6DlKVu3fxyw6DQn9D/xnSBKGERj4mLcJFCitKQbpKsWvCxAIRffxcni7PG9iXhmYEE
         PTUM4IPpKiXp3KeWj9Po/pHooKBE7Gxel3JAi2zk=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130720eucas1p270b2a782d9b3b5b37d2c804b16ca76ac~NrJ3TvbtR1666516665eucas1p2T;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 1E.92.04806.80B329C5;
 Wed, 20
        Mar 2019 13:07:20 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130719eucas1p2e59268e628f6c88db6b632abb153313a~NrJ2zKR4Y0312903129eucas1p2l;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-35-5c923b08b71a
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id F9.AF.04284.70B329C5;
 Wed, 20
        Mar 2019 13:07:19 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:19 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 19/24] arm64: dts: exynos: add DSD/GSD clocks to
 DECONs and GSCALERs
Date: Wed, 20 Mar 2019 14:07:02 +0100
Message-id: <20190320130707.25161-20-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djP87oc1pNiDNa2cFvcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MTY03WAr+SlW8XbuStYFxqmgXIweHhICJxON9yV2MXBxCAisYJV4/vc8I
        4XxmlLjWtp+9i5ETrOjjqvOsEIlljBLHll6Gcv4zSjx9vp8NpIpNQFPi7+abYLaIgLLEqn3t
        7CBFzAK/GSWmL98GNkpYIEHiwYe3YDaLgKrEvOVXWEFsXgFLiU29cxkh1slLrN5wgBnE5gSK
        P5zzH2yQhMBfVoljKxeyQhS5SEw8uR7KlpHo7DjIBGHXS9xf0cIM0dDBKLF1w05miIS1xOHj
        F8EamAX4JCZtm84MCQFeiY42IYgSD4mrjXtYIF7rYZT4fe0o+wRGiQWMDKsYxVNLi3PTU4uN
        81LL9YoTc4tL89L1kvNzNzECI+z0v+NfdzDu+5N0iFGAg1GJh/fC8wkxQqyJZcWVuYcYJTiY
        lUR4I5QmxQjxpiRWVqUW5ccXleakFh9ilOZgURLnrWZ4EC0kkJ5YkpqdmlqQWgSTZeLglGpg
        9BfdGm0W+efr4+6VOU+s/165ftN7rvHZE/4GT1XMX376t/SE3pG7NdFXjY8KxVtsqCh8sEd5
        o7+ozTXvbzwnpDj2L1+1ZOG7a3a/jqs8y9bU+/zS9lXIusCiTRzW3143Bytqyv5eulg4eJvp
        C2/RzCV//jVcmPZr8cRP3hobRFq0/1jMNpQ9/EqJpTgj0VCLuag4EQDAb+QTrAIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV1260kxBi9X6VvcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MTY03WAr+SlW8XbuStYFxqmgXIyeHhICJxMdV51m7GLk4hASWMEqseDEd
        ymlkkljTNY8ZpIpNQFPi7+abbCC2iICyxKp97ewgRcwCvxklPs/4ClYkLJAg8eDDW3YQm0VA
        VWLe8iusIDavgKXEpt65jBDr5CVWbzgAVs8JFH845z9YvZCAhcTiE3cZJzDyLGBkWMUoklpa
        nJueW2yoV5yYW1yal66XnJ+7iREYNNuO/dy8g/HSxuBDjAIcjEo8vBVPJ8QIsSaWFVfmHmKU
        4GBWEuGNUJoUI8SbklhZlVqUH19UmpNafIhRmoNFSZz3vEFllJBAemJJanZqakFqEUyWiYNT
        qoFRc6K/7w6XPb2Hg/YXJ69com9qJ/nM/bTr6/OF97YcX2y1XdF9zosHcVcSLeW/rVW4/Ozf
        lqBy97MiczcnTEs8z3CbdfaPmF0rJJQWOH8K/BFx8ZRy1i9NAeGtyQt+yAjdYVrcVyy7582+
        +0xdu/ba8zxJmC/u36V7K/yn28P2309DlF2vvvs+XYmlOCPRUIu5qDgRABtuawkWAgAA
X-CMS-MailID: 20190320130719eucas1p2e59268e628f6c88db6b632abb153313a
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130719eucas1p2e59268e628f6c88db6b632abb153313a
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130719eucas1p2e59268e628f6c88db6b632abb153313a@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

To support local paths both DECON and GSCALER should enable respective
Smart Deck clocks DSD and GSD.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 arch/arm64/boot/dts/exynos/exynos5433.dtsi | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index e7cd3b67d818..e6d32b2fb3c0 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -848,12 +848,13 @@
 				<&cmu_disp CLK_ACLK_XIU_DECON1X>,
 				<&cmu_disp CLK_PCLK_SMMU_DECON1X>,
 				<&cmu_disp CLK_SCLK_DECON_VCLK>,
-				<&cmu_disp CLK_SCLK_DECON_ECLK>;
+				<&cmu_disp CLK_SCLK_DECON_ECLK>,
+				<&cmu_disp CLK_SCLK_DSD>;
 			clock-names = "pclk", "aclk_decon", "aclk_smmu_decon0x",
 				"aclk_xiu_decon0x", "pclk_smmu_decon0x",
 				"aclk_smmu_decon1x", "aclk_xiu_decon1x",
 				"pclk_smmu_decon1x", "sclk_decon_vclk",
-				"sclk_decon_eclk";
+				"sclk_decon_eclk", "dsd";
 			power-domains = <&pd_disp>;
 			interrupt-names = "fifo", "vsync", "lcd_sys";
 			interrupts = <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>,
@@ -890,12 +891,13 @@
 				 <&cmu_disp CLK_ACLK_XIU_TV1X>,
 				 <&cmu_disp CLK_PCLK_SMMU_TV1X>,
 				 <&cmu_disp CLK_SCLK_DECON_TV_VCLK>,
-				 <&cmu_disp CLK_SCLK_DECON_TV_ECLK>;
+				 <&cmu_disp CLK_SCLK_DECON_TV_ECLK>,
+				 <&cmu_disp CLK_SCLK_DSD>;
 			clock-names = "pclk", "aclk_decon", "aclk_smmu_decon0x",
 				      "aclk_xiu_decon0x", "pclk_smmu_decon0x",
 				      "aclk_smmu_decon1x", "aclk_xiu_decon1x",
 				      "pclk_smmu_decon1x", "sclk_decon_vclk",
-				      "sclk_decon_eclk";
+				      "sclk_decon_eclk", "dsd";
 			samsung,disp-sysreg = <&syscon_disp>;
 			power-domains = <&pd_disp>;
 			interrupt-names = "fifo", "vsync", "lcd_sys";
@@ -1022,11 +1024,12 @@
 			reg = <0x13c00000 0x1000>;
 			interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>;
 			clock-names = "pclk", "aclk", "aclk_xiu",
-				      "aclk_gsclbend";
+				      "aclk_gsclbend", "gsd";
 			clocks = <&cmu_gscl CLK_PCLK_GSCL0>,
 				 <&cmu_gscl CLK_ACLK_GSCL0>,
 				 <&cmu_gscl CLK_ACLK_XIU_GSCLX>,
-				 <&cmu_gscl CLK_ACLK_GSCLBEND_333>;
+				 <&cmu_gscl CLK_ACLK_GSCLBEND_333>,
+				 <&cmu_gscl CLK_ACLK_GSD>;
 			iommus = <&sysmmu_gscl0>;
 			power-domains = <&pd_gscl>;
 		};
@@ -1036,11 +1039,12 @@
 			reg = <0x13c10000 0x1000>;
 			interrupts = <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
 			clock-names = "pclk", "aclk", "aclk_xiu",
-				      "aclk_gsclbend";
+				      "aclk_gsclbend", "gsd";
 			clocks = <&cmu_gscl CLK_PCLK_GSCL1>,
 				 <&cmu_gscl CLK_ACLK_GSCL1>,
 				 <&cmu_gscl CLK_ACLK_XIU_GSCLX>,
-				 <&cmu_gscl CLK_ACLK_GSCLBEND_333>;
+				 <&cmu_gscl CLK_ACLK_GSCLBEND_333>,
+				 <&cmu_gscl CLK_ACLK_GSD>;
 			iommus = <&sysmmu_gscl1>;
 			power-domains = <&pd_gscl>;
 		};
@@ -1050,11 +1054,12 @@
 			reg = <0x13c20000 0x1000>;
 			interrupts = <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>;
 			clock-names = "pclk", "aclk", "aclk_xiu",
-				      "aclk_gsclbend";
+				      "aclk_gsclbend", "gsd";
 			clocks = <&cmu_gscl CLK_PCLK_GSCL2>,
 				 <&cmu_gscl CLK_ACLK_GSCL2>,
 				 <&cmu_gscl CLK_ACLK_XIU_GSCLX>,
-				 <&cmu_gscl CLK_ACLK_GSCLBEND_333>;
+				 <&cmu_gscl CLK_ACLK_GSCLBEND_333>,
+				 <&cmu_gscl CLK_ACLK_GSD>;
 			iommus = <&sysmmu_gscl2>;
 			power-domains = <&pd_gscl>;
 		};

From patchwork Wed Mar 20 13:07:03 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861599
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A7D018EC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6074529BD8
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 5E52A28BA9; Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6323629A8A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:24 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727663AbfCTNHY (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:24 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58261 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727359AbfCTNHX (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:23 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130721euoutp025d2ead20fb9ac48a4f5e3290cf6dc052~NrJ4D5N081535315353euoutp02N;
        Wed, 20 Mar 2019 13:07:21 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130721euoutp025d2ead20fb9ac48a4f5e3290cf6dc052~NrJ4D5N081535315353euoutp02N
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087241;
        bh=D/Q3pJwahUPY+c5OphoLI+w4qUa7jWUNPKnp2UOn9F4=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=CKIXAYNksIhHWd8bM6Cf45wO4hUUbKdy4q//7IDf43jFJ1cUYjOLX4fGwEfyp+0Kh
         jwkOHAKq3vk2EmdICacLcLcBg3thuj9Jc7xxeWlyFy60aEIaV0BieBvYQ9fia8FxGA
         rztXVILnKsjE8CRjG2b7Dd5UGKPE5i5R8b9qLtEs=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130720eucas1p1e5cb7e4af372cd5edcf3ef20d5564a38~NrJ3vPrQ52303723037eucas1p1H;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 5E.35.04441.80B329C5;
 Wed, 20
        Mar 2019 13:07:20 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130720eucas1p1b6f2351c2262d2c89a464fdc10a6a607~NrJ3NtOkO2442724427eucas1p19;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
X-AuditID: cbfec7f2-5c9ff70000001159-b9-5c923b08ab64
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 7E.DA.04128.80B329C5;
 Wed, 20
        Mar 2019 13:07:20 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 20/24] drm/exynos/gscaler: add local path support
Date: Wed, 20 Mar 2019 14:07:03 +0100
Message-id: <20190320130707.25161-21-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djP87oc1pNiDH4dV7G4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZPy52MhXcC6tYt+kfewPjBo8uRk4OCQETib6LF1lAbCGBFYwS7W3mXYxc
        QPZnRonmpWsYYYpWLFnHBJFYxiixfeZcRgjnP6PE/rvv2ECq2AQ0Jf5uvglmiwgoS6za184O
        UsQs8JtRYvrybewgCWEBb4mdM1uZQGwWAVWJ/f+Og9m8ApYSl3/MZIZYJy+xesMBMJsTKP5w
        zn+wQRICf1klehd9hbrJReLykUVQtozE5cndLBB2vcT9FS3MEA0djBJbN+yEmmotcfj4RVYQ
        m1mAT2LStulAcQ6gOK9ER5sQRImHxO3uU8wQr/UwSpzd8ZZpAqPEAkaGVYziqaXFuempxYZ5
        qeV6xYm5xaV56XrJ+bmbGIERdvrf8U87GL9eSjrEKMDBqMTD2/BmQowQa2JZcWXuIUYJDmYl
        Ed4IpUkxQrwpiZVVqUX58UWlOanFhxilOViUxHmrGR5ECwmkJ5akZqemFqQWwWSZODilGhhN
        JjbrJextvSvF3HmvyPt9pMwB6Xds8YW3vtpO2fEz6uamQmGhf7oF0yqWpczOm5HD+ER82Qv9
        z98zs1gnuPptV3ms4vqpSL12OfPqC9wPVga36LsrzNPmYDWetv6uZMapdbs9mz8bX8raf3DW
        IgbNaetePAq/bnBz2fz+qqiq6++cI2cIT3mjxFKckWioxVxUnAgA/xbUVKwCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV0O60kxBo/381ncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MHxc7mQruhVWs2/SPvYFxg0cXIyeHhICJxIol65i6GLk4hASWMEo8f9QL
        5TQySfxduogFpIpNQFPi7+abbCC2iICyxKp97ewgRcwCvxklPs/4ygySEBbwltg5s5UJxGYR
        UJXY/+84mM0rYClx+cdMZoh18hKrNxwAszmB4g/n/GcHsYUELCQWn7jLOIGRZwEjwypGkdTS
        4tz03GIjveLE3OLSvHS95PzcTYzAoNl27OeWHYxd74IPMQpwMCrx8FY8nRAjxJpYVlyZe4hR
        goNZSYQ3QmlSjBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHe8waVUUIC6YklqdmpqQWpRTBZJg5O
        qQbGWr1205N5T6rO/TkrqlS0W/PQzFAZPYOrb+zK5lqGHHzouLxFvm7SgqNzw79pv5eexxTX
        vmzCDj8HrhSJ+5tUvydf8t/ZKJf+vczg05PdZ80uTTq38tHnp0cDd529wlFkUMtgrp690dnW
        /Uk0W2Ng9iMREUXFzjfXNusla4eb32kInRvOtmCSEktxRqKhFnNRcSIA8wJjABYCAAA=
X-CMS-MailID: 20190320130720eucas1p1b6f2351c2262d2c89a464fdc10a6a607
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130720eucas1p1b6f2351c2262d2c89a464fdc10a6a607
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130720eucas1p1b6f2351c2262d2c89a464fdc10a6a607@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

GSCALERs in Exynos5433 have local path to DECON and DECON_TV.
They can be used as extra planes with support for non-RGB formats and scaling.
To enable it GSCALER must expose exynos_plane with associated plane callbacks
and bind it to DECONs CRTCs. Moreover device locking should be added to prevent
simultanous device usage by IPP and DRM.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_gsc.c | 179 ++++++++++++++++++++----
 drivers/gpu/drm/exynos/regs-gsc.h       |   6 +
 2 files changed, 156 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index 8d5aa70c8ab8..28a738a68a82 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -16,14 +16,16 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/pm_runtime.h>
-#include <linux/mfd/syscon.h>
 #include <linux/of_device.h>
 #include <linux/regmap.h>
 
+#include <drm/drm_atomic.h>
 #include <drm/drmP.h>
 #include <drm/exynos_drm.h>
 #include "regs-gsc.h"
+#include "exynos_drm_crtc.h"
 #include "exynos_drm_drv.h"
+#include "exynos_drm_fb.h"
 #include "exynos_drm_ipp.h"
 
 /*
@@ -98,11 +100,13 @@ struct gsc_scaler {
  */
 struct gsc_context {
 	struct exynos_drm_ipp ipp;
+	struct exynos_drm_plane plane;
 	struct drm_device *drm_dev;
 	struct device	*dev;
 	struct exynos_drm_ipp_task	*task;
 	struct exynos_drm_ipp_formats	*formats;
 	unsigned int			num_formats;
+	struct spinlock lock;
 
 	struct resource	*regs_res;
 	void __iomem	*regs;
@@ -113,8 +117,12 @@ struct gsc_context {
 	int	id;
 	int	irq;
 	bool	rotation;
+	bool	enabled;
+	bool	use_local_path;
 };
 
+#define to_gsc(ptr) container_of(ptr, struct gsc_context, ptr)
+
 /**
  * struct gsc_driverdata - per device type driver data for init time.
  *
@@ -127,6 +135,7 @@ struct gsc_driverdata {
 	int		num_limits;
 	const char	*clk_names[GSC_MAX_CLOCKS];
 	int		num_clocks;
+	bool		use_local_path;
 };
 
 /* 8-tap Filter Coefficient */
@@ -377,6 +386,32 @@ static const int v_coef_4t[GSC_COEF_RATIO][GSC_COEF_ATTR][GSC_COEF_V_4T] = {
 	}
 };
 
+static int gsc_dev_lock(struct gsc_context *ctx, void *task)
+{
+	unsigned long flags;
+	int ret = 0;
+
+	spin_lock_irqsave(&ctx->lock, flags);
+	if (ctx->task)
+		ret = -EBUSY;
+	else
+		ctx->task = task;
+	spin_unlock_irqrestore(&ctx->lock, flags);
+	return ret;
+}
+
+static void *gsc_dev_unlock(struct gsc_context *ctx)
+{
+	unsigned long flags;
+	void *task;
+
+	spin_lock_irqsave(&ctx->lock, flags);
+	task = ctx->task;
+	ctx->task = NULL;
+	spin_unlock_irqrestore(&ctx->lock, flags);
+	return task;
+}
+
 static int gsc_sw_reset(struct gsc_context *ctx)
 {
 	u32 cfg;
@@ -1021,6 +1056,7 @@ static int gsc_get_dst_buf_index(struct gsc_context *ctx)
 static irqreturn_t gsc_irq_handler(int irq, void *dev_id)
 {
 	struct gsc_context *ctx = dev_id;
+	struct exynos_drm_ipp_task *task;
 	u32 status;
 	int err = 0;
 
@@ -1049,10 +1085,8 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id)
 			err = -EINVAL;
 	}
 
-	if (ctx->task) {
-		struct exynos_drm_ipp_task *task = ctx->task;
-
-		ctx->task = NULL;
+	task = gsc_dev_unlock(ctx);
+	if (!IS_ERR_OR_NULL(task)) {
 		pm_runtime_mark_last_busy(ctx->dev);
 		pm_runtime_put_autosuspend(ctx->dev);
 		exynos_drm_ipp_task_done(task, err);
@@ -1117,13 +1151,15 @@ static int gsc_commit(struct exynos_drm_ipp *ipp,
 	struct gsc_context *ctx = container_of(ipp, struct gsc_context, ipp);
 	int ret;
 
-	pm_runtime_get_sync(ctx->dev);
-	ctx->task = task;
+	ret = gsc_dev_lock(ctx, task);
+	if (ret)
+		return ret;
 
+	pm_runtime_get_sync(ctx->dev);
 	ret = gsc_reset(ctx);
 	if (ret) {
 		pm_runtime_put_autosuspend(ctx->dev);
-		ctx->task = NULL;
+		gsc_dev_unlock(ctx);
 		return ret;
 	}
 
@@ -1147,10 +1183,8 @@ static void gsc_abort(struct exynos_drm_ipp *ipp,
 			container_of(ipp, struct gsc_context, ipp);
 
 	gsc_reset(ctx);
-	if (ctx->task) {
-		struct exynos_drm_ipp_task *task = ctx->task;
-
-		ctx->task = NULL;
+	task = gsc_dev_unlock(ctx);
+	if (!IS_ERR_OR_NULL(task)) {
 		pm_runtime_mark_last_busy(ctx->dev);
 		pm_runtime_put_autosuspend(ctx->dev);
 		exynos_drm_ipp_task_done(task, -EIO);
@@ -1162,11 +1196,97 @@ static struct exynos_drm_ipp_funcs ipp_funcs = {
 	.abort = gsc_abort,
 };
 
+static const unsigned int gsc_formats[] = {
+	DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_BGRX8888,
+	DRM_FORMAT_RGB565,
+	DRM_FORMAT_NV12, DRM_FORMAT_NV16, DRM_FORMAT_NV21, DRM_FORMAT_NV61,
+	DRM_FORMAT_UYVY, DRM_FORMAT_VYUY, DRM_FORMAT_YUYV, DRM_FORMAT_YVYU,
+	DRM_FORMAT_YUV420, DRM_FORMAT_YVU420, DRM_FORMAT_YUV422,
+};
+
+static const unsigned int gsc_tiled_formats[] = {
+	DRM_FORMAT_NV12, DRM_FORMAT_NV21,
+};
+
+static void gsc_update_plane(struct exynos_drm_plane *plane)
+{
+	struct gsc_context *ctx = to_gsc(plane);
+	struct exynos_drm_plane_state *state =
+			to_exynos_plane_state(plane->base.state);
+	struct drm_framebuffer *fb = plane->base.state->fb;
+	u32 src_w = fb->pitches[0] / fb->format->cpp[0], src_h = state->src.h;
+	u32 src_x = state->src.x, src_y = state->src.y;
+	u32 cropped_w = state->src.w, cropped_h = state->src.h;
+	u32 scaled_w = state->crtc.w, scaled_h = state->crtc.h;
+	int i;
+
+	if (!ctx->enabled) {
+		while (gsc_dev_lock(ctx, ERR_PTR(-EBUSY)) < 0)
+			usleep_range(1000, 2000);
+		pm_runtime_get_sync(ctx->dev);
+		gsc_sw_reset(ctx);
+		gsc_src_set_buf_seq(ctx, 0, true);
+		gsc_write(GSC_SMART_IF_EN | GSC_HIERARCHICAL_MODE, GSC_SMART_IF_CON);
+		ctx->enabled = true;
+	}
+	gsc_write(GSC_POINT(src_x, src_y), GSC_SRCIMG_OFFSET);
+	gsc_write(GSC_POINT(src_w, src_h), GSC_SRCIMG_SIZE);
+	gsc_write(GSC_POINT(cropped_w, cropped_h), GSC_CROPPED_SIZE);
+	gsc_write(GSC_POINT(scaled_w, scaled_h), GSC_SCALED_SIZE);
+	gsc_write(GSC_OUT_PATH_LOCAL | GSC_OUT_RGB_HD_WIDE, GSC_OUT_CON);
+	gsc_write(GSC_POINT(1, 1), GSC_PRE_SCALE_RATIO);
+	gsc_write(BIT(16) * cropped_w / scaled_w, GSC_MAIN_H_RATIO);
+	gsc_write(BIT(16) * cropped_h / scaled_h, GSC_MAIN_V_RATIO);
+	gsc_write(exynos_drm_fb_dma_addr(fb, 0), GSC_IN_BASE_ADDR_Y(0));
+	if (fb->format->num_planes > 1)
+	        gsc_write(exynos_drm_fb_dma_addr(fb, 1), GSC_IN_BASE_ADDR_CB(0));
+	if (fb->format->num_planes > 2)
+	        gsc_write(exynos_drm_fb_dma_addr(fb, 2), GSC_IN_BASE_ADDR_CR(0));
+	gsc_src_set_fmt(ctx, fb->format->format, fb->modifier);
+	gsc_write(scaled_w * scaled_h, GSC_SMART_IF_PIXEL_NUM);
+	gsc_write(GSC_ENABLE_SFR_UPDATE | GSC_ENABLE_ON, GSC_ENABLE);
+}
+
+static void gsc_disable_plane(struct exynos_drm_plane *plane)
+{
+	struct gsc_context *ctx = to_gsc(plane);
+	u32 val;
+
+	val = gsc_read(GSC_ENABLE);
+	val |= GSC_ENABLE_SFR_UPDATE;
+	val &= ~GSC_ENABLE_ON;
+	gsc_write(val, GSC_ENABLE);
+	pm_runtime_mark_last_busy(ctx->dev);
+	pm_runtime_put_autosuspend(ctx->dev);
+	ctx->enabled = false;
+	gsc_dev_unlock(ctx);
+}
+
+const struct exynos_drm_plane_ops gsc_plane_ops = {
+	.update_plane = gsc_update_plane,
+	.disable_plane = gsc_disable_plane
+};
+
+static void gsc_set_possible_crtcs(struct gsc_context *ctx)
+{
+	struct exynos_drm_crtc *crtc;
+	u32 mask = 0;
+
+	crtc = exynos_drm_crtc_get_by_type(ctx->drm_dev, EXYNOS_DISPLAY_TYPE_HDMI);
+	if (crtc)
+		mask |= drm_crtc_mask(&crtc->base);
+	crtc = exynos_drm_crtc_get_by_type(ctx->drm_dev, EXYNOS_DISPLAY_TYPE_LCD);
+	if (crtc)
+		mask |= drm_crtc_mask(&crtc->base);
+	ctx->plane.base.possible_crtcs = mask;
+}
+
 static int gsc_bind(struct device *dev, struct device *master, void *data)
 {
 	struct gsc_context *ctx = dev_get_drvdata(dev);
 	struct drm_device *drm_dev = data;
 	struct exynos_drm_ipp *ipp = &ctx->ipp;
+	int ret;
 
 	ctx->drm_dev = drm_dev;
 	exynos_drm_register_dma(drm_dev, dev);
@@ -1176,9 +1296,19 @@ static int gsc_bind(struct device *dev, struct device *master, void *data)
 			DRM_EXYNOS_IPP_CAP_SCALE | DRM_EXYNOS_IPP_CAP_CONVERT,
 			ctx->formats, ctx->num_formats, "gsc");
 
-	dev_info(dev, "The exynos gscaler has been probed successfully\n");
-
-	return 0;
+	if (!ctx->use_local_path)
+		return 0;
+
+	ctx->plane.index = ctx->id;
+	ctx->plane.capabilities = EXYNOS_DRM_PLANE_CAP_GSCALER |
+				  EXYNOS_DRM_PLANE_CAP_ZPOS |
+				  EXYNOS_DRM_PLANE_CAP_SCALE |
+				  EXYNOS_DRM_PLANE_CAP_WIN_BLEND;
+	ctx->plane.ops = &gsc_plane_ops;
+	ret = exynos_plane_init(drm_dev, &ctx->plane, gsc_formats,
+			ARRAY_SIZE(gsc_formats), 0);
+	gsc_set_possible_crtcs(ctx);
+	return ret;
 }
 
 static void gsc_unbind(struct device *dev, struct device *master,
@@ -1197,18 +1327,6 @@ static const struct component_ops gsc_component_ops = {
 	.unbind = gsc_unbind,
 };
 
-static const unsigned int gsc_formats[] = {
-	DRM_FORMAT_ARGB8888,
-	DRM_FORMAT_XRGB8888, DRM_FORMAT_RGB565, DRM_FORMAT_BGRX8888,
-	DRM_FORMAT_NV12, DRM_FORMAT_NV16, DRM_FORMAT_NV21, DRM_FORMAT_NV61,
-	DRM_FORMAT_UYVY, DRM_FORMAT_VYUY, DRM_FORMAT_YUYV, DRM_FORMAT_YVYU,
-	DRM_FORMAT_YUV420, DRM_FORMAT_YVU420, DRM_FORMAT_YUV422,
-};
-
-static const unsigned int gsc_tiled_formats[] = {
-	DRM_FORMAT_NV12, DRM_FORMAT_NV21,
-};
-
 static int gsc_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -1226,6 +1344,8 @@ static int gsc_probe(struct platform_device *pdev)
 	ctx->dev = dev;
 	ctx->num_clocks = driver_data->num_clocks;
 	ctx->clk_names = driver_data->clk_names;
+	ctx->use_local_path = driver_data->use_local_path;
+	spin_lock_init(&ctx->lock);
 
 	/* construct formats/limits array */
 	num_formats = ARRAY_SIZE(gsc_formats) + ARRAY_SIZE(gsc_tiled_formats);
@@ -1395,10 +1515,11 @@ static struct gsc_driverdata gsc_exynos5420_drvdata = {
 };
 
 static struct gsc_driverdata gsc_exynos5433_drvdata = {
-	.clk_names = {"pclk", "aclk", "aclk_xiu", "aclk_gsclbend"},
-	.num_clocks = 4,
+	.clk_names = {"pclk", "aclk", "aclk_xiu", "aclk_gsclbend", "gsd"},
+	.num_clocks = 5,
 	.limits = gsc_5433_limits,
 	.num_limits = ARRAY_SIZE(gsc_5433_limits),
+	.use_local_path = true,
 };
 
 static const struct of_device_id exynos_drm_gsc_of_match[] = {
diff --git a/drivers/gpu/drm/exynos/regs-gsc.h b/drivers/gpu/drm/exynos/regs-gsc.h
index 16b39734115c..7c23a79085e2 100644
--- a/drivers/gpu/drm/exynos/regs-gsc.h
+++ b/drivers/gpu/drm/exynos/regs-gsc.h
@@ -91,6 +91,7 @@
 #define GSC_IN_PATH_LOCAL		(1 << 0)
 #define GSC_IN_PATH_MEMORY		(0 << 0)
 
+#define GSC_POINT(x, y)			((x) + ((y) << 16))
 /* G-Scaler source image size */
 #define GSC_SRCIMG_SIZE			0x14
 #define GSC_SRCIMG_HEIGHT_MASK		(0x1fff << 16)
@@ -264,6 +265,11 @@
 #define GSC_VPOSITION			0xA7C
 #define GSC_VPOS_F(x)			((x) << 0)
 
+#define GSC_SMART_IF_PIXEL_NUM		0xAF0
+
+#define GSC_SMART_IF_CON		0xAF4
+#define GSC_SMART_IF_EN			(1 << 0)
+#define GSC_HIERARCHICAL_MODE		(0x3 << 1)
 
 /* G-Scaler clock initial count */
 #define GSC_CLK_INIT_COUNT		0xC00

From patchwork Wed Mar 20 13:07:04 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861595
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D26417EF
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02E5B28B92
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id EB7092838B; Wed, 20 Mar 2019 13:07:24 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8B2B28B92
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:23 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727307AbfCTNHX (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:23 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55167 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727415AbfCTNHX (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:23 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130721euoutp017a83345795bd45b0fbd7926d0a038b90~NrJ4jMY9u0192201922euoutp01i;
        Wed, 20 Mar 2019 13:07:21 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130721euoutp017a83345795bd45b0fbd7926d0a038b90~NrJ4jMY9u0192201922euoutp01i
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087241;
        bh=3XLHoKB/gX6jbQYLpF9D12Y31faiwvzTIy/3lMIsTZA=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=W0kX5MDx/HJN3Kqt0MWnYcsSwRI1sWCFipi4FLyuOG8OAqmDMggfXd30WqfzhcPSH
         mMldlHxQHyzECr3puHd/MT+r0XqQE7lBVGUASd2QDs6JjRnSt7u5DVviMNVKd0aMgT
         QC9I6HCZYGZrzdTFJkp19sayXeMsNt79XHU9ZjDw=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130721eucas1p2c29a9a04be9465f823568b22ca750192~NrJ4MEOEu0212202122eucas1p2k;
        Wed, 20 Mar 2019 13:07:21 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id FE.35.04441.80B329C5;
 Wed, 20
        Mar 2019 13:07:20 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130720eucas1p1f2b27e5d340a50dc710155b37e7b173b~NrJ3ljATu2302523025eucas1p1E;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
X-AuditID: cbfec7f2-5c9ff70000001159-bb-5c923b08d1af
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id FE.DA.04128.80B329C5;
 Wed, 20
        Mar 2019 13:07:20 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:20 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 21/24] drm/exynos/decon5433: add local path
 support
Date: Wed, 20 Mar 2019 14:07:04 +0100
Message-id: <20190320130707.25161-22-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWy7djP87oc1pNiDN4vsLG4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZf3dMYS2YZFzx91EfWwPjBq0uRk4OCQETicbjl5m6GLk4hARWMEo8vL6O
        EcL5zCjxfPF2Fpiq9Q3foKqWMUq8mD6LDcL5zyix/+47NpAqNgFNib+bb4LZIgLKEqv2tbOD
        FDEL/GaUmL58GztIQljAX+JEUw9YEYuAqsS3WY/AVvAKWEpMnfmKDWKdvMTqDQeYQWxOoPjD
        Of/BBkkINLJJbH5/ixmiyEXi2+tmJghbRuLy5G6oW+sl7q9oYYZo6GCU2LphJ1SDtcTh4xdZ
        QWxmAT6JSdumA8U5gOK8Eh1tQhAlHhIr/0+Heq2HUWLj+2PsExglFjAyrGIUTy0tzk1PLTbM
        Sy3XK07MLS7NS9dLzs/dxAiMsdP/jn/awfj1UtIhRgEORiUe3oY3E2KEWBPLiitzDzFKcDAr
        ifBGKE2KEeJNSaysSi3Kjy8qzUktPsQozcGiJM5bzfAgWkggPbEkNTs1tSC1CCbLxMEp1cC4
        Mkro2TumylDTjylK7l2dH1lFj3a2zviziLfh+ndvCyepCe9iNjx3033a+SZMpfZx94mPvud1
        H8ob+j27OsvziM+/s6ouTbEiQUHPFp6/PlE3Zhlv1LRlPi1BSWs0okNurHl87fvcn++Vt0wK
        6Tjyh0/L8/ADg8P5nHzpu123bl+X3PiAw61YiaU4I9FQi7moOBEAwTxVWK0CAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV0O60kxBltmaVjcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MvzumsBZMMq74+6iPrYFxg1YXIyeHhICJxPqGb0xdjFwcQgJLGCUm7l3M
        COE0Mkn8XbqIBaSKTUBT4u/mm2wgtoiAssSqfe3sIEXMAr8ZJT7P+MoMkhAW8JVYvryVFcRm
        EVCV+DbrEVgzr4ClxNSZr9gg1slLrN5wAKyeEyj+cM5/dhBbSMBCYvGJu4wTGHkWMDKsYhRJ
        LS3OTc8tNtIrTswtLs1L10vOz93ECAyabcd+btnB2PUu+BCjAAejEg9vxdMJMUKsiWXFlbmH
        GCU4mJVEeCOUJsUI8aYkVlalFuXHF5XmpBYfYpTmYFES5z1vUBklJJCeWJKanZpakFoEk2Xi
        4JRqYLRte7J88S6Rm1/Omh4+MfNTidxmsdUXnH7ffiUXG2sV/kDnkdFtSznpC3kvZGff+7h/
        WSFfsvYp7xthqpP9EwXX3+pdWmRmu8CnNMyO48vsoElnjUWdl2wRndWY9DFo2vz7EY+E3l0t
        27nIz0lqoufa5OJjL5YufuO46ULv7/NqVUmRn1qcMhiUWIozEg21mIuKEwFY3WtLFgIAAA==
X-CMS-MailID: 20190320130720eucas1p1f2b27e5d340a50dc710155b37e7b173b
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130720eucas1p1f2b27e5d340a50dc710155b37e7b173b
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130720eucas1p1f2b27e5d340a50dc710155b37e7b173b@eucas1p1.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

GSCALERs in Exynos5433 have local path to DECON and DECON_TV.
They can be used as extra planes with support for non-RGB formats and scaling.
To enable it on DECON update_plane and disable_plane callback should
be modified. Moreover DSD mux should be set accordingly, and finally
atomic_check callback should be used to limit the number of active planes.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 80 +++++++++++++++----
 drivers/gpu/drm/exynos/regs-decon5433.h       |  6 ++
 2 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 958972e3ee1e..b0332763594e 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -26,6 +26,10 @@
 #include "exynos_drm_fb.h"
 #include "regs-decon5433.h"
 
+#define DSD_CFG 0x1000
+#define DSD_CFG_GSCL_MODE(gsc, decon, wb) (((wb) << 1) | decon) << (3 + ((gsc) << 1))
+#define DSD_CFG_GSCL_MODE_MASK(gsc) DSD_CFG_GSCL_MODE(gsc, 1, 1)
+
 #define DSD_CFG_MUX 0x1004
 #define DSD_CFG_MUX_TE_UNMASK_GLOBAL BIT(13)
 
@@ -47,6 +51,7 @@ static const char * const decon_clks_name[] = {
 	"pclk_smmu_decon1x",
 	"sclk_decon_vclk",
 	"sclk_decon_eclk",
+	"dsd"
 };
 
 struct decon_context {
@@ -370,11 +375,40 @@ static void decon_shadow_protect(struct decon_context *ctx, bool protect)
 		       protect ? ~0 : 0);
 }
 
+static int decon_atomic_check(struct exynos_drm_crtc *crtc,
+			      struct drm_crtc_state *state)
+{
+	struct decon_context *ctx = to_decon(crtc);
+
+	if (hweight32(state->plane_mask) > WINDOWS_NR - ctx->first_win)
+		return -EINVAL;
+	return 0;
+}
+
+static void decon_set_gscl_mode(struct decon_context *ctx)
+{
+	u32 plane_mask = ctx->crtc.base.state->plane_mask;
+	struct drm_plane *bplane;
+	u32 mask = 0, val = 0;
+	bool decon_id = ctx->out_type & IFTYPE_HDMI;
+
+	drm_for_each_plane_mask(bplane, ctx->drm_dev, plane_mask) {
+		struct exynos_drm_plane *plane = to_exynos_plane(bplane);
+
+		if (!(plane->capabilities & EXYNOS_DRM_PLANE_CAP_GSCALER))
+			continue;
+		mask |= DSD_CFG_GSCL_MODE_MASK(plane->index);
+		val |= DSD_CFG_GSCL_MODE(plane->index, decon_id, 0);
+	}
+	regmap_update_bits(ctx->sysreg, DSD_CFG, mask, val);
+}
+
 static void decon_atomic_begin(struct exynos_drm_crtc *crtc)
 {
 	struct decon_context *ctx = to_decon(crtc);
 
 	decon_shadow_protect(ctx, true);
+	decon_set_gscl_mode(ctx);
 }
 
 #define BIT_VAL(x, e, s) (((x) & ((1 << ((e) - (s) + 1)) - 1)) << (s))
@@ -394,6 +428,9 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
 	dma_addr_t dma_addr = exynos_drm_fb_dma_addr(fb, 0);
 	u32 val;
 
+	if (plane->ops && plane->ops->update_plane)
+		plane->ops->update_plane(plane);
+
 	if (crtc->base.mode.flags & DRM_MODE_FLAG_INTERLACE) {
 		val = COORDINATE_X(state->crtc.x) |
 			COORDINATE_Y(state->crtc.y / 2);
@@ -419,25 +456,38 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
 		VIDOSD_Wx_ALPHA_B_F(0x0);
 	writel(val, ctx->addr + DECON_VIDOSDxD(win));
 
-	writel(dma_addr, ctx->addr + DECON_VIDW0xADD0B0(win));
-
-	val = dma_addr + pitch * state->src.h;
-	writel(val, ctx->addr + DECON_VIDW0xADD1B0(win));
-
-	if (!(ctx->out_type & IFTYPE_HDMI))
-		val = BIT_VAL(pitch - state->crtc.w * cpp, 27, 14)
-			| BIT_VAL(state->crtc.w * cpp, 13, 0);
-	else
-		val = BIT_VAL(pitch - state->crtc.w * cpp, 29, 15)
-			| BIT_VAL(state->crtc.w * cpp, 14, 0);
-	writel(val, ctx->addr + DECON_VIDW0xADD2(win));
-
 	decon_win_set_pixfmt(ctx, plane);
 
+	if (plane->capabilities & EXYNOS_DRM_PLANE_CAP_GSCALER) {
+		writel(UPDATE_SCHEME_OTF_PER_FRAME,
+			ctx->addr + DECON_UPDATE_SCHEME);
+		decon_set_bits(ctx, DECON_WINCONx(win),
+			WINCONx_ENLOCAL_F | WINCONx_LOCALSEL_MASK,
+			WINCONx_ENLOCAL_F | WINCONx_LOCALSEL_F(plane->index));
+	} else {
+		writel(dma_addr, ctx->addr + DECON_VIDW0xADD0B0(win));
+		val = dma_addr + pitch * state->src.h;
+		writel(val, ctx->addr + DECON_VIDW0xADD1B0(win));
+		if (!(ctx->out_type & IFTYPE_HDMI))
+			val = BIT_VAL(pitch - state->crtc.w * cpp, 27, 14)
+				| BIT_VAL(state->crtc.w * cpp, 13, 0);
+		else
+			val = BIT_VAL(pitch - state->crtc.w * cpp, 29, 15)
+				| BIT_VAL(state->crtc.w * cpp, 14, 0);
+		writel(val, ctx->addr + DECON_VIDW0xADD2(win));
+	}
+
 	/* window enable */
 	decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, ~0);
 }
 
+static void decon_disable_plane(struct exynos_drm_crtc *crtc,
+			       struct exynos_drm_plane *plane)
+{
+	if (plane->ops && plane->ops->disable_plane)
+		plane->ops->disable_plane(plane);
+}
+
 static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
 {
 	struct decon_context *ctx = to_decon(crtc);
@@ -448,7 +498,7 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
 	for (; win < WINDOWS_NR; ++win) {
 		if (!readl(ctx->addr + DECON_WINCONx(win)) & WINCONx_ENWIN_F)
 			break;
-		decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0);
+		writel(0, ctx->addr + DECON_WINCONx(win));
 	}
 
 	spin_lock_irqsave(&ctx->vblank_lock, flags);
@@ -590,8 +640,10 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = {
 	.disable		= decon_disable,
 	.enable_vblank		= decon_enable_vblank,
 	.disable_vblank		= decon_disable_vblank,
+	.atomic_check		= decon_atomic_check,
 	.atomic_begin		= decon_atomic_begin,
 	.update_plane		= decon_update_plane,
+	.disable_plane		= decon_disable_plane,
 	.mode_valid		= decon_mode_valid,
 	.atomic_flush		= decon_atomic_flush,
 };
diff --git a/drivers/gpu/drm/exynos/regs-decon5433.h b/drivers/gpu/drm/exynos/regs-decon5433.h
index 63db6974bf14..21a1c0bdd10a 100644
--- a/drivers/gpu/drm/exynos/regs-decon5433.h
+++ b/drivers/gpu/drm/exynos/regs-decon5433.h
@@ -98,6 +98,9 @@
 #define VIDOUT_COMMAND_IF		(0x2 << 20)
 
 /* WINCONx */
+#define WINCONx_LOCALSEL_F(n)		((n) << 21)
+#define WINCONx_LOCALSEL_MASK		(0x3 << 21)
+#define WINCONx_ENLOCAL_F		(0x1 << 20)
 #define WINCONx_HAWSWP_F		(1 << 16)
 #define WINCONx_WSWP_F			(1 << 15)
 #define WINCONx_BURSTLEN_MASK		(0x3 << 10)
@@ -184,6 +187,9 @@
 #define VIDTCON2_LINEVAL(x)		(((x) & 0xfff) << 16)
 #define VIDTCON2_HOZVAL(x)		((x) & 0xfff)
 
+/* DECON_UPDATE_SCHEME */
+#define UPDATE_SCHEME_OTF_PER_FRAME	(1 << 31)
+
 /* TRIGCON */
 #define TRIGCON_TRIGEN_PER_F		(1 << 31)
 #define TRIGCON_TRIGEN_F		(1 << 30)

From patchwork Wed Mar 20 13:07:05 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861603
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE8FC1823
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4C7C299B6
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id C2FD929BDC; Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AAEA299B6
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:24 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727760AbfCTNHX (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:23 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58268 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727663AbfCTNHX (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:23 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130722euoutp02337f312d83444ba3c4ed3f13711e2c01~NrJ5Pf9QZ1589615896euoutp02l;
        Wed, 20 Mar 2019 13:07:22 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130722euoutp02337f312d83444ba3c4ed3f13711e2c01~NrJ5Pf9QZ1589615896euoutp02l
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087242;
        bh=cpYT42EusnvUENfsBe2CbH4a+nZgA0tdO6X2xO+kOvw=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=MVswihdT5tuJAL4AAHyckz+OewXP6Y7jyELq+wd8FBqT6Cht7Qu0lMIfYVeU82Mth
         IUTXYSzeaD6neGxh0MAokW+TPUd0wWeOGJwISuGAUTUqC3HfyjBrkXfjWXfblbltGy
         3/DFjAZc9xmwpO7p7GqEHVD10FynWQqooCXWcziM=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190320130722eucas1p1d2425948b06f0a928ffb3cc2e2f4ad99~NrJ4238HK2305023050eucas1p17;
        Wed, 20 Mar 2019 13:07:22 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id EF.35.04441.90B329C5;
 Wed, 20
        Mar 2019 13:07:21 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130721eucas1p2097f22c60919e45a10f9dff6dd678c99~NrJ4OaYPc1479814798eucas1p2X;
        Wed, 20 Mar 2019 13:07:21 +0000 (GMT)
X-AuditID: cbfec7f2-5c9ff70000001159-bd-5c923b0963f6
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id FA.AF.04284.90B329C5;
 Wed, 20
        Mar 2019 13:07:21 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:21 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 22/24] drm/exynos/decon5433: wait for finish
 previous update
Date: Wed, 20 Mar 2019 14:07:05 +0100
Message-id: <20190320130707.25161-23-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWy7djP87qc1pNiDFpm6FrcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MvUsXsxd0CVQc2/GPqYHxI28XIyeHhICJxJ1779m7GLk4hARWMEq8WniD
        CcL5zCix8Mw8Npiqtdt/M0IkljFKvG6fAlX1n1Fi/q8PYFVsApoSfzffBLNFBJQlVu1rB5vL
        LPCbUWL68m3sIAlhgQiJbxe2MoPYLAKqEssOLGAFsXkFLCUuPNnGCrFOXmL1hgNgNZxA8Ydz
        /oMNkhBoZJNouLcGqshF4tOmFmYIW0ais+MgE4RdL3F/BUgcpKGDUWLrhp1QRdYSh49fBGtm
        FuCTmLRtOlCcAyjOK9HRJgRR4iFxcdddVojXehglnjxYwzKBUWIBI8MqRvHU0uLc9NRiw7zU
        cr3ixNzi0rx0veT83E2MwBg7/e/4px2MXy8lHWIU4GBU4uFteDMhRog1say4MvcQowQHs5II
        b4TSpBgh3pTEyqrUovz4otKc1OJDjNIcLErivNUMD6KFBNITS1KzU1MLUotgskwcnFINjMGC
        1qXyjA3560O+8bxVXvTnXPZ5b90nN+Z/rhCrM7f0ZQtdMo1TmNs2L/kVa+M+L4bXP7NlFore
        8L8qv/Xai89rlcv99ugESs8NbKjtmt1ya23CvS3rJAt/8y5SzkxwExD9cp+9TvPLEuYjKa6d
        azxflMYpzDj9ujTkmMinFyVTW50nH3c8qMRSnJFoqMVcVJwIAGEp/aatAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV1O60kxBnee81vcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MvUsXsxd0CVQc2/GPqYHxI28XIyeHhICJxNrtvxm7GLk4hASWMEo8+LWW
        HcJpZJKYe/IFM0gVm4CmxN/NN9lAbBEBZYlV+9rBipgFfjNKfJ7xFaxIWCBCYs/CDiYQm0VA
        VWLZgQWsIDavgKXEhSfbWCHWyUus3nAArJ4TKP5wzn92EFtIwEJi8Ym7jBMYeRYwMqxiFEkt
        Lc5Nzy021CtOzC0uzUvXS87P3cQIDJptx35u3sF4aWPwIUYBDkYlHt6KpxNihFgTy4orcw8x
        SnAwK4nwRihNihHiTUmsrEotyo8vKs1JLT7EKM3BoiTOe96gMkpIID2xJDU7NbUgtQgmy8TB
        KdXAqK21V+lV47U6rTyhux1aIW/djyXOvXy1P/fBt0MfLyiu/xwRuHrXkmkKileN2r1t3Gf2
        Xf7/+O9xW/WppxJW71x4+sFXvlNd29UOBX0z/R1k+vv+za6+c0KTEpus3x1irt/2Our/rNvx
        9f/PPPledMcvuNrdf8t7zwuVV58KsZ3O8LC+abDINUeJpTgj0VCLuag4EQBVRjIFFgIAAA==
X-CMS-MailID: 20190320130721eucas1p2097f22c60919e45a10f9dff6dd678c99
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130721eucas1p2097f22c60919e45a10f9dff6dd678c99
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130721eucas1p2097f22c60919e45a10f9dff6dd678c99@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

DECON should wait for previous update before starting new one. Otherwise
internal registers can be updated in non-atomic, error prone way.
This patch fixes occasional occurrences of vblank timeouts on tm2 platform:
[ 3167.968742] [CRTC:55:crtc-0] vblank wait timed out
[ 3167.987440] WARNING: CPU: 1 PID: 194 at ../drivers/gpu/drm/drm_atomic_helper.c:1423 drm_atomic_helper_wait_for_vblanks.part.9+0x2c0/0x2c8
[ 3168.029990] Modules linked in:
[ 3168.047240] CPU: 1 PID: 194 Comm: modetest Tainted: G        W         5.0.0-rc1+ #694
[ 3168.069539] Hardware name: Samsung TM2 board (DT)
...
[ 3168.453566] Call trace:
[ 3168.469705]  drm_atomic_helper_wait_for_vblanks.part.9+0x2c0/0x2c8
[ 3168.489983]  drm_atomic_helper_commit_tail_rpm+0x60/0x78
[ 3168.509463]  commit_tail+0x44/0x78
[ 3168.527053]  drm_atomic_helper_commit+0xe8/0x160
[ 3168.546010]  drm_atomic_commit+0x48/0x58
[ 3168.564304]  drm_atomic_helper_update_plane+0x11c/0x140
[ 3168.584080]  __setplane_atomic+0x130/0x150
[ 3168.602799]  setplane_internal+0xb0/0x1a8
[ 3168.621493]  drm_mode_setplane+0xc4/0x1b8
[ 3168.640219]  drm_ioctl_kernel+0x94/0x110
[ 3168.658920]  drm_ioctl+0x1c8/0x428
...

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index b0332763594e..09f035f52444 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -406,6 +406,11 @@ static void decon_set_gscl_mode(struct decon_context *ctx)
 static void decon_atomic_begin(struct exynos_drm_crtc *crtc)
 {
 	struct decon_context *ctx = to_decon(crtc);
+	u32 val;
+
+	/* wait for finish previous updates */
+	if (readl_poll_timeout(ctx->addr + DECON_UPDATE, val, !val, 1000, 20000) < 0)
+		dev_err(ctx->dev, "DECON_UPDATE timeout\n");
 
 	decon_shadow_protect(ctx, true);
 	decon_set_gscl_mode(ctx);

From patchwork Wed Mar 20 13:07:06 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861597
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55A331575
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35F8828B92
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 3458429BD8; Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D521E28BA9
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:24 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727359AbfCTNHY (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:24 -0400
Received: from mailout2.w1.samsung.com ([210.118.77.12]:58278 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727415AbfCTNHY (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:24 -0400
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130723euoutp028ba0c6eb721693b05761f695fdd2e1ff~NrJ51iL6W1535315353euoutp02O;
        Wed, 20 Mar 2019 13:07:23 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190320130723euoutp028ba0c6eb721693b05761f695fdd2e1ff~NrJ51iL6W1535315353euoutp02O
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087243;
        bh=rCyWFMfEVy9YOrKqMuoPYN29tJ86LEQrYAp9QJAHdqw=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=e0C3YO1tCoCEOOPMWjA3bHq3ZDSwQJEBn8lLaSq0t5WS4gDfdg8aCnWUNRcqIXS2t
         /iIFmvhaumgQhWJ/zy+KThEdo6PpK34Ytrk7tI9nrC6ddiT9YEuC9wd/y+NywLGmUR
         VRuruXq76vtBYie1rrdHEJzlBkEG/4L3uv4Dnc7I=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130722eucas1p2c14b84e6c0947f465619cc3602a66102~NrJ5SWt1w1038110381eucas1p22;
        Wed, 20 Mar 2019 13:07:22 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id FE.92.04806.A0B329C5;
 Wed, 20
        Mar 2019 13:07:22 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130721eucas1p258d3ace8294e90446d369c1d45941dc9~NrJ4mWtiN0972809728eucas1p2J;
        Wed, 20 Mar 2019 13:07:21 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-3b-5c923b0a5f87
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 7B.AF.04284.90B329C5;
 Wed, 20
        Mar 2019 13:07:21 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:21 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 23/24] drm/exynos/gscaler: change supported color
 format BGRX8888 to XBGR8888
Date: Wed, 20 Mar 2019 14:07:06 +0100
Message-id: <20190320130707.25161-24-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWy7djP87pc1pNiDKa95bG4te4cq8XGGetZ
        La58fc9mMen+BBaL8+c3sFvMOL+PyWLtkbvsDuwem1Z1snnc7z7O5NG3ZRWjx+dNcgEsUVw2
        Kak5mWWpRfp2CVwZF95/Yipo4al4OrObtYFxHlcXIyeHhICJxJ5Hr5i6GLk4hARWMEpM6pvM
        BuF8ZpR4vPkGO0zVhI5+qMQyRonDG5+yQzj/GSXm//rABlLFJqAp8XfzTTBbREBZYtW+drAi
        ZoHfjBLTl28DGyUskCkx98kGZhCbRUBV4vX2BywgNq+ApcS9Y9PYINbJS6zecACshhMo/nDO
        f7BBEgJ/WSUOXDzLBFHkIrH88VJWCFtGorPjIFS8XuL+ihZmiIYORomtG3YyQySsJQ4fvwjW
        wCzAJzFp23SgOAdQnFeio00IosRD4tq2r1B/9jBK3F32l3ECo8QCRoZVjOKppcW56anFxnmp
        5XrFibnFpXnpesn5uZsYgTF2+t/xrzsY9/1JOsQowMGoxMN74fmEGCHWxLLiytxDjBIczEoi
        vBFKk2KEeFMSK6tSi/Lji0pzUosPMUpzsCiJ81YzPIgWEkhPLEnNTk0tSC2CyTJxcEo1MLrb
        hGXd+2cU+mTO6kWVhw5zqGqu+C8cybvrzjv2iIZL/BUVAfv2WTwxs1aK+GKct6HFuzUtJHZB
        279X69ZZpPv9N5i633fiTV1v8Y2LXeLvWM/p3DtDsCrrX3S2S1L1o6PV1cErX6Ze2q0+lemy
        SOWUo/HlBcwPl/uxZ078sy488FH4O6k7U5RYijMSDbWYi4oTAcqSJk6tAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV1O60kxBv9Oa1jcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6MC+8/MRW08FQ8ndnN2sA4j6uLkZNDQsBEYkJHP1sXIxeHkMASRonl538x
        QjiNTBJzT75gBqliE9CU+Lv5JhuILSKgLLFqXzs7SBGzwG9Gic8zvoIVCQtkSsx9sgHMZhFQ
        lXi9/QELiM0rYClx79g0Noh18hKrNxwAq+EEij+c858dxBYSsJBYfOIu4wRGngWMDKsYRVJL
        i3PTc4sN9YoTc4tL89L1kvNzNzECg2bbsZ+bdzBe2hh8iFGAg1GJh7fi6YQYIdbEsuLK3EOM
        EhzMSiK8EUqTYoR4UxIrq1KL8uOLSnNSiw8xSnOwKInznjeojBISSE8sSc1OTS1ILYLJMnFw
        SjUwynAGu/Et1XUUfKv0Uth9s7VRUtPRBY29HM5luyozfz7hbFkx2cLoqgZz3/bre131juis
        /HHG7l751EMHDS/e3L4mdkP8qik3pI6pZc1YmPUuZ2n1xxgtz10nRLUars9c9O/gg5Sg4/fy
        9rItOuH/i1fn2iSLvHxVe5Pqyd47Dq+pXR8WJzNHQYmlOCPRUIu5qDgRAOoJqW4WAgAA
X-CMS-MailID: 20190320130721eucas1p258d3ace8294e90446d369c1d45941dc9
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130721eucas1p258d3ace8294e90446d369c1d45941dc9
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130721eucas1p258d3ace8294e90446d369c1d45941dc9@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

GSCALER does not support BGRX8888, instead it supports XBGR8888.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_gsc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index 28a738a68a82..c7a97d053ab1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -502,7 +502,7 @@ static void gsc_src_set_fmt(struct gsc_context *ctx, u32 fmt, bool tiled)
 	case DRM_FORMAT_ARGB8888:
 		cfg |= GSC_IN_XRGB8888;
 		break;
-	case DRM_FORMAT_BGRX8888:
+	case DRM_FORMAT_XBGR8888:
 		cfg |= (GSC_IN_XRGB8888 | GSC_IN_RB_SWAP);
 		break;
 	case DRM_FORMAT_YUYV:
@@ -689,7 +689,7 @@ static void gsc_dst_set_fmt(struct gsc_context *ctx, u32 fmt, bool tiled)
 	case DRM_FORMAT_XRGB8888:
 		cfg |= (GSC_OUT_XRGB8888 | GSC_OUT_GLOBAL_ALPHA(0xff));
 		break;
-	case DRM_FORMAT_BGRX8888:
+	case DRM_FORMAT_XBGR8888:
 		cfg |= (GSC_OUT_XRGB8888 | GSC_OUT_RB_SWAP);
 		break;
 	case DRM_FORMAT_YUYV:
@@ -1197,7 +1197,7 @@ static struct exynos_drm_ipp_funcs ipp_funcs = {
 };
 
 static const unsigned int gsc_formats[] = {
-	DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_BGRX8888,
+	DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR8888,
 	DRM_FORMAT_RGB565,
 	DRM_FORMAT_NV12, DRM_FORMAT_NV16, DRM_FORMAT_NV21, DRM_FORMAT_NV61,
 	DRM_FORMAT_UYVY, DRM_FORMAT_VYUY, DRM_FORMAT_YUYV, DRM_FORMAT_YVYU,

From patchwork Wed Mar 20 13:07:07 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrzej Hajda <a.hajda@samsung.com>
X-Patchwork-Id: 10861601
Return-Path: <linux-samsung-soc-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A430E15AC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A58C28B7B
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 8861F28BA9; Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham
	version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19A0B28BF1
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Wed, 20 Mar 2019 13:07:25 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727415AbfCTNHY (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Wed, 20 Mar 2019 09:07:24 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:55209 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727757AbfCTNHY (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Wed, 20 Mar 2019 09:07:24 -0400
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190320130723euoutp01af6a58015791192deefe49d5b02f4c83~NrJ53aiTH0183101831euoutp01v;
        Wed, 20 Mar 2019 13:07:23 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190320130723euoutp01af6a58015791192deefe49d5b02f4c83~NrJ53aiTH0183101831euoutp01v
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1553087243;
        bh=TyKT6bah+kd2Dl9KQ7/ARjwuR+1go7zEaegsvg3AlHE=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=sN5HE9tzrGToB1dwSG7/kjoQBNNUob6/rfIiK0lAYLYo5CXzTQINmUmnaKtHOBFlZ
         ibWUwPX44KeeTT3/FxKwDxwuT9m6a210tC/ejtr6dG6jX8oNPwRWUrh/+8tX2UGBFP
         QEdSBzNJYRfwe4rYykOH7BjjvphFMlcRbOsOatlo=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130722eucas1p2f667e03368b8a5f4b32c108263bc90b8~NrJ5fWjZ10270202702eucas1p2Z;
        Wed, 20 Mar 2019 13:07:22 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id 52.A1.04294.A0B329C5;
 Wed, 20
        Mar 2019 13:07:22 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190320130722eucas1p201e6452c3329fdbbc651051da9b14155~NrJ44ODzX1479814798eucas1p2Y;
        Wed, 20 Mar 2019 13:07:22 +0000 (GMT)
X-AuditID: cbfec7f4-835ff700000010c6-cf-5c923b0ad19b
Received: from eusync1.samsung.com ( [203.254.199.211]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 0C.AF.04284.A0B329C5;
 Wed, 20
        Mar 2019 13:07:22 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0POO004P71RZN460@eusync1.samsung.com>;
        Wed, 20 Mar 2019 13:07:22 +0000 (GMT)
From: Andrzej Hajda <a.hajda@samsung.com>
To: Inki Dae <inki.dae@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: [PATCH v2 RESEND 24/24] drm/exynos/gscaler: fix handling YVU420
 pixel format
Date: Wed, 20 Mar 2019 14:07:07 +0100
Message-id: <20190320130707.25161-25-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprGIsWRmVeSWpSXmKPExsWy7djPc7pc1pNiDC62y1rcWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6Mpi+72AqaFSum/JnM0sDYKtPFyMkhIWAisenfWjYQW0hgBaPE2y2FXYxc
        QPZnIHvOJXaYotdL9rFCJJYxSvyYs5AZwvnPKLG8o48JpIpNQFPi7+abYKNEBJQlVu1rZwcp
        Yhb4zSgxffk2IIedQ1ggXGKHBUgJi4CqxO7bn5lBbF4BS4mNxx8zQyyTl1i94QCYzQkUfzjn
        P9gYCYFGNon3G58wdjFyADkuEiv/CkDUy0h0dhxkgrDrJe6vaGGGqO9glNi6YSfUUGuJw8cv
        soLYzAJ8EpO2TWeGmMMr0dEmBFHiIfH41EGov3oYJW4f72GfwCixgJFhFaN4amlxbnpqsVFe
        arlecWJucWleul5yfu4mRmBsnf53/MsOxl1/kg4xCnAwKvHwXng+IUaINbGsuDL3EKMEB7OS
        CG+E0qQYId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rzVDA+ihQTSE0tSs1NTC1KLYLJMHJxSDYys
        mg0Nm6o2Mx19sHPJ41O7yre/c9y+be9uwU9cqnJnjdwEjp9bkO7MyD79ynqb13O32K5w2WBv
        H3mw5+K9277WLm9XVjkdnruha6WEwYP5coo7qjI13BVKVLy3Mpnwsizf9j8q7+oqlrfazRxf
        XPwvveFOPt/ocuZDiLa34vK2m9Gpz0WXvVJTYinOSDTUYi4qTgQAoMvBdqkCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFmpmluLIzCtJLcpLzFFi42I5/e/4ZV0u60kxBu9mM1ncWneO1WLjjPWs
        Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b
        lNSczLLUIn27BK6Mpi+72AqaFSum/JnM0sDYKtPFyMkhIWAi8XrJPtYuRi4OIYEljBJnnrcz
        QTiNTBJ7brQyg1SxCWhK/N18kw3EFhFQlli1r50dpIhZ4DejxOcZX8GKhAXCJXYt/MUEYrMI
        qErsvv0ZLM4rYCmx8fhjZoh18hKrNxwAszmB4g/n/GcHsYUELCQWn7jLOIGRZwEjwypGkdTS
        4tz03GJDveLE3OLSvHS95PzcTYzAoNl27OfmHYyXNgYfYhTgYFTi4a14OiFGiDWxrLgy9xCj
        BAezkghvhNKkGCHelMTKqtSi/Pii0pzU4kOM0hwsSuK85w0qo4QE0hNLUrNTUwtSi2CyTByc
        Ug2MrmFO4TJHbt7OSkqItnzqM09gPnPwm94f6svFdha8jD+sf4zl0gmukILF0oZLF/zRlpvz
        y2/+HuPI045Pj609tuWATOTTFWsVbvzZyn153uuc37tOzt0l9OCPh4LWpcLMKWuShc0Cgy1l
        TvyPXuPTxfBP5Hrx43f//3yPLI2dnPpn+xSXfZfORCqxFGckGmoxFxUnAgBLs54jFgIAAA==
X-CMS-MailID: 20190320130722eucas1p201e6452c3329fdbbc651051da9b14155
CMS-TYPE: 201P
X-CMS-RootMailID: 20190320130722eucas1p201e6452c3329fdbbc651051da9b14155
References: <20190320130707.25161-1-a.hajda@samsung.com>
        <CGME20190320130722eucas1p201e6452c3329fdbbc651051da9b14155@eucas1p2.samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-samsung-soc.vger.kernel.org>
X-Mailing-List: linux-samsung-soc@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

YVU420 requires swapping addresses of U and V planes.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_gsc.c | 52 ++++++++++++++++++-------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index c7a97d053ab1..f75739e8bc55 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -535,10 +535,8 @@ static void gsc_src_set_fmt(struct gsc_context *ctx, u32 fmt, bool tiled)
 		cfg |= GSC_IN_YUV422_3P;
 		break;
 	case DRM_FORMAT_YUV420:
-		cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV420_3P);
-		break;
 	case DRM_FORMAT_YVU420:
-		cfg |= (GSC_IN_CHROMA_ORDER_CRCB | GSC_IN_YUV420_3P);
+		cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV420_3P);
 		break;
 	case DRM_FORMAT_NV12:
 		cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV420_2P);
@@ -658,13 +656,32 @@ static void gsc_src_set_buf_seq(struct gsc_context *ctx, u32 buf_id,
 	gsc_write(cfg, GSC_IN_BASE_ADDR_CR_MASK);
 }
 
+/* returns HW plane index based on pixel format */
+static int gsc_hw_plane_index(int index, u32 format)
+{
+	switch (format) {
+	case DRM_FORMAT_YVU420:
+		switch (index) {
+		case 0: return 0;
+		case 1: return 2;
+		case 2: return 1;
+		}
+	default:
+		return index;
+	}
+}
+
 static void gsc_src_set_addr(struct gsc_context *ctx, u32 buf_id,
 			    struct exynos_drm_ipp_buffer *buf)
 {
+	int idx;
+
 	/* address register set */
 	gsc_write(buf->dma_addr[0], GSC_IN_BASE_ADDR_Y(buf_id));
-	gsc_write(buf->dma_addr[1], GSC_IN_BASE_ADDR_CB(buf_id));
-	gsc_write(buf->dma_addr[2], GSC_IN_BASE_ADDR_CR(buf_id));
+	idx = gsc_hw_plane_index(1, buf->format->format);
+	gsc_write(buf->dma_addr[idx], GSC_IN_BASE_ADDR_CB(buf_id));
+	idx = gsc_hw_plane_index(2, buf->format->format);
+	gsc_write(buf->dma_addr[idx], GSC_IN_BASE_ADDR_CR(buf_id));
 
 	gsc_src_set_buf_seq(ctx, buf_id, true);
 }
@@ -722,10 +739,8 @@ static void gsc_dst_set_fmt(struct gsc_context *ctx, u32 fmt, bool tiled)
 		cfg |= GSC_OUT_YUV422_3P;
 		break;
 	case DRM_FORMAT_YUV420:
-		cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV420_3P);
-		break;
 	case DRM_FORMAT_YVU420:
-		cfg |= (GSC_OUT_CHROMA_ORDER_CRCB | GSC_OUT_YUV420_3P);
+		cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV420_3P);
 		break;
 	case DRM_FORMAT_NV12:
 		cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV420_2P);
@@ -985,10 +1000,13 @@ static void gsc_dst_set_buf_seq(struct gsc_context *ctx, u32 buf_id,
 static void gsc_dst_set_addr(struct gsc_context *ctx,
 			     u32 buf_id, struct exynos_drm_ipp_buffer *buf)
 {
-	/* address register set */
+	int i;
+
 	gsc_write(buf->dma_addr[0], GSC_OUT_BASE_ADDR_Y(buf_id));
-	gsc_write(buf->dma_addr[1], GSC_OUT_BASE_ADDR_CB(buf_id));
-	gsc_write(buf->dma_addr[2], GSC_OUT_BASE_ADDR_CR(buf_id));
+	i = gsc_hw_plane_index(1, buf->format->format);
+	gsc_write(buf->dma_addr[i], GSC_OUT_BASE_ADDR_CB(buf_id));
+	i = gsc_hw_plane_index(2, buf->format->format);
+	gsc_write(buf->dma_addr[i], GSC_OUT_BASE_ADDR_CR(buf_id));
 
 	gsc_dst_set_buf_seq(ctx, buf_id, true);
 }
@@ -1238,10 +1256,14 @@ static void gsc_update_plane(struct exynos_drm_plane *plane)
 	gsc_write(BIT(16) * cropped_w / scaled_w, GSC_MAIN_H_RATIO);
 	gsc_write(BIT(16) * cropped_h / scaled_h, GSC_MAIN_V_RATIO);
 	gsc_write(exynos_drm_fb_dma_addr(fb, 0), GSC_IN_BASE_ADDR_Y(0));
-	if (fb->format->num_planes > 1)
-	        gsc_write(exynos_drm_fb_dma_addr(fb, 1), GSC_IN_BASE_ADDR_CB(0));
-	if (fb->format->num_planes > 2)
-	        gsc_write(exynos_drm_fb_dma_addr(fb, 2), GSC_IN_BASE_ADDR_CR(0));
+	if (fb->format->num_planes > 1) {
+		i = gsc_hw_plane_index(1, fb->format->format);
+		gsc_write(exynos_drm_fb_dma_addr(fb, i), GSC_IN_BASE_ADDR_CB(0));
+	}
+	if (fb->format->num_planes > 2) {
+		i = gsc_hw_plane_index(2, fb->format->format);
+		gsc_write(exynos_drm_fb_dma_addr(fb, i), GSC_IN_BASE_ADDR_CR(0));
+	}
 	gsc_src_set_fmt(ctx, fb->format->format, fb->modifier);
 	gsc_write(scaled_w * scaled_h, GSC_SMART_IF_PIXEL_NUM);
 	gsc_write(GSC_ENABLE_SFR_UPDATE | GSC_ENABLE_ON, GSC_ENABLE);