From patchwork Fri Mar  1 12:20:33 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: 10835061
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 9C2AD188E
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:11 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BD202D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:11 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 7E75A2DA31; Fri,  1 Mar 2019 12:21:11 +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 D52FD2D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:10 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2387711AbfCAMVK (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:10 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36617 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728017AbfCAMVJ (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:09 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122107euoutp01bd01a4697f1336aebe5632be7c104bdf~H1RFw2M7H1400414004euoutp01w;
        Fri,  1 Mar 2019 12:21:07 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122107euoutp01bd01a4697f1336aebe5632be7c104bdf~H1RFw2M7H1400414004euoutp01w
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442867;
        bh=dwjRLFOHufejtcgQ+4y8qgjojqy0dV1UkJPYc5I5Zqc=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=StvYr1WySvKIyBOVJmoUr/vJeN9ZXseGJ5RuJFSQZkXWd+pi7KOFzrfSgGLx+gP5M
         oGM4xXaxMADxlSF4vjtgDdqpEakAEV+l+wEQ7TcHOsLdqCrNfSMblD0/BjSTMe2Rkr
         g4QQiVz4gcDV3R0vmz5dCDnsm+BEaQb/rr0lhhCU=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122107eucas1p2fce06da9ea89b6620c2df57730d9ae1f~H1RFXb7lg1653116531eucas1p2e;
        Fri,  1 Mar 2019 12:21:07 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 40.5E.04441.2B3297C5;
 Fri,  1
        Mar 2019 12:21:06 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122106eucas1p2abe70ca71f4cab803c0edd88ea46996e~H1REtcsfo2978429784eucas1p2l;
        Fri,  1 Mar 2019 12:21:06 +0000 (GMT)
X-AuditID: cbfec7f2-5c9ff70000001159-4f-5c7923b2f9c6
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id D3.23.04284.2B3297C5;
 Fri,  1
        Mar 2019 12:21:06 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:06 +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
Subject: [PATCH 01/23] drm/exynos: remove exynos_drm_plane.h header
Date: Fri, 01 Mar 2019 13:20:33 +0100
Message-id: <20190301122055.7135-2-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42LZduzned1NypUxBmcOGljcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZaxpmctY8Fa3Yt7OzUwNjPvUuxg5OSQETCQ+TXnD2sXIxSEksIJR4tKU3WwQzmcgZ/81Zpiq
        t92/mSASyxglvi68yAKSEBL4zyjxe6UqiM0moCnxd/NNNhBbREBZYtW+dnaQBmaBS4wSr092
        M4IkhAWcJXa29rKD2CwCqhK7lu8EG8QrYC7Reekf1DZ5idUbDoDZnAIWEgdXQgySEHjLKrH8
        5U5GiCIXibPr9zFB2DISnR0Hoex6iaaZV5ghGjoYJU4sXs4GkbCWOHz8IiuIzSzAJzFp23Sg
        Ig6gOK9ER5sQRImHxNXpx9gh3uxmlFj//DnjBEaJBYwMqxjFU0uLc9NTiw3zUsv1ihNzi0vz
        0vWS83M3MQKj6fS/4592MH69lHSIUYCDUYmHN+FleYwQa2JZcWXuIUYJDmYlEV4+hsoYId6U
        xMqq1KL8+KLSnNTiQ4zSHCxK4rzVDA+ihQTSE0tSs1NTC1KLYLJMHJxSDYwLZJ+z7469XWQ3
        73HDRYbm9xPsgxR2XUg4o/asjD3eJqpaLmGGEp9WrLWcpe/qOmNXiSztS+XvJnYrLeCZ1GVz
        8s3Rv99EmJYai5olbFU4fyZqqf0nxb3W7PcmbytR/WPtIzt1/ZQwdok935+8nSV34Knw+qkz
        vxswtFR1FsXrT1xq8j0v4YoSS3FGoqEWc1FxIgA8r5X8ogIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7qblCtjDPavF7O4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yljTMpex4K1uxbydm5kaGPepdzFyckgImEi87f7N1MXIxSEksIRR4uL3y2wQTiOTxNb3a1hA
        qtgENCX+br7JBmKLCChLrNrXzg5SxCxwhVGi/VsXO0hCWMBZYmdrL5jNIqAqsWv5TrBmXgFz
        ic5L/5gh1slLrN5wAMzmFLCQOLgSZBAH0DZziU2noyYw8ixgZFjFKJJaWpybnltsqFecmFtc
        mpeul5yfu4kRGB7bjv3cvIPx0sbgQ4wCHIxKPLwJL8tjhFgTy4orcw8xSnAwK4nw8jFUxgjx
        piRWVqUW5ccXleakFh9ilOZgURLnPW9QGSUkkJ5YkpqdmlqQWgSTZeLglGpgDJr8IPGKQce2
        S3zTv+QuSnrWuTa+v3rPw7Qj91ljyqp/JG5pVpCsE2PkrGO6snuyQuHsv5Mc2CYkLZd5ePQk
        271mnXa5JocIf7mqlU+tNk+pkLHj9EuYVPLha+8UK1mpfJHlKpGXJu+fv0sv0EnbqVC1fw1r
        c8633Mn9FatbBZbceObf1ZSnxFKckWioxVxUnAgAkgx0gwsCAAA=
X-CMS-MailID: 20190301122106eucas1p2abe70ca71f4cab803c0edd88ea46996e
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122106eucas1p2abe70ca71f4cab803c0edd88ea46996e
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122106eucas1p2abe70ca71f4cab803c0edd88ea46996e@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 Fri Mar  1 12:20:34 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: 10835065
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 0B9C117E9
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:12 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED1312D931
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:11 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id E1DCE2D99B; Fri,  1 Mar 2019 12:21:11 +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 D885C2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:09 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2387696AbfCAMVJ (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:09 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36624 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728113AbfCAMVJ (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:09 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122108euoutp016196dc3fcef8b7f4605e579ee9763943~H1RGUXLIi1404314043euoutp01r;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122108euoutp016196dc3fcef8b7f4605e579ee9763943~H1RGUXLIi1404314043euoutp01r
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442868;
        bh=Fb9dJxV68DaagoJOU6h5yb3yQu7u/2u38FlqOTjxzss=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=eScYKvB5XuAgO2xm+xl5Ndu0p4XQp3fAPdcjWaj6xYYxTIFqc0jscL2gMINDINRqS
         ifmtO1v8t+DGOjHKWcFnmbjKK4EUkUPjCZ/CY2ZFR8ity/wz+o2pNEu9yPAN7sLioK
         GGrcWvhsdJVTAQxzmOoiZOVUtTfPWryqVmgt+9q4=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122107eucas1p21d5a668b5cf801584047ef493fb0ceca~H1RF4zD1b1654016540eucas1p2P;
        Fri,  1 Mar 2019 12:21:07 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id AA.CC.04294.3B3297C5;
 Fri,  1
        Mar 2019 12:21:07 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122107eucas1p2a284b545b5b379e61dd960ab66ae2bdb~H1RFSLpTv1858618586eucas1p2O;
        Fri,  1 Mar 2019 12:21:07 +0000 (GMT)
X-AuditID: cbfec7f4-84fff700000010c6-fb-5c7923b31285
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 23.6C.04128.2B3297C5;
 Fri,  1
        Mar 2019 12:21:06 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:06 +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
Subject: [PATCH 02/23] drm/exynos: remove spare macro
Date: Fri, 01 Mar 2019 13:20:34 +0100
Message-id: <20190301122055.7135-3-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42LZduzned3NypUxBr8fS1rcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        Zaz+t4yxYCdLxfrPvYwNjI+Yuxg5OSQETCSeLF4GZHNxCAmsYJTYd+4AWEJI4DOjxKfd4TBF
        pzr3skMULWOUOPbgEhNE0X9Gid8rVUFsNgFNib+bb7KB2CICyhKr9rWDNTALXGKUeH2ymxEk
        ISxgKnGi+yAriM0ioCqx6lIrWJxXwFzi1pozrBDb5CVWb4C4glPAQuLgSohBEgJvWSUe3vjI
        BlHkInFu2X1GCFtG4vLkbhYIu16iaeYVZoiGDkaJE4uXQzVYSxw+fhFsA7MAn8SkbdOBijiA
        4rwSHW1CEKaHRN89NYgvuxklPlxbyzKBUWIBI8MqRvHU0uLc9NRio7zUcr3ixNzi0rx0veT8
        3E2MwEg6/e/4lx2Mu/4kHWIU4GBU4uFNeFkeI8SaWFZcmXuIUYKDWUmEl4+hMkaINyWxsiq1
        KD++qDQntfgQozQHi5I4bzXDg2ghgfTEktTs1NSC1CKYLBMHp1QD4+o91/x22LD8lvrAYx69
        b3Xj0VNW+9QqL/76eHaR9FGhGQkrZp8XVpPL12pMf1K5x/pxjH/26T8RFiaFE69y7X68dk5n
        wfe/LXG66SuX5D5Y+0NDkyvQ1lwvymbnlvXTfywutvmevSTmkJf8ws//Gx6lv9nhIMk67XZN
        Qey+dcLmgbuW1x592qPEUpyRaKjFXFScCAAKpl/IoAIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7qblCtjDG6d07W4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ylj9bxljwU6WivWfexkbGB8xdzFyckgImEic6tzL3sXIxSEksIRRYn/TKUYIp5FJYuv7NSwg
        VWwCmhJ/N99kA7FFBJQlVu1rB+tgFrjCKNH+rYsdJCEsYCpxovsgK4jNIqAqsepSKyOIzStg
        LnFrzRlWiHXyEqs3HABbzSlgIXFwJcggDqBt5hKbTkdNYORZwMiwilEktbQ4Nz232EivODG3
        uDQvXS85P3cTIzA8th37uWUHY9e74EOMAhyMSjy8CS/LY4RYE8uKK3MPMUpwMCuJ8PIxVMYI
        8aYkVlalFuXHF5XmpBYfYpTmYFES5z1vUBklJJCeWJKanZpakFoEk2Xi4JRqYFQ7mD4lZIvP
        ZsNfc7ijHQ53HGgy6nb9zHx77vqemJ6pmuFzlJ4/XPi0oC+Y87oe36rkwB1i9eZ62zSm8fL+
        Cttt+VSuputDW3DmJtkZMZKt4ksuVVm+ST3g0d/R9thMY83WOKcCiyt9rw79dtz6YLb704hJ
        tW/yF056lWYT452nMcEk8fCGXiWW4oxEQy3mouJEADq6m0YLAgAA
X-CMS-MailID: 20190301122107eucas1p2a284b545b5b379e61dd960ab66ae2bdb
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122107eucas1p2a284b545b5b379e61dd960ab66ae2bdb
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122107eucas1p2a284b545b5b379e61dd960ab66ae2bdb@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 Fri Mar  1 12:20:35 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: 10835083
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 79863922
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:14 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64D8D2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:14 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 590692D900; Fri,  1 Mar 2019 12:21:14 +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 0FC882D8F5
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:11 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728017AbfCAMVK (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:10 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36630 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728290AbfCAMVK (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:10 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122108euoutp0180f6e292f43d214dbb1770e33f5dd465~H1RGjbJ2M1452714527euoutp01Q;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122108euoutp0180f6e292f43d214dbb1770e33f5dd465~H1RGjbJ2M1452714527euoutp01Q
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442868;
        bh=UR1xPsqq5p6w7wEYsZmeIYJwRrzLGWgQ4s3cBUVmb60=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=N/5W89qwewG3IdSg5C0v+CqaUdduA8Ld2iK7CPR3L6k85qojH2kuatQWec3J5KW9o
         QJQc7AnC9d2ZwG9Jvj3vK9i89rEfKtu+SUJOvrfdqkMGDn2pFtkFveRxqtzVkj/nlE
         IRrvqbHFI1VOO8ipQo3sfRvZrX2scEzZg0xZYt9Q=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122107eucas1p1f554be0902bc29c0dc233ff1d490b0a8~H1RGAWkwd3187231872eucas1p1W;
        Fri,  1 Mar 2019 12:21:07 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 8F.4B.04806.3B3297C5;
 Fri,  1
        Mar 2019 12:21:07 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122107eucas1p2d2defd88a0375c1a2dc00860d43aa7fd~H1RFbO4L82981729817eucas1p2m;
        Fri,  1 Mar 2019 12:21:07 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-7a-5c7923b30389
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id F4.23.04284.3B3297C5;
 Fri,  1
        Mar 2019 12:21:07 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:07 +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
Subject: [PATCH 03/23] drm/exynos: drop exynos_drm_plane_config structure
Date: Fri, 01 Mar 2019 13:20:35 +0100
Message-id: <20190301122055.7135-4-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42LZduznOd3NypUxBrf7FS1urTvHarFxxnpW
        iytf37NZTLo/gcVixvl9TBZrj9xld2DzuN99nMmjb8sqRo/Pm+QCmKO4bFJSczLLUov07RK4
        MvruyhdMbWWs+LPVv4FxWV4XIweHhICJxKW77l2MXBxCAisYJWZvWc7cxcgJ5HxmlFgxORzE
        Bqn5tvo0K0TRMkaJTSemMEM4/xklOnuvs4BUsQloSvzdfJMNxBYRUJZYta+dHaSIWeASo8Tr
        k92MIAlhAU+J24cfgDWwCKhKdLyfygRi8wqYS/R8nMEOsU5eYvWGA2BncApYSBxcCTFIQuAt
        q8T3O1+YIIpcJPb+P8cMYctIdHYchIrXSzTNvMIM0dDBKHFi8XI2iIS1xOHjF1lBbGYBPolJ
        26YzQwKAV6KjTQiixEPiw+5/jBCvdTNKvN11nmUCo8QCRoZVjOKppcW56anFxnmp5XrFibnF
        pXnpesn5uZsYgZF0+t/xrzsY9/1JOsQowMGoxMO743V5jBBrYllxZe4hRgkOZiURXj6Gyhgh
        3pTEyqrUovz4otKc1OJDjNIcLErivNUMD6KFBNITS1KzU1MLUotgskwcnFINjPz2bLskrsWe
        2G4VNq/yYcPVPXnP5EK3hUi1pNZUc/h/mhid576cY/pEeymb7BuaC9IPtUamyjw0W9lW+4P3
        5T62W8uVFY+uKqnR23jWdrXr8rg/WpvM9odNOae8pvTpC9s7vfvVbyxNjp0v+bp82+KjIqeZ
        c8/eihMXfFC5+v/9jT2nE8O2L1ViKc5INNRiLipOBAAJCFYqoAIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7qblStjDM5v5rC4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yui7K18wtZWx4s9W/wbGZXldjJwcEgImEt9Wn2btYuTiEBJYwijR+fknE4TTyCRxbdlWJpAq
        NgFNib+bb7KB2CICyhKr9rWzgxQxC1xhlGj/1sUOkhAW8JS4ffgBC4jNIqAq0fF+Klgzr4C5
        RM/HGewQ6+QlVm84wAxicwpYSBxcCTKIA2ibucSm01ETGHkWMDKsYhRJLS3OTc8tNtQrTswt
        Ls1L10vOz93ECAyObcd+bt7BeGlj8CFGAQ5GJR7ehJflMUKsiWXFlbmHGCU4mJVEePkYKmOE
        eFMSK6tSi/Lji0pzUosPMUpzsCiJ8543qIwSEkhPLEnNTk0tSC2CyTJxcEo1MNq+fCPs1pe6
        s8xi77YJjheKbvCeE10iO2WeusBShZ4rTlvPlNaXKQT+3xSfv1lgWpaO1Bd55tOWD9k3hFyN
        6+3Xey6m2n3ySq5YaviJpBNzPY8YfZjFo+/EpzNhE88nnQu5DCJ1m3/cPCydNuU+0z5ec2GH
        6zNTKyxUnRfFKRcnuDZfrY38qcRSnJFoqMVcVJwIALQZBNIKAgAA
X-CMS-MailID: 20190301122107eucas1p2d2defd88a0375c1a2dc00860d43aa7fd
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122107eucas1p2d2defd88a0375c1a2dc00860d43aa7fd
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122107eucas1p2d2defd88a0375c1a2dc00860d43aa7fd@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_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 Fri Mar  1 12:20:36 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: 10835067
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 2CA641515
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:11 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17FF02D964
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:11 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 0B6E62D99B; Fri,  1 Mar 2019 12:21:11 +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 A51C02D8F5
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:10 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2387710AbfCAMVK (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:10 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36636 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2387692AbfCAMVK (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:10 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122108euoutp014bb96fb19c7d9ac3dd726247e5d39fcf~H1RHCWt5D1452714527euoutp01R;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122108euoutp014bb96fb19c7d9ac3dd726247e5d39fcf~H1RHCWt5D1452714527euoutp01R
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442868;
        bh=yzRSaJjb04WXw7ci4RcnQ2/nqT/0CwcF9Ug5GhkIUA4=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=F+akyiLv/j3lQ2nPc1y6u+Mpwp49vI3WTn24IP0QHX8DCuRIXNKRm8a+RadM4hTfo
         CXCtTrtfPtcPzoXj+El4Q0YzfowY1JhfJvy7IjQIHjvpPOXZ+YBCg7Pz31O9xQ+epu
         ipO3aqTA37M27OgDWY8yq7titwQm+AvGnbMD+iaE=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122108eucas1p161274a8681d96707a1eb4a8b3d928729~H1RGpaHzl3036530365eucas1p1P;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 00.5B.04806.3B3297C5;
 Fri,  1
        Mar 2019 12:21:08 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122107eucas1p2b546a8f156d54c45669bfa9724c4b8c2~H1RF0UkuP1858618586eucas1p2P;
        Fri,  1 Mar 2019 12:21:07 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-7e-5c7923b3a73e
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id B3.6C.04128.3B3297C5;
 Fri,  1
        Mar 2019 12:21:07 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:07 +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
Subject: [PATCH 04/23] drm/exynos: add exynos_drm_crtc_init function
Date: Fri, 01 Mar 2019 13:20:36 +0100
Message-id: <20190301122055.7135-5-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42LZduznOd0typUxBts+MlrcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZXTd+slY8JC/ovveeZYGxoO8XYwcHBICJhKHz/F0MXJxCAmsYJToed3BDuF8ZpR4sP8Ucxcj
        J1jRh1VrGCESyxgl5t1pYIVw/jNKdPZeZwGpYhPQlPi7+SYbiC0ioCyxal872ChmgUuMEq9P
        djOC7BMWcJG4/9ocpIZFQFXiyZU+FpAwr4C5xIzzvBDL5CVWbzgAtphTwELi4EqIMRICb1kl
        3vZdYYQocpFY+vs11HUyEpcnd7NA2PUSTTOvMEM0dDBKnFi8nA0iYS1x+PhFVhCbWYBPYtK2
        6cwQ//NKdLQJQZR4SGx+sIYJxBYS6GaU+NOtOoFRYgEjwypG8dTS4tz01GLjvNRyveLE3OLS
        vHS95PzcTYzAODr97/jXHYz7/iQdYhTgYFTi4d3xujxGiDWxrLgy9xCjBAezkggvH0NljBBv
        SmJlVWpRfnxRaU5q8SFGaQ4WJXHeaoYH0UIC6YklqdmpqQWpRTBZJg5OqQbGeJmnrz9Y3TqY
        87RQM8BsDtO3MpP5bsa3L0yPUPOYa96dcX57496n3SeM+uYc0pkjt+r/t00f2hg1dv+q0XQR
        Pn/0y/8Q+/zsA8Fex6bssLWvvVmgv15vuoLnu7afGivqUvu6nshf4fibcILhqYTOzTdlHke8
        CiKYrq4y0IqLUa9k9J14bvtZJZbijERDLeai4kQA67gKIp8CAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrGJMWRmVeSWpSXmKPExsVy+t/xq7qblStjDC6vlLO4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yui69ZOx4CF/Rfe98ywNjAd5uxg5OSQETCQ+rFrD2MXIxSEksIRRonfRRFYIp5FJ4tqyrUwg
        VWwCmhJ/N99kA7FFBJQlVu1rZwcpYha4wijR/q0LyOHgEBZwkbj/2hykhkVAVeLJlT4WkDCv
        gLnEjPNQy+QlVm84wAxicwpYSBxc2Q7WKQRUsul01ARGngWMDKsYRVJLi3PTc4uN9IoTc4tL
        89L1kvNzNzECQ2PbsZ9bdjB2vQs+xCjAwajEw5vwsjxGiDWxrLgy9xCjBAezkggvH0NljBBv
        SmJlVWpRfnxRaU5q8SFGaQ4WJXHe8waVUUIC6YklqdmpqQWpRTBZJg5OqQZGR4lzW6+eVf5b
        8JNLkcvJs0p4eYZSn/m0Uo+g1VG/5l+SYFhst//Det/QeSuZzkhcVb8h0rUxRmzaLo1JLcsa
        Jzd5zwrqLyrhOSxq1ZaRtlL2evqHuRmbM+e/7E/0vnN0+rNPDs0R6+efZbDUVm5ZZXI9+F1Z
        CWfh4X/z7yqe4XsdrKPI3CuixFKckWioxVxUnAgAufal6QkCAAA=
X-CMS-MailID: 20190301122107eucas1p2b546a8f156d54c45669bfa9724c4b8c2
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122107eucas1p2b546a8f156d54c45669bfa9724c4b8c2
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122107eucas1p2b546a8f156d54c45669bfa9724c4b8c2@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 Fri Mar  1 12:20:37 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: 10835071
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 6F63318B7
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:12 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DC712D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:12 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 51E092D964; Fri,  1 Mar 2019 12:21:12 +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 A69462D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:11 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388057AbfCAMVL (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:11 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39150 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727782AbfCAMVK (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:10 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122109euoutp0296662755cae4f5d765006af6736a1833~H1RHQFmL32156521565euoutp02t;
        Fri,  1 Mar 2019 12:21:09 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122109euoutp0296662755cae4f5d765006af6736a1833~H1RHQFmL32156521565euoutp02t
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442869;
        bh=4GagIZ6u+HzP7LKOOqaJeqOA7ziodwQif9IXyvp30QE=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=D1l1G6PQDq6uHNh6XIfa+f62Ao7e/u9erFtdaYt9Xw7U7C904kHMAsxu5pINLP72H
         7Dzh5/bwmszuar/8pneT/NWZwM59ZMWEoLPdRg0ygiNaNN8lmlVeS5ciz6g/Q5IkFe
         R0iuFrRu/Ri7zIbdW02aJQtwD8Y2mDYNOqaj78VU=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122108eucas1p1f4aaa7179888322f2c280a2b3d3ff938~H1RG0Xhil2979929799eucas1p1E;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id 5B.CC.04294.4B3297C5;
 Fri,  1
        Mar 2019 12:21:08 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122107eucas1p21e887d2025b970939cabe52ee215b9fe~H1RGGP-Kw2891128911eucas1p2R;
        Fri,  1 Mar 2019 12:21:07 +0000 (GMT)
X-AuditID: cbfec7f4-835ff700000010c6-00-5c7923b43e08
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 24.6C.04128.3B3297C5;
 Fri,  1
        Mar 2019 12:21:07 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:07 +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
Subject: [PATCH 05/23] drm/exynos/decon5433: embed exynos_drm_crtc directly
 into context
Date: Fri, 01 Mar 2019 13:20:37 +0100
Message-id: <20190301122055.7135-6-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWy7djP87pblCtjDOY/ErO4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yvj88xF7wTuziikzvzM3MO7W7WLk5JAQMJG4PvsJWxcjF4eQwApGiSfPbzBDOJ8ZJb58mM4K
        U7Vo8X6oqmWMEo+behghnP+MEp2911lAqtgENCX+br7JBmKLCChLrNrXzg5SxCxwiVHi9clu
        RpCEsECUxK+nj5lAbBYBVYlZs9+CxXkFzCXm905lh1gnL7F6wwFmEJtTwELi4EqIQRICH1kl
        3lzYyQZR5CJxZfsfqPtkJC5P7maBsOslmmZeYYZo6GCUOLF4OVSDtcTh4xfBGpgF+CQmbZsO
        VMQBFOeV6GgTgijxkFj8fQU0ALoZJX5/28k6gVFiASPDKkbx1NLi3PTUYqO81HK94sTc4tK8
        dL3k/NxNjMB4Ov3v+JcdjLv+JB1iFOBgVOLhTXhZHiPEmlhWXJl7iFGCg1lJhJePoTJGiDcl
        sbIqtSg/vqg0J7X4EKM0B4uSOG81w4NoIYH0xJLU7NTUgtQimCwTB6dUA6PwuXw2j+4PAoai
        BxVs9v9+qZ/24lTBw4dTg9hzrC8/K2md0+7T61m21PTZV8GwH/oG5kzpp49kmLA11S/3nC2w
        r3etyG2erPh9xQ19L9IZt2QoVzCu/ZMvvefg0vb7rO9fuBSdkfXfFOh6X44zftbC4JM3Vfpk
        /mTNP5D/9LVXoo1yz7pMQyWW4oxEQy3mouJEABsKifCjAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7qblStjDFp/mljcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZXz++Yi94J1ZxZSZ35kbGHfrdjFyckgImEgsWryfrYuRi0NIYAmjxJJJvxghnEYmiWvLtjKB
        VLEJaEr83XyTDcQWEVCWWLWvnR2kiFngCqNE+7cudpCEsECUxK+nj8EaWARUJWbNfssIYvMK
        mEvM753KDrFOXmL1hgPMIDangIXEwZUggziAtplLbDodNYGRZwEjwypGkdTS4tz03GIjveLE
        3OLSvHS95PzcTYzA8Nh27OeWHYxd74IPMQpwMCrx8Ca8LI8RYk0sK67MPcQowcGsJMLLx1AZ
        I8SbklhZlVqUH19UmpNafIhRmoNFSZz3vEFllJBAemJJanZqakFqEUyWiYNTqoGRLZcvU4Xl
        ylOnN6F//Y2m7HoefMiI8y6Dav0l5UVnd15L9pqQw9ji8m/py5t3nIK2+dWdWPaJhflCi0fR
        ywN/d97uWfxrwzXZqpbNJc8eeK/b3ZdTXzK3V1ztitD6+bvEbbWtfbwUHSdyWX8K4912J1Js
        5btL11rSz3RPEdFYrBLNwRGUGsWsxFKckWioxVxUnAgAMfqsvQsCAAA=
X-CMS-MailID: 20190301122107eucas1p21e887d2025b970939cabe52ee215b9fe
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122107eucas1p21e887d2025b970939cabe52ee215b9fe
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122107eucas1p21e887d2025b970939cabe52ee215b9fe@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/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 Fri Mar  1 12:20:38 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: 10835069
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 2FE9018EC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:12 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F6FC2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:12 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 13FE12D931; Fri,  1 Mar 2019 12:21:12 +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 507482D964
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:11 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728290AbfCAMVK (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:10 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36640 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2387704AbfCAMVK (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:10 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122109euoutp0118dbe97f55174d14e89ca582b3bd4fe1~H1RHq_lIp1404314043euoutp01t;
        Fri,  1 Mar 2019 12:21:09 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122109euoutp0118dbe97f55174d14e89ca582b3bd4fe1~H1RHq_lIp1404314043euoutp01t
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442869;
        bh=uZvrClUPHfriRADK0ELl4qfX0XMk6sY0DwYeawi6/rs=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=fO2cKl26uc1OI+K8MX9pkI7zGstsFy0fCJDiMttt307dy4tjj19fZBg9frrVdbjzo
         VvSN/bALWc3RKskYgwFd3xju7OgLNQ9POPmAjOt3+i7lSdAYvk935mmR6XLdAwEQ/n
         IqXTqduybiJ8ODL0/idDfIJHvJLD2DpHTLg7pODs=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122108eucas1p1f0cc09d67e36b17ddc700f539c0ec437~H1RHBmf8t2751727517eucas1p1p;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id D1.5E.04441.4B3297C5;
 Fri,  1
        Mar 2019 12:21:08 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122108eucas1p2b52e33f1799eefb8ac68d7c4063bb2b9~H1RGc4fHR1653116531eucas1p2k;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-56-5c7923b4f5c5
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id A5.23.04284.4B3297C5;
 Fri,  1
        Mar 2019 12:21:08 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:08 +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
Subject: [PATCH 06/23] drm/exynos/decon7: embed exynos_drm_crtc directly
 into context
Date: Fri, 01 Mar 2019 13:20:38 +0100
Message-id: <20190301122055.7135-7-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWy7djPc7pblCtjDBavUre4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ymg5e5GtYI5pxZcnz9gbGH9odzFyckgImEjMuf6VsYuRi0NIYAWjxM+FM6Gcz4wSjRt2M8FU
        vb/+lg0isYxR4vK//cwQzn9GiXtt/1lBqtgENCX+br7JBmKLCChLrNrXzg5SxCxwiVHi9clu
        RpCEsEC4xJI/u9lBbBYBVYm1238wg9i8AuYSq78fY4VYJy+xesMBsDingIXEwZUQgyQE3rJK
        PPrymRGiyEXixbsPbBC2jERnx0GoW+slmmZeYYZo6GCUOLF4OVSRtcTh4xfBNjAL8ElM2jYd
        qIgDKM4r0dEmBFHiIdG3dQUrxGvdjBKf/hxmn8AosYCRYRWjeGppcW56arFhXmq5XnFibnFp
        Xrpecn7uJkZgPJ3+d/zTDsavl5IOMQpwMCrx8Ca8LI8RYk0sK67MPcQowcGsJMLLx1AZI8Sb
        klhZlVqUH19UmpNafIhRmoNFSZy3muFBtJBAemJJanZqakFqEUyWiYNTqoGxTG/zlov9mZM2
        1i789L/s+1PThIfXRGzeJu8VXi7YyNvRdezzr9s7YhpNhXilBfedaeMsNIlfKiKt9yqqd+fD
        r4Ic7afdDn+az/1aZoETT9Qpi39Mmc46YmoTb3ApXuoRKvukrMB4WLm2ZO+HWQ62E1ZnnLLR
        +n/uOH9G89KTfOf79i8UtXVTYinOSDTUYi4qTgQAWt5OG6MCAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7pblCtjDM4c5rO4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ymg5e5GtYI5pxZcnz9gbGH9odzFyckgImEi8v/6WrYuRi0NIYAmjxKYHz9khnEYmiVtTLrGC
        VLEJaEr83XyTDcQWEVCWWLWvHayIWeAKo0T7ty52kISwQLjE7MZFYA0sAqoSa7f/YAaxeQXM
        JVZ/P8YKsU5eYvWGA2BxTgELiYMrQQZxAG0zl9h0OmoCI88CRoZVjCKppcW56bnFhnrFibnF
        pXnpesn5uZsYgeGx7djPzTsYL20MPsQowMGoxMOb8LI8Rog1say4MvcQowQHs5IILx9DZYwQ
        b0piZVVqUX58UWlOavEhRmkOFiVx3vMGlVFCAumJJanZqakFqUUwWSYOTqkGRtsvMxkZXl3d
        +9mzTcCn/2jvW5bTE43j2wQ4imN6W7Z5H7I1LIt7+VirbnZJvr+L5X2xbQXKWvXLNx5Qa/lk
        FqJxe7cg45QyKYa/lo8qz6zPjs2sWjfl6dcjERevTy2X5K4S3dzxak7E0nOPXjTO2z9f7FGS
        7nrPhTO+sgd3VkX0rPJ7/1WgQomlOCPRUIu5qDgRAALGdMILAgAA
X-CMS-MailID: 20190301122108eucas1p2b52e33f1799eefb8ac68d7c4063bb2b9
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122108eucas1p2b52e33f1799eefb8ac68d7c4063bb2b9
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122108eucas1p2b52e33f1799eefb8ac68d7c4063bb2b9@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 Fri Mar  1 12:20:39 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: 10835075
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 37B8217E9
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 261DA2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 1A4BB2D900; Fri,  1 Mar 2019 12:21:13 +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 78CD42D931
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:12 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388052AbfCAMVM (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:12 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39153 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2387692AbfCAMVL (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:11 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122109euoutp02e900fddab2f20a33f69dce7c9d23c7d6~H1RH7zVmY2156121561euoutp02v;
        Fri,  1 Mar 2019 12:21:09 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122109euoutp02e900fddab2f20a33f69dce7c9d23c7d6~H1RH7zVmY2156121561euoutp02v
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442869;
        bh=HLWtj5gpnxYOt1cQ0328ti+3eXRQqGE+sXdo+C8YpoQ=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=D6kyMJekvSJ23bb/leNzVW6/hn7tjjidkDgj6r3WHKKEi7XAMUeAXg/RAcmhC/5ol
         R//xoxfZCS40/1+0CFSXh42xC0+4OZpmEUpsBuazuuSew4lpbTBvnbyesu1SFIENmn
         8Mo1kyt/O3PWs+fqv8SmfqX1nn2nwk2F7YeU3lmU=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122109eucas1p25d8e6f31843f788a3dc6f84f26913676~H1RHfPsE72978429784eucas1p2o;
        Fri,  1 Mar 2019 12:21:09 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id D0.5B.04806.5B3297C5;
 Fri,  1
        Mar 2019 12:21:09 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122108eucas1p25f8fcb147e5dd0be0d877c55effa7e7e~H1RG0vEFg2069220692eucas1p24;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-80-5c7923b5fc31
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 16.23.04284.4B3297C5;
 Fri,  1
        Mar 2019 12:21:08 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:08 +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
Subject: [PATCH 07/23] drm/exynos/fimd: embed exynos_drm_crtc directly into
 context
Date: Fri, 01 Mar 2019 13:20:39 +0100
Message-id: <20190301122055.7135-8-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42LZduzned2typUxBntfcVjcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZTyae5et4JN1xZR5l5kbGM8YdjFyckgImEh8mTCJsYuRi0NIYAWjxL2Ve1kgnM+MEsdbLrHA
        VL05MJEJxBYSWMYosfKnA0TRf6COtv+sIAk2AU2Jv5tvsoHYIgLKEqv2tbODFDELXGKUeH2y
        mxEkISwQKvH2XjuYzSKgKtHXPR9sKq+AucTy/2uhtslLrN5wgBnE5hSwkDi4EmKQhMBXVokZ
        E45AFblIXPr6ggnClpHo7DgIZddLNM28wgzR0MEocWLxcjaIhLXE4eMXwU5lFuCTmLRtOlAR
        B1CcV6KjTQiixEPi7ryH7BCvdTNK7Hy7l2kCo8QCRoZVjOKppcW56anFxnmp5XrFibnFpXnp
        esn5uZsYgdF0+t/xrzsY9/1JOsQowMGoxMO743V5jBBrYllxZe4hRgkOZiURXj6Gyhgh3pTE
        yqrUovz4otKc1OJDjNIcLErivNUMD6KFBNITS1KzU1MLUotgskwcnFINjDzmrfGh665NcHte
        ZdT3b3ZSxIOFU4ujXC0Uvdv36Xi0P3xZblKtFX5MY4bamQeaW9lOJ0RtutP7mnXBb9ODLAHJ
        79wfbmNQKiv/ueQX2wp//W1fvqXcbYoXunO75th2KYW4bY8OHY7o33UnoOY4z4Ptvw/rttXs
        +tRywjzqr9vWabPET9aE/1BiKc5INNRiLipOBABUU5LmogIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7pblCtjDM4eULG4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yng09y5bwSfriinzLjM3MJ4x7GLk5JAQMJF4c2AiUxcjF4eQwBJGiYOzrrBAOI1MEremXGIF
        qWIT0JT4u/kmG4gtIqAssWpfOztIEbPAFUaJ9m9d7CAJYYFQibf32hlBbBYBVYm+7vlMIDav
        gLnE8v9rWSDWyUus3nCAGcTmFLCQOLgSZBAH0DZziU2noyYw8ixgZFjFKJJaWpybnltsqFec
        mFtcmpeul5yfu4kRGB7bjv3cvIPx0sbgQ4wCHIxKPLwJL8tjhFgTy4orcw8xSnAwK4nw8jFU
        xgjxpiRWVqUW5ccXleakFh9ilOZgURLnPW9QGSUkkJ5YkpqdmlqQWgSTZeLglGpgLOzf9SXk
        wMaId9cjuUpXneY6/7GFY4f36TO3M7ssv+oE2HWeXNdwZnJNo0V+ZGStxJd50UKHviSd+ntY
        PzT1QIvov6emqq7fZiu8Njy+7mqP600eges3KqSktySsXpqSEPjpp1jfk2t6y12PrNu5hm3f
        zfeTni7bzhpW2l79S4Lr690/53b17FdiKc5INNRiLipOBAANxwUwCwIAAA==
X-CMS-MailID: 20190301122108eucas1p25f8fcb147e5dd0be0d877c55effa7e7e
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122108eucas1p25f8fcb147e5dd0be0d877c55effa7e7e
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122108eucas1p25f8fcb147e5dd0be0d877c55effa7e7e@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_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 Fri Mar  1 12:20:40 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: 10835073
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 1129E922
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F03752097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:12 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id E4D882D964; Fri,  1 Mar 2019 12:21:12 +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 4DD7B2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:12 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388154AbfCAMVL (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:11 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36645 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388052AbfCAMVL (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:11 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122110euoutp01efe9764e6a595e35d687c5c84842b0c0~H1RII5sVM1400414004euoutp01z;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122110euoutp01efe9764e6a595e35d687c5c84842b0c0~H1RII5sVM1400414004euoutp01z
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442870;
        bh=bQCAlj48koAMC69VP17ExVvUrMe7ZRRaujUvGSzX0JI=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=NZvRaBXqG/T+yzRnntQIgPNf8VJMClfAmZ+oRxoXJOy8qlXrSw0yERG1TtEE1Szh8
         lAOBUobHV2Jwd9BbxYKwXbz1IO9Amn5d15naqXA2pVmy7O4CXobGgUVGCrTW8J5M1J
         Rsvv2oBBgPiDIpOcgubGrM5TOgQznlHaCKE5wsZ0=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122109eucas1p2dc21643434cb44e65a058a869db61c93~H1RHtNxzP2981629816eucas1p2d;
        Fri,  1 Mar 2019 12:21:09 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 92.5E.04441.5B3297C5;
 Fri,  1
        Mar 2019 12:21:09 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122108eucas1p2ef7114bd5e714ce38ff070e404fd51a2~H1RHICizq2981629816eucas1p2c;
        Fri,  1 Mar 2019 12:21:08 +0000 (GMT)
X-AuditID: cbfec7f2-5c9ff70000001159-59-5c7923b5c1ba
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id E5.6C.04128.4B3297C5;
 Fri,  1
        Mar 2019 12:21:08 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:08 +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
Subject: [PATCH 08/23] drm/exynos/mixer: embed exynos_drm_crtc directly into
 context
Date: Fri, 01 Mar 2019 13:20:40 +0100
Message-id: <20190301122055.7135-9-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42LZduznOd2typUxBqfni1vcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZWy+18ZY0Kxf0X34K1sD41T1LkZODgkBE4nl146xdzFycQgJrGCUWHn5LCuE85lR4vP/PWww
        Va1Nb9kgEssYJf6+ns0M4fxnlLjX9p8VpIpNQFPi7+abYB0iAsoSq/a1g81lFrjEKPH6ZDcj
        SEJYIEzi3av77CA2i4CqxOk9y4CaOTh4BcwlNh0Sg9gmL7F6wwFmEJtTwELi4EqIORICH1kl
        zjybwQhR5CLxddk0KFtG4vLkbhYIu16iaeYVZoiGDkaJE4uXQ/1gLXH4+EWwS5kF+CQmbZvO
        DLJYQoBXoqNNCKLEQ2LC6S9Q/3czSjTvvMY2gVFiASPDKkbx1NLi3PTUYsO81HK94sTc4tK8
        dL3k/NxNjMBoOv3v+KcdjF8vJR1iFOBgVOLhTXhZHiPEmlhWXJl7iFGCg1lJhJePoTJGiDcl
        sbIqtSg/vqg0J7X4EKM0B4uSOG81w4NoIYH0xJLU7NTUgtQimCwTB6dUA6N66vrp2YtMlj9Y
        k62+461b+t7S9fMYNHPDt845OiFvs1/84SmvAk+LLz2zbd+c43NPcqa0ivXb26xwKalfsK3L
        VlXXvnSf6bVLnUHhx/Z9YsmMb719qXjuTkZT3Sk/loZd1tdlrF89rYhPatPXE3dslp1PtZx5
        MHmqx/90k5CqZTErWUMuTuZRYinOSDTUYi4qTgQAuLawlaICAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7pblCtjDLZus7K4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yth8r42xoFm/ovvwV7YGxqnqXYycHBICJhKtTW/Zuhi5OIQEljBK/FqzjgXCaWSSuDXlEitI
        FZuApsTfzTfZQGwRAWWJVfva2UGKmAWuMEq0f+tiB0kIC4RJvHt1H8xmEVCVOL1nGVAzBwev
        gLnEpkNiENvkJVZvOMAMYnMKWEgcXAkyhwNoGVDJ6agJjDwLGBlWMYqklhbnpucWG+kVJ+YW
        l+al6yXn525iBAbHtmM/t+xg7HoXfIhRgINRiYc34WV5jBBrYllxZe4hRgkOZiURXj6Gyhgh
        3pTEyqrUovz4otKc1OJDjNIcLErivOcNKqOEBNITS1KzU1MLUotgskwcnFINjEWPQpdprP1W
        xLX6c/WuYJfHSVdXHVcoev5w6499NQH869lCdVf6ZsQKXtnw11fRLkhMzbj69tSDDRZbmWw4
        Z+4LnLfqxZ3ZMy6unzVH8fkapzin4vXTy3cnlk4QKzt49eTNSwfkCn4wxm1RncLFNGXFmT6z
        5M/n/5bHvAn/lLTln8ijiZICTbuVWIozEg21mIuKEwFdKOFxCgIAAA==
X-CMS-MailID: 20190301122108eucas1p2ef7114bd5e714ce38ff070e404fd51a2
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122108eucas1p2ef7114bd5e714ce38ff070e404fd51a2
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122108eucas1p2ef7114bd5e714ce38ff070e404fd51a2@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 Fri Mar  1 12:20:41 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: 10835111
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 662BE922
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:28 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5537B2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:28 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 48E8E2D931; Fri,  1 Mar 2019 12:21:28 +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 BBE8C2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388172AbfCAMVN (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:13 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36640 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2387704AbfCAMVN (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:13 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122110euoutp0125e14e27d4f79c6a4351cdcf37df1b59~H1RIw3TV81452714527euoutp01S;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122110euoutp0125e14e27d4f79c6a4351cdcf37df1b59~H1RIw3TV81452714527euoutp01S
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442870;
        bh=Zx2XHvFYWorS20Vhy6iLAPZJeMHhraLAeZL9/r6Pzvk=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=G/23kXcuJP8Wh6je5GZw/6XksnE4wDfp2RSv6jFDLZm8s1H0grBAmGCmjj1REdJ0h
         9aBDwEOlWzhGLsmsWcc3XDzvWYOoRCOajVDIKKOb0qwAq5z2UI2wPcwMxY+bCHy6kf
         vDiJj8f5qTic4cm2AAF7YQlnEBXxt/EZDEd6Knu8=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122110eucas1p2d07327b5d8c57b3dd401a3417bfbac60~H1RINGc5g1653516535eucas1p2Z;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id E1.5B.04806.5B3297C5;
 Fri,  1
        Mar 2019 12:21:09 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122109eucas1p22f304f014932064d4b02caa01b4583ac~H1RHgAEst1654016540eucas1p2S;
        Fri,  1 Mar 2019 12:21:09 +0000 (GMT)
X-AuditID: cbfec7f5-367ff700000012c6-84-5c7923b57398
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 56.6C.04128.5B3297C5;
 Fri,  1
        Mar 2019 12:21:09 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:09 +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
Subject: [PATCH 09/23] drm/exynos/vidi: embed exynos_drm_crtc directly into
 context
Date: Fri, 01 Mar 2019 13:20:41 +0100
Message-id: <20190301122055.7135-10-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42LZduzned2typUxBr0rzCxurTvHarFxxnpW
        iytf37NZTLo/gcVixvl9TBZrj9xld2DzuN99nMmjb8sqRo/Pm+QCmKO4bFJSczLLUov07RK4
        MhZffcZYME+uYt/cfUwNjH2SXYycHBICJhJ/D65i6mLk4hASWMEo8fFVBxuE85lR4u3Ft0ww
        Va/OnmEBsYUEljFKfDiiDVH0n1Fiz8ZdYEVsApoSfzffZAOxRQSUJVbta2cHKWIWuMQo8fpk
        NyNIQlggVOLvy4dgRSwCqhId7YfZQWxeAQuJjv+tUNvkJVZvOMAMYnMCxQ+uhBgkIfCWVeLf
        rMNsEEUuEp/ufYJqkJG4PLmbBcKul2iaeYUZoqGDUeLE4uVQDdYSh49fZAWxmQX4JCZtmw5U
        xAEU55XoaBOCKPGQeHtsMivEa92MEktf7mGZwCixgJFhFaN4amlxbnpqsXFearlecWJucWle
        ul5yfu4mRmA0nf53/OsOxn1/kg4xCnAwKvHw7nhdHiPEmlhWXJl7iFGCg1lJhJePoTJGiDcl
        sbIqtSg/vqg0J7X4EKM0B4uSOG81w4NoIYH0xJLU7NTUgtQimCwTB6dUA+NVkdmmWe7HxBPk
        rdgu7zAV+Mh5eSvv7wN/K39cfvM5vp0rx+NeUrfjh9/XBA48uOiRXM6WGGAyI3/3xlqWSUmd
        3PzFe6xvcunKlL46FuwYLv8iTujoqaa3v9SZHtr5tWXnzUt8sKzM3HKx5klJJsc4zgnhyu/+
        2IZcvN1/XmSHl4ntgV1ib5RYijMSDbWYi4oTAYmutVSiAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7pblStjDBb/E7a4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ylh89RljwTy5in1z9zE1MPZJdjFyckgImEi8OnuGpYuRi0NIYAmjxJe7W5kgnEYmiSlLVjKB
        VLEJaEr83XyTDcQWEVCWWLWvnR2kiFngCqNE+7cudpCEsECoxN+XD8GKWARUJTraD4PFeQUs
        JDr+tzJBrJOXWL3hADOIzQkUP7gSZBAH0DZziU2noyYw8ixgZFjFKJJaWpybnltspFecmFtc
        mpeul5yfu4kRGB7bjv3csoOx613wIUYBDkYlHt6El+UxQqyJZcWVuYcYJTiYlUR4+RgqY4R4
        UxIrq1KL8uOLSnNSiw8xSnOwKInznjeojBISSE8sSc1OTS1ILYLJMnFwSjUw7gg7vPLxIe6s
        5ZNPOBz03/Xknt+bDxv1Dc1DzRojS+JEao/bFd/275pc/vW0dsSatCdH2MxSu/wUXx4qOamZ
        HKP++3JV/P2cHqZ3nAXB9aLbI8z+nvy4+rCXa9VcPsF+BjW2Wvaijys4T0kwzNlr+2a+V4J0
        q8gxyxtmV7jMfgh6asam9ucrsRRnJBpqMRcVJwIAcqiQxQsCAAA=
X-CMS-MailID: 20190301122109eucas1p22f304f014932064d4b02caa01b4583ac
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122109eucas1p22f304f014932064d4b02caa01b4583ac
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122109eucas1p22f304f014932064d4b02caa01b4583ac@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 Fri Mar  1 12:20:42 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: 10835079
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 E317517E9
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2F4A2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id C73202D964; Fri,  1 Mar 2019 12:21:13 +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 5FEF82097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388163AbfCAMVN (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:13 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36654 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727782AbfCAMVM (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:12 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122110euoutp019e2488bdb4ed778ee5dc554aea211ea2~H1RI3Ldvz1400414004euoutp010;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122110euoutp019e2488bdb4ed778ee5dc554aea211ea2~H1RI3Ldvz1400414004euoutp010
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442870;
        bh=9zdtxfQqxoDOd9wB0DSn3fjTzZ7lLYD5+W5lsoJ63Kg=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=K1MlYw5DJs/pb/M8PsTqEq3QoTDVrNp9MkNJ5sr3rxc4hjH0s/agpt2VcDaWc+ybt
         eBkkaC/K2oWCAQoQ8G1iP05VEvPyYwE64vrme1AOqWhYXDUZc5svmKIy3E31cokW4g
         EFEGOMCWm3dOJrmXqpBPqxHqy4LegZstv3tABW98=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122110eucas1p1243d41e686a131c680bb778f4c978292~H1RIggXd23187231872eucas1p1c;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 73.5E.04441.6B3297C5;
 Fri,  1
        Mar 2019 12:21:10 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122109eucas1p28ae2e947e12d640d1932895fc4d3c14a~H1RH2SYwi2871928719eucas1p2Z;
        Fri,  1 Mar 2019 12:21:09 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-5f-5c7923b66083
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 17.23.04284.5B3297C5;
 Fri,  1
        Mar 2019 12:21:09 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:09 +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
Subject: [PATCH 10/23] drm/exynos: remove standalone exynos_drm_crtc
 leftovers
Date: Fri, 01 Mar 2019 13:20:42 +0100
Message-id: <20190301122055.7135-11-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWy7djP87rblCtjDFY0clvcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZWzbNI+t4IFkxaz+pWwNjFdFuxg5OSQETCTmbzzB2sXIxSEksIJR4tLz40wQzmdGiZ37/jPC
        VF2d/RgqsYxR4verh8wQzn9GiT0bdzGBVLEJaEr83XyTDcQWEVCWWLWvnR2kiFngEqPE65Pd
        YKOEBQIkvj05xA5iswioSmzddZUZxOYVsJDYuvgkG8Q6eYnVGw6AxTmB4gdXQgySEPjIKnHk
        6Q0miCIXiUtPVrJC2DISnR0HoeL1Ek0zrzBDNHQwSpxYvBxqqrXE4eMXwRqYBfgkJm2bDlTE
        ARTnlehoE4Io8ZCY+2AFI8Rr3YwS05a/YJvAKLGAkWEVo3hqaXFuemqxYV5quV5xYm5xaV66
        XnJ+7iZGYDyd/nf80w7Gr5eSDjEKcDAq8fAmvCyPEWJNLCuuzD3EKMHBrCTCy8dQGSPEm5JY
        WZValB9fVJqTWnyIUZqDRUmct5rhQbSQQHpiSWp2ampBahFMlomDU6qBkW136aoP69zCj/+a
        eUbsvOHZE4X6VoJvM/ZJXEiVcrm7KfK24I4Xi2Zwz3cvj/4scrz52Cf3AyJtX4riE6oXzIkT
        Tp12YK28xrNe86vbLT1PfFsQc+yqprLv4n1mMxREVWPNDwde/Gy7vXSe/vRo3+uFu5a12JV5
        ezybn/E7Z++Fqh0bC/Yr1iixFGckGmoxFxUnAgA66JouowIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7pblStjDE790rS4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yti2aR5bwQPJiln9S9kaGK+KdjFyckgImEhcnf2YqYuRi0NIYAmjxJRXp9ggnEYmiSlLVjKB
        VLEJaEr83XyTDcQWEVCWWLWvnR2kiFngCqNE+7cudpCEsICfxNbnW1lBbBYBVYmtu64yg9i8
        AhYSWxefZINYJy+xesMBsDgnUPzgSpBBHEDbzCU2nY6awMizgJFhFaNIamlxbnpusaFecWJu
        cWleul5yfu4mRmB4bDv2c/MOxksbgw8xCnAwKvHwJrwsjxFiTSwrrsw9xCjBwawkwsvHUBkj
        xJuSWFmVWpQfX1Sak1p8iFGag0VJnPe8QWWUkEB6YklqdmpqQWoRTJaJg1OqgXFhtryjSMuh
        6Nxn5r9jZS6bT/2+mDv+n2WlRdHm515+Uy8Hx6u0x2hfFDNVKNXy/KB6yXGa3iS+FcdEfX9w
        3Hq2Mi9EOsdVe5elz/kpa8LY2eVM1u4wkPu0f8afnNtbC+/c1Z7KFvRU9dqMn8fe6/CUNx78
        O8c0zr1Yrurvc2PpAvvLB57PuqXEUpyRaKjFXFScCADJC9lgCwIAAA==
X-CMS-MailID: 20190301122109eucas1p28ae2e947e12d640d1932895fc4d3c14a
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122109eucas1p28ae2e947e12d640d1932895fc4d3c14a
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122109eucas1p28ae2e947e12d640d1932895fc4d3c14a@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 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 Fri Mar  1 12:20:43 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: 10835077
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 95C011515
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85C982D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 7A0C32D931; Fri,  1 Mar 2019 12:21:13 +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 292FE2D964
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388161AbfCAMVM (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:12 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39167 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388156AbfCAMVM (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:12 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122111euoutp0200ac5bf5e9e172d6fd66e599bbd3e08f~H1RJSJLGo2151021510euoutp026;
        Fri,  1 Mar 2019 12:21:11 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122111euoutp0200ac5bf5e9e172d6fd66e599bbd3e08f~H1RJSJLGo2151021510euoutp026
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442871;
        bh=qmmEzu6FVJs+Gsjerof7TDemZM9DzvAQr1WXPMY40Ec=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=UEYe+tIfNHkBg6dxymyserfX2T7HQPlOBqV7LofhU7BY/eYHPCWDsdxJnQ8xWQJUj
         dZhH5c8C2SxeyTc8RXj8gA/A+34stH+jYjKyyz/93FQ6Yf+0irkrAf9zIOt1b//Ag9
         gCXYSqvVkxRlhdkL1mqMMF2RQHgpg3Bcv9T48QV8=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122110eucas1p211da63d4eddbd3eb93c87f0390ae5dd9~H1RIwzgym1653116531eucas1p2m;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 52.5B.04806.6B3297C5;
 Fri,  1
        Mar 2019 12:21:10 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122110eucas1p2506e2cc528823cb2276d757ad49cc396~H1RIJx8C22978329783eucas1p2p;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
X-AuditID: cbfec7f5-367ff700000012c6-86-5c7923b6d30f
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id C6.6C.04128.6B3297C5;
 Fri,  1
        Mar 2019 12:21:10 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:10 +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
Subject: [PATCH 11/23] drm/exynos/vidi: remove encoder_to_vidi helper
Date: Fri, 01 Mar 2019 13:20:43 +0100
Message-id: <20190301122055.7135-12-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42LZduznOd1typUxBr8XyVvcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        Zfx9GFXwm6Ni3oQrrA2MZ9i7GDk5JARMJOb+/8gEYgsJrGCUOPqSuYuRC8j+zCgx+dx0Jpii
        vcv/skAkljFK3GiawQjR8Z9R4vs+exCbTUBT4u/mm2wgtoiAssSqfe3sIA3MApcYJV6f7AZr
        EBZwlVhwcDULiM0ioCrxccN2sAZeAQuJJ9vfQZ0kL7F6wwFmEJsTKH5wJcQgCYGXrBJdG1tY
        IYpcJBYe6II6T0bi8uRuFgi7XqJp5hVmiIYORokTi5ezQSSsJQ4fvwjWzCzAJzFp23SgIg6g
        OK9ER5sQRImHxPvrk9kh3uxmlJi1aR7zBEaJBYwMqxjFU0uLc9NTi43zUsv1ihNzi0vz0vWS
        83M3MQIj6fS/4193MO77k3SIUYCDUYmHd8fr8hgh1sSy4srcQ4wSHMxKIrx8DJUxQrwpiZVV
        qUX58UWlOanFhxilOViUxHmrGR5ECwmkJ5akZqemFqQWwWSZODilGhjVn+xN5blm+l7snWlH
        utnx5/M/GJl41f/3e8BfWnx5waMNDPlSKmG+057nPdtwcdn7LfJae5R5vFku3ag61857Nzng
        5oYr0c3eLKkZPuYLT4n+ehc171FgtDhPwQuD1btumT37XmC/QmHd6c3h2tutl9e4ml+qje9d
        1z3L7oG6WiDv5+PPtlYqsRRnJBpqMRcVJwIAuTgzKqACAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7rblCtjDH7eYrG4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yvj7MKrgN0fFvAlXWBsYz7B3MXJySAiYSOxd/peli5GLQ0hgCaPEhH9NbBBOI5PEu/cvWECq
        2AQ0Jf5uvskGYosIKEus2tfODlLELHCFUaL9WxfYKGEBV4kFB1eDNbAIqEp83LAdrIFXwELi
        yfZ3UOvkJVZvOMAMYnMCxQ+uBBnEAbTNXGLT6agJjDwLGBlWMYqklhbnpucWG+kVJ+YWl+al
        6yXn525iBAbHtmM/t+xg7HoXfIhRgINRiYc34WV5jBBrYllxZe4hRgkOZiURXj6Gyhgh3pTE
        yqrUovz4otKc1OJDjNIcLErivOcNKqOEBNITS1KzU1MLUotgskwcnFINjCLx155kcz2O3vtA
        oOPn77ik7nnvsiKD31eonljZskt1oaGbq3LkvektzdeO6k11PXpTwf3Eccueysjbx7qOpGRf
        vXoi7rmv0VYbp2nrHQsE1kkwBu9f5Jr6gWV28hNZX/44YQ/JL6VlQhIdojMf2pf8mrxqafes
        WyUzm7qfzIn8lM/Fz6rYocRSnJFoqMVcVJwIAK911QcKAgAA
X-CMS-MailID: 20190301122110eucas1p2506e2cc528823cb2276d757ad49cc396
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122110eucas1p2506e2cc528823cb2276d757ad49cc396
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122110eucas1p2506e2cc528823cb2276d757ad49cc396@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 Fri Mar  1 12:20: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: 10835115
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 475B0922
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:29 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 347F02097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:29 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 285B92D900; Fri,  1 Mar 2019 12:21:29 +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 6DB202097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:28 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2387683AbfCAMV1 (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:27 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39170 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2387692AbfCAMVN (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:13 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122111euoutp02416bbacc32b56cf2c50fcd0b0b76b8bc~H1RJtra7K2132421324euoutp02U;
        Fri,  1 Mar 2019 12:21:11 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122111euoutp02416bbacc32b56cf2c50fcd0b0b76b8bc~H1RJtra7K2132421324euoutp02U
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442871;
        bh=PgbKR/w9TRKewd4GHl+53PaABxvCvoMv24+YVVR5Zf8=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=XjJoaDLDaQK4hMwchnPaXNx8GdwjSSlUxbgLJ74g6Q2ICF2n0awZVJwjzsms7O70n
         SaMIq0iE9apCanLKdxf9wR3UmMX9WmGpAMpffZ81lei3q1HL5bsVZOiAMvlgvgjMA1
         2mRW8YtsIqmUPM8itqkwzTpa+o2uLWEaXj0TXxkM=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122111eucas1p124853b526f76c2f0b904756721fd16b4~H1RJTJUfu2243022430eucas1p1L;
        Fri,  1 Mar 2019 12:21:11 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id E3.5E.04441.7B3297C5;
 Fri,  1
        Mar 2019 12:21:11 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122110eucas1p2e11aa4aac815820d1bcfc5dae485f060~H1RIgDFnM1653016530eucas1p2r;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
X-AuditID: cbfec7f2-5c9ff70000001159-60-5c7923b7ace9
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id A7.23.04284.6B3297C5;
 Fri,  1
        Mar 2019 12:21:10 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:10 +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
Subject: [PATCH 12/23] drm/exynos: unify plane type assignment
Date: Fri, 01 Mar 2019 13:20:44 +0100
Message-id: <20190301122055.7135-13-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupjkeLIzCtJLcpLzFFi42LZduzned3typUxBn/WsFjcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZbzYnlyww67i/6wDLA2Md427GDk5JARMJFZfPcDUxcjFISSwglHi65ITLBDOZ0aJ6Wt6WGGq
        dn+ayQyRWMYo8fDVaWaQhJDAf0aJ7/vsQWw2AU2Jv5tvsoHYIgLKEqv2tbODNDALXGKUeH2y
        mxEkISxgJ9F+ay8TiM0ioCpx/9laMJtXwEJi3cLDbBDb5CVWbzgAtoATKH5wJcQgCYG3rBIr
        3sxkhyhykfi35BrUeTISnR0HmSDseommmVeYIRo6GCVOLF4ONdVa4vDxi2ANzAJ8EpO2TQcq
        4gCK80p0tAlBlHhIXLrzlhXizW5GiT+bX7JPYJRYwMiwilE8tbQ4Nz212DAvtVyvODG3uDQv
        XS85P3cTIzCWTv87/mkH49dLSYcYBTgYlXh4E16WxwixJpYVV+YeYpTgYFYS4eVjqIwR4k1J
        rKxKLcqPLyrNSS0+xCjNwaIkzlvN8CBaSCA9sSQ1OzW1ILUIJsvEwSnVwLhDaKfZrTYJpq6L
        L1ZuqdBTXMv/5vwX8Y3fA36V1rOdSbzvpNHUO0fi3uc5R16fXxH9TOn55GMzD7z671ScHX/X
        5Zy5Vv6r7ZnFtzZLHj/B7PUzTbpii4vm9ZeWLUu8fG5aG02ZFPe+OUP/oKvhmspHM7iTLcw2
        9jMbT7W4F7DEeU185gy9nVxKLMUZiYZazEXFiQAgDMyvoQIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7rblCtjDBZflbK4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ynixPblgh13F/1kHWBoY7xp3MXJySAiYSOz+NJO5i5GLQ0hgCaNE5+ZD7BBOI5PEu/cvWECq
        2AQ0Jf5uvskGYosIKEus2tcOVsQscIVRov1bFztIQljATqL91l4mEJtFQFXi/rO1YDavgIXE
        uoWH2SDWyUus3nCAGcTmBIofXAkyiANom7nEptNRExh5FjAyrGIUSS0tzk3PLTbUK07MLS7N
        S9dLzs/dxAgMjm3Hfm7ewXhpY/AhRgEORiUe3oSX5TFCrIllxZW5hxglOJiVRHj5GCpjhHhT
        EiurUovy44tKc1KLDzFKc7AoifOeN6iMEhJITyxJzU5NLUgtgskycXBKNTBaRJvGN339dLr0
        nelMmW1J556o655/toGzrp3f5yuz5RLN2cdLUxeU6IiWPLu+l3vhvENMr9MmZ04v2XDhG0eR
        pf319j//OHNk/J9qv1afJSdV1imp+JUrZkrrRjuFsqRzYaaXtU4ZPH7p9O++13Yzoe057hGP
        C+dJyAWf7f/aX7/ixuvgN55KLMUZiYZazEXFiQD/vJt/CgIAAA==
X-CMS-MailID: 20190301122110eucas1p2e11aa4aac815820d1bcfc5dae485f060
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122110eucas1p2e11aa4aac815820d1bcfc5dae485f060
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122110eucas1p2e11aa4aac815820d1bcfc5dae485f060@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 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 Fri Mar  1 12:20: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: 10835081
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 3B9C9188E
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:14 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2ABDD2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:14 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 1EE0A2D900; Fri,  1 Mar 2019 12:21:14 +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 984702D931
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:13 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388167AbfCAMVN (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:13 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36645 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388078AbfCAMVN (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:13 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122112euoutp01bb6ca85e3da85967f304fe56889eefa2~H1RJ-ZQzC1404314043euoutp01v;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122112euoutp01bb6ca85e3da85967f304fe56889eefa2~H1RJ-ZQzC1404314043euoutp01v
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442872;
        bh=v3Dt4P/ltsXHgTk3ddeo1P3t7xX9Iv9sVLNqyQ2/XNs=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=aTO1WU1TThKKGw0xoAbfIZSLNt7GaHbrGNOLNmC43BVtRC+hZpsu2oP/XY0cKoliH
         j2AM/ZLMxHLYYSKeDMWYMQe17mi0n/8dk6GImreN1M7+dHCmfkS90wp2aR3oKxPAw7
         ChT9sK8w89LOqhi0+gFf2o4LscK0TkXQ5hEzRTzA=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122111eucas1p1f7ba10f6e905bf3512e37e44b438f96f~H1RJn9GBE2243022430eucas1p1N;
        Fri,  1 Mar 2019 12:21:11 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id 54.5E.04441.7B3297C5;
 Fri,  1
        Mar 2019 12:21:11 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122110eucas1p2107b2c2837e9bad58bf21b7869b7e0eb~H1RI39dn22871928719eucas1p2a;
        Fri,  1 Mar 2019 12:21:10 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-61-5c7923b72db1
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 18.23.04284.6B3297C5;
 Fri,  1
        Mar 2019 12:21:10 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:10 +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
Subject: [PATCH 13/23] drm/exynos: set primary and cursor planes in
 exynos_drm_crtc_init
Date: Fri, 01 Mar 2019 13:20:45 +0100
Message-id: <20190301122055.7135-14-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42LZduznOd3typUxBhPfiVrcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZXw7t4u54K1axd/vh9gbGDcqdjFyckgImEhMmbqaCcQWEljBKHFxilIXIxeQ/ZlR4kLXB2aY
        ounbj7BCFC1jlJhxKBfC/s8o8X2fPYjNJqAp8XfzTTYQW0RAWWLVvnZ2kEHMApcYJV6f7GYE
        SQgLRElcWN8HVsQioCpx4EM3mM0rYCGxrG0aK8QyeYnVGw6ALeYEih9cCTFIQuAtq8SaBWeZ
        IIpcJFr+zmOBsGUkOjsOQsXrJZpmXmGGaOhglDixeDkbRMJa4vDxi2AbmAX4JCZtmw5UxAEU
        55XoaBOCKPGQONL/jBni/W6gq5d2sU5glFjAyLCKUTy1tDg3PbXYMC+1XK84Mbe4NC9dLzk/
        dxMjMJJO/zv+aQfj10tJhxgFOBiVeHgTXpbHCLEmlhVX5h5ilOBgVhLh5WOojBHiTUmsrEot
        yo8vKs1JLT7EKM3BoiTOW83wIFpIID2xJDU7NbUgtQgmy8TBKdXAWHKt+AcfX+SrRRV5N3/W
        WkhrC4Xah8fp5vXFWYW0bXl0bf9dvpn/u7bUvDD9rP9XIP/V/vPr13eF9hZ/2HDpxpUvIhsC
        hRlU7N5t6XC6Y+Pn57ap/1zVE4ugP3rPYzx0LwafNdlx0ZCFY5Ld2S2+lz8ERy5wm6r2rOGE
        8jGrAEFFe5XX5xMvK7EUZyQaajEXFScCAP9sPj2gAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7rblCtjDPadNbC4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yvh2bhdzwVu1ir/fD7E3MG5U7GLk5JAQMJGYvv0IaxcjF4eQwBJGiRldp6CcRiaJd+9fsIBU
        sQloSvzdfJMNxBYRUJZYta+dHaSIWeAKo0T7ty52kISwQJTEhfV9YEUsAqoSBz50g9m8AhYS
        y9qmsUKsk5dYveEAM4jNCRQ/uBJkEAfQNnOJTaejJjDyLGBkWMUoklpanJueW2yoV5yYW1ya
        l66XnJ+7iREYHtuO/dy8g/HSxuBDjAIcjEo8vAkvy2OEWBPLiitzDzFKcDArifDyMVTGCPGm
        JFZWpRblxxeV5qQWH2KU5mBREuc9b1AZJSSQnliSmp2aWpBaBJNl4uCUamCcs/DT0/UKiud1
        /nxO2SS18jrfpx4+579x0YWd/6RbS/7qL2FaP798tnEkk8wdtY9yCyJOqaW26hZOuaZX9m+j
        But17elHPO0zTTlPGnya80x3kiBDyPc1r4qk5+Zlm11m9PTpTzx045aoaGnicfZVsozLnp/t
        4Fq9bava/c/BN1bXLLuwfmG3EktxRqKhFnNRcSIAjQtSOAsCAAA=
X-CMS-MailID: 20190301122110eucas1p2107b2c2837e9bad58bf21b7869b7e0eb
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122110eucas1p2107b2c2837e9bad58bf21b7869b7e0eb
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122110eucas1p2107b2c2837e9bad58bf21b7869b7e0eb@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
and cursor planes. Let's move logic for setting these planes 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      | 12 +++++++++++-
 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, 11 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..303df018f0a1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -176,9 +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, *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, NULL, 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_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 Fri Mar  1 12:20: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: 10835119
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 1DD771515
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:30 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CB1A2D8F5
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:30 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 00C962DA38; Fri,  1 Mar 2019 12:21:29 +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 7804C2D8F5
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:29 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2387692AbfCAMV2 (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:28 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39153 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388159AbfCAMVN (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:13 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122112euoutp0244f0fbd4b01f5de46cefe89d5b876a8e~H1RKNDUrY2156521565euoutp02v;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122112euoutp0244f0fbd4b01f5de46cefe89d5b876a8e~H1RKNDUrY2156521565euoutp02v
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442872;
        bh=ga2SLg3yv9wsqZ8MVIaXNymZsZ9/UV+lZIuI9VL5Rsg=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=Uo9kq2oAc5h6rzkaOgncTGCCVth4Xz5j52ElzTA3x08iGALChFamqfMl9L3JdNiIB
         7yZsqIFzjbyj4uiy0cKVAR85HuoOH4vOIxw6KTu6gkxYJUdWBqQ/EZlXWkf/e+s4ID
         ne8nibQLx8hi5X6aiEXE8FHR8FRcxmgJL6iT2QaE=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122111eucas1p20b488adfb4c887705fcd5074308d1b1a~H1RJ1jPLe1653116531eucas1p2o;
        Fri,  1 Mar 2019 12:21:11 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id C4.5E.04441.7B3297C5;
 Fri,  1
        Mar 2019 12:21:11 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122111eucas1p2cb70cdfa7e8c1ad6e32af695a2f88b10~H1RJLVCnt2981229812eucas1p2Z;
        Fri,  1 Mar 2019 12:21:11 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-63-5c7923b761a2
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 97.6C.04128.7B3297C5;
 Fri,  1
        Mar 2019 12:21:11 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:11 +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
Subject: [PATCH 14/23] drm/exynos: add plane update/disable callbacks for
 planes
Date: Fri, 01 Mar 2019 13:20:46 +0100
Message-id: <20190301122055.7135-15-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42LZduzned3typUxBt3PlS1urTvHarFxxnpW
        iytf37NZTLo/gcVixvl9TBZrj9xld2DzuN99nMmjb8sqRo/Pm+QCmKO4bFJSczLLUov07RK4
        Mja/fshScJqz4mT7D9YGxokcXYwcHBICJhIf99t2MXJyCAmsYJRoOCjexcgFZH9mlDi3ewoT
        SAKk5kPjd3aIxDJGidb5Z9ggnP+MEn82/2MBqWIT0JT4u/kmG4gtIqAssWpfO1gHs8AlRonX
        J7sZQRLCAkESX7d3sYCsZhFQlWjdUgwS5hWwkJj3qZMNYpu8xOoNB5hBbE6g+MGVEHMkBN6y
        Slz+0wFV5CLx//t+RghbRuLy5G4WCLteomnmFWaIhg5GiROLl0M1WEscPn6RFcRmFuCTmLRt
        OjPE/7wSHW1CECUeEifvvmCF+KybUWJ7yyfGCYwSCxgZVjGKp5YW56anFhvmpZbrFSfmFpfm
        pesl5+duYgRG0ul/xz/tYPx6KekQowAHoxIPb8LL8hgh1sSy4srcQ4wSHMxKIrx8DJUxQrwp
        iZVVqUX58UWlOanFhxilOViUxHmrGR5ECwmkJ5akZqemFqQWwWSZODilGhjdOK1snG74mViu
        e7b0hPxhwVKxZwxyqrb7N4Y+sk0vCzB/eK/Yu00yo7xryklf340dVmtCv0/fGLU6zinRYaVb
        UEVV2BIBTcM3HC/3FM/mm19t019oZbH7WMG+dY1+qjOLA78JT5ZS/NZ2/FQRVxCby8Wpgvnf
        jW7b/V19SEPglqvWhKU+s5VYijMSDbWYi4oTAWTEEa2gAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrGJMWRmVeSWpSXmKPExsVy+t/xq7rblStjDJYc5bS4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ytj8+iFLwWnOipPtP1gbGCdydDFyckgImEh8aPzO3sXIxSEksIRR4sTKhUwQTiOTxPXju9hB
        qtgENCX+br7JBmKLCChLrNrXDtbBLHCFUaL9WxeQw8EhLBAgMeW5P4jJIqAq0bqlGKScV8BC
        Yt6nTjaIZfISqzccYAaxOYHiB1e2g3UKCZhLbDodNYGRZwEjwypGkdTS4tz03GIjveLE3OLS
        vHS95PzcTYzA0Nh27OeWHYxd74IPMQpwMCrx8Ca8LI8RYk0sK67MPcQowcGsJMLLx1AZI8Sb
        klhZlVqUH19UmpNafIhRmoNFSZz3vEFllJBAemJJanZqakFqEUyWiYNTqoFRRlw99fyfC4pr
        PZW5uxPLedfO2xX7QfDQPeZFa8t8nD71B93aFt0z98WvR8ej7tb//Ho97yVnTKj3wknXWF5u
        l2GsrFg5udxukUH5TMEDBwTeZHzVWL4/Y7ET7xUOmVtXMzLb1xXsN1t/1qG7JzG1SfHchJg5
        epkLa2PFj+7K6T+/POrb3M28SizFGYmGWsxFxYkAb4q0SgkCAAA=
X-CMS-MailID: 20190301122111eucas1p2cb70cdfa7e8c1ad6e32af695a2f88b10
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122111eucas1p2cb70cdfa7e8c1ad6e32af695a2f88b10
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122111eucas1p2cb70cdfa7e8c1ad6e32af695a2f88b10@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

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 Fri Mar  1 12:20: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: 10835085
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 63866922
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:15 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52CEC2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:15 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 472C72D900; Fri,  1 Mar 2019 12:21:15 +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 E17A22097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:14 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388199AbfCAMVO (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:14 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36654 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388156AbfCAMVN (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:13 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122112euoutp011165b09b2ec28e125c20dd65f248bf4b~H1RKkSW7l1400414004euoutp011;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122112euoutp011165b09b2ec28e125c20dd65f248bf4b~H1RKkSW7l1400414004euoutp011
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442872;
        bh=etuAz+B4tjFxongWFMq4xgwecflkYEh95FK1Mb0jXrY=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=XUeZBVlDW913yH9r+J/dSfTVJ6IULt3tMs99KH3TwZc/SjMvZX8KIOqv6fNou7npy
         ZTk5iBuOqgaoG3GWf3xO3tfoArWW8WKn02EVAcUTJJRSQ1rRvwjU2n/E1zzNEFGM/4
         IpTnDVZATjwi00yomiVUU3+BXo94dPwjrDR/ciWQ=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122112eucas1p1eadf6e5fd3218ffb311925edf5d9de9e~H1RKMN3Za2241422414eucas1p1l;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id 4D.CC.04294.7B3297C5;
 Fri,  1
        Mar 2019 12:21:11 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122111eucas1p2c0184ad8117054056ac10e6afd949a9f~H1RJfYabb1879518795eucas1p2O;
        Fri,  1 Mar 2019 12:21:11 +0000 (GMT)
X-AuditID: cbfec7f4-84fff700000010c6-0e-5c7923b76716
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id B8.23.04284.7B3297C5;
 Fri,  1
        Mar 2019 12:21:11 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:11 +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
Subject: [PATCH 15/23] drm/exynos: add GSCALER plane capability
Date: Fri, 01 Mar 2019 13:20:47 +0100
Message-id: <20190301122055.7135-16-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42LZduznOd3typUxBlc32FjcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        Zcy/fJGpYJVQRVf3Y+YGxq38XYycHBICJhK/Dhxn7GLk4hASWMEocXTKMjYI5zOjxMdNLUxd
        jBxgVWc3eEHElzFKdN5ewAzh/GeU+LP5HwvIKDYBTYm/m2+ygdgiAsoSq/a1s4MUMQtcYpR4
        fbKbESQhLGAv0dQ7lRlkKouAqsSuXR4gYV4BC4kf3d9YIE6Sl1i94QAziM0JFD+4EmKOhMBH
        VomPe24wQhS5SLQeboSyZSQ6Ow4yQdj1Ek0zrzBDNHQwSpxYvJwNImEtcfj4RVYQm1mAT2LS
        tunMEK/xSnS0CUGYHhIv//OBVAgJdAM9diF5AqPEAkaGVYziqaXFuempxUZ5qeV6xYm5xaV5
        6XrJ+bmbGIFxdPrf8S87GHf9STrEKMDBqMTDm/CyPEaINbGsuDL3EKMEB7OSCC8fQ2WMEG9K
        YmVValF+fFFpTmrxIUZpDhYlcd5qhgfRQgLpiSWp2ampBalFMFkmDk6pBsYs+c1H2j51Ntzj
        u3KWSVzUXv8r83+dnW3uS9v3q3A/CE5QeB8+w2TTqjXbvsqcEmTcxaPDJfXIS+X3bZtLX3+e
        38s846qvzsHVZVcX3chZ/XjrwnqrkJYlz+RWZTCfT3w0M4z/mcIZtqx3gifsxaMN8p8v+3jQ
        Sdj64xFLt1nvYzxCZgj/N29WYinOSDTUYi4qTgQA1CuukJ8CAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrGJMWRmVeSWpSXmKPExsVy+t/xq7rblStjDE72K1jcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        Zcy/fJGpYJVQRVf3Y+YGxq38XYwcHBICJhJnN3h1MXJxCAksYZTY+2QzM4TTyCRx/fgu9i5G
        Tg42AU2Jv5tvsoHYIgLKEqv2tbODFDELXGGUaP/WBVYkLGAv0dQ7lRlkKouAqsSuXR4gYV4B
        C4kf3d9YQGwJAXmJ1RsOMIPYnEDxgytB5nAALTOX2HQ6agIjzwJGhlWMIqmlxbnpucWGesWJ
        ucWleel6yfm5mxiBobHt2M/NOxgvbQw+xCjAwajEw5vwsjxGiDWxrLgy9xCjBAezkggvH0Nl
        jBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHe8waVUUIC6YklqdmpqQWpRTBZJg5OqQbGmUxvSi3m
        7xM6nlAhlhvyMLjrKffeo1fVWSanHPzIvWm31mdLhyPcLD82vFvhZ7es9NqHRb114SdYtqp1
        HeHYm/fO1shl/1FFs2Wy1wNf8u38wbRnwcXe3OQTZlvFjoflZz45IfVmocWvTVrruQzrVV+7
        1b0qtntTuD0v5pgkc/lZmbu3gsOeKrEUZyQaajEXFScCACkkPRkJAgAA
X-CMS-MailID: 20190301122111eucas1p2c0184ad8117054056ac10e6afd949a9f
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122111eucas1p2c0184ad8117054056ac10e6afd949a9f
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122111eucas1p2c0184ad8117054056ac10e6afd949a9f@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

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 Fri Mar  1 12:20: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: 10835087
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 073851515
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:18 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB9912097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:17 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id DFFDE2D964; Fri,  1 Mar 2019 12:21: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 8C8AF2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388216AbfCAMVQ (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:16 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36645 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388177AbfCAMVO (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:14 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122113euoutp01dd2c0743ff0bb41bc216f7fde607e4a9~H1RLCVqPN1452714527euoutp01T;
        Fri,  1 Mar 2019 12:21:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122113euoutp01dd2c0743ff0bb41bc216f7fde607e4a9~H1RLCVqPN1452714527euoutp01T
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442873;
        bh=EDMDwUaiU6twXfERSDZPZXY/mOmWI2xG0PbTbogkuUA=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=gSGOiO+DlOmA/hyHJn9jNdto4sDckKZc2/bFShTAZX8g+nIiVXnQYk3DyL0QvRgq2
         c97KyrDbP/Gj99uPcNzk6CCFBO1COFMIF6k8q8/nI8ltXCS2jDHlEwXzwTihbBsVsE
         oBsN7QGeuPVCjjhZjKQkgea/NI2XmVhGhC6NtOjI=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122112eucas1p285f16123d0c5624d7c539fdd83cdd0e3~H1RKnx80U2871928719eucas1p2d;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 33.5B.04806.8B3297C5;
 Fri,  1
        Mar 2019 12:21:12 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122112eucas1p2c0099b31af68e2c72c07640ab994123a~H1RJ7Aqg02069220692eucas1p27;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-8d-5c7923b88750
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 38.6C.04128.7B3297C5;
 Fri,  1
        Mar 2019 12:21:11 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21:11 +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
Subject: [PATCH 16/23] drm/exynos/gscaler: fix id assignement
Date: Fri, 01 Mar 2019 13:20:48 +0100
Message-id: <20190301122055.7135-17-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42LZduznOd0dypUxBs8fy1rcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        Zex8cpq5YAlrxd4pL9kaGPeydDFyckgImEj0zmxn7mLk4hASWMEoseRYOwuE85lR4uzH2QhV
        PW/ZIBLLGCUeXtnJBOH8Z5T4s/kfWBWbgKbE38032UBsEQFliVX72tlBipgFLjFKvD7ZzQiS
        EBawlZi84A4riM0ioCqx6OJ+dhCbV8BC4s3CyWwQ6+QlVm84wAxicwLFD66EGCQh8JZV4s35
        PiaIIheJngWnoWwZicuTu6FurZdomnmFGaKhg1HixOLlUFOtJQ4fvwi2mVmAT2LStulARRxA
        cV6JjjYhiBIPidvzr4DNFBLoZpTYv09hAqPEAkaGVYziqaXFuempxcZ5qeV6xYm5xaV56XrJ
        +bmbGIHRdPrf8a87GPf9STrEKMDBqMTDu+N1eYwQa2JZcWXuIUYJDmYlEV4+hsoYId6UxMqq
        1KL8+KLSnNTiQ4zSHCxK4rzVDA+ihQTSE0tSs1NTC1KLYLJMHJxSDYxdx9qCLk+UT+cs1v8+
        9b54qfM2uX0iky0eXVzaJdp0LueQAUOJ89eWAsFg381tyRYbd9vaNTiIrTtZ8pRNc6vdHxsx
        yZc3/z7cr/1GI06wYJ3wO6m1QgWGbGufzp02Qa+bJea2C1/V/BUBOjn+049GXRCIc3G05rux
        ctYqlbWn/88/3HKfI02JpTgj0VCLuag4EQDRPPEtogIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7rblStjDLbcNbO4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ytj55DRzwRLWir1TXrI1MO5l6WLk5JAQMJHo7XnL1sXIxSEksIRRYtv/uUwQTiOTxPXju9hB
        qtgENCX+br7JBmKLCChLrNrXzg5SxCxwhVGi/VsXWJGwgK3E5AV3WEFsFgFViUUX94PFeQUs
        JN4snMwGsU5eYvWGA8wgNidQ/OBKkEEcQNvMJTadjprAyLOAkWEVo0hqaXFuem6xkV5xYm5x
        aV66XnJ+7iZGYHhsO/Zzyw7GrnfBhxgFOBiVeHgTXpbHCLEmlhVX5h5ilOBgVhLh5WOojBHi
        TUmsrEotyo8vKs1JLT7EKM3BoiTOe96gMkpIID2xJDU7NbUgtQgmy8TBKdXAeDRqmoKg4erk
        mTl3wmdc8N0sdlFgf+6n1bEvj4lW8rX6Hbx0jm8b+2TGa6vsTJIyW+u0O0Ov7VK56vREMHlv
        kMvl1j0LI7omfTr6alt5Sv7ckvXLOt5tjnmWmu605YbRqeU/K78xbjR3D+nJ7eX9yhVsetC/
        NevtBH0LqbzLvydqRc9/YdT2RomlOCPRUIu5qDgRAGO1ulcLAgAA
X-CMS-MailID: 20190301122112eucas1p2c0099b31af68e2c72c07640ab994123a
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122112eucas1p2c0099b31af68e2c72c07640ab994123a
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122112eucas1p2c0099b31af68e2c72c07640ab994123a@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

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 Fri Mar  1 12:20: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: 10835107
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 46A1817E9
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:27 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36CF32D8F5
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:27 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 2B1F22D931; Fri,  1 Mar 2019 12:21:27 +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 AFEFF2D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:26 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728329AbfCAMVY (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:24 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36640 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388181AbfCAMVO (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:14 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122113euoutp0186bf9af7a66883e1f1eb31f459e50839~H1RLN5D_i1404314043euoutp01w;
        Fri,  1 Mar 2019 12:21:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122113euoutp0186bf9af7a66883e1f1eb31f459e50839~H1RLN5D_i1404314043euoutp01w
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442873;
        bh=MvYayiMYt6F6XRoiQC5WSr1zewpSpCqunKSj+HsBjkU=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=Vspmku48zuNB1cjz7PVXWoYZeDK9KNEfulBkCJkvwbwsvsK9y8IDDtex453TtXyRy
         4+btV7KUqjjpMGNuEsuDSiZSCrIGC/3QG4Oe1jOLf339mQpKVGiAAsOtXfJuR317a8
         Tx6uH+IHptVrXmQDV4ViGkReaiB7G5VrLbkJnNNU=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122112eucas1p1b04708e1cdf94660e537134dc8200094~H1RKwr8Yq2241322413eucas1p1d;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id C3.5B.04806.8B3297C5;
 Fri,  1
        Mar 2019 12:21:12 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122112eucas1p2fe4f1ab4dfc3026f1a64bb07c649a590~H1RKLULQ92891128911eucas1p2Y;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
X-AuditID: cbfec7f5-367ff700000012c6-8e-5c7923b8db5c
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 79.23.04284.8B3297C5;
 Fri,  1
        Mar 2019 12:21:12 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21: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
Subject: [PATCH 17/23] arm64: dts: exynos: configure GSCALER related clocks
Date: Fri, 01 Mar 2019 13:20:49 +0100
Message-id: <20190301122055.7135-18-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWy7djP87o7lCtjDD4s17C4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ypjwvpup4CN/xdrtm1gbGA/zdjFyckgImEgc/jSLrYuRi0NIYAWjxOXWyUwQzmdGie0tvxlh
        qhqub4WqWsYosf/KdKiq/4wSm6c9ZAKpYhPQlPi7+SYbiC0ioCyxal87O0gRs8AlRonXJ7vB
        RgkLeEsc27AKzGYRUJWY1dQBZvMKWEg07fvNDLFOXmL1hgNgNidQ/OBKiEESAm9ZJRoW7maF
        KHKR2Hr/JguELSPR2XGQCcKul2iaeYUZoqGDUeLE4uVsEAlricPHL4I1MwvwSUzaNh2oiAMo
        zivR0SYEUeIh0dT3nBHitW5GiWOLDrNPYJRYwMiwilE8tbQ4Nz212DgvtVyvODG3uDQvXS85
        P3cTIzCeTv87/nUH474/SYcYBTgYlXh4d7wujxFiTSwrrsw9xCjBwawkwsvHUBkjxJuSWFmV
        WpQfX1Sak1p8iFGag0VJnLea4UG0kEB6YklqdmpqQWoRTJaJg1OqgfFyzKn2mX9j6y97n34S
        ppc2/1LyoafLe0TtfbTPh97y0Ll/jTlJMpOTTy/mna3BmZvuhkVfNVwzTPtmFoctl5d512TF
        dnfKI0t9mfD8H1E+3f+Ue5Z8WMcZeOXR+lNW+2b3y/0orvV5q3TsnGvbi+8hXpmXJX0enfjR
        Ufz/5cH72ddOWKxys1NiKc5INNRiLipOBAAMYP52owIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7o7lCtjDM5d47e4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        ypjwvpup4CN/xdrtm1gbGA/zdjFyckgImEg0XN/K1sXIxSEksIRRYuW0FYwQTiOTxM1rG5hB
        qtgENCX+br7JBmKLCChLrNrXzg5SxCxwhVGi/VsXO0hCWMBb4tiGVYwgNouAqsSspg4wm1fA
        QqJp329miHXyEqs3HACzOYHiB1eCDOIA2mYusel01ARGngWMDKsYRVJLi3PTc4sN9YoTc4tL
        89L1kvNzNzECw2PbsZ+bdzBe2hh8iFGAg1GJhzfhZXmMEGtiWXFl7iFGCQ5mJRFePobKGCHe
        lMTKqtSi/Pii0pzU4kOM0hwsSuK85w0qo4QE0hNLUrNTUwtSi2CyTBycUg2MPLd/ZM6eM/HD
        BIfzvm2SG6MFH/39pq38Oq7LIEhb/sOvqRuyntxbF5g4rTPoMOvK6YLXjCIP2bPPLVAv/3CJ
        SS51iviUzOMbjqz/cMN167GbgdML5S1/CR6cHHAl/1GAUWr9+rY/1h+VyppM26WV3tnGbdmw
        89LG01fruEK7Fv64/shhwvTdn5RYijMSDbWYi4oTAV5PiHwLAgAA
X-CMS-MailID: 20190301122112eucas1p2fe4f1ab4dfc3026f1a64bb07c649a590
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122112eucas1p2fe4f1ab4dfc3026f1a64bb07c649a590
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122112eucas1p2fe4f1ab4dfc3026f1a64bb07c649a590@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 Fri Mar  1 12:20: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: 10835099
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 E1C0518B7
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D08602097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id C4BA12D8F5; Fri,  1 Mar 2019 12:21: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 F1F5F2D99B
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728271AbfCAMVQ (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:16 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36654 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388198AbfCAMVP (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:15 -0500
Received: from eucas1p1.samsung.com (unknown [182.198.249.206])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122113euoutp01562b0f68cd2fcd79cb04c12635f0d81f~H1RLtmV2c1385113851euoutp01J;
        Fri,  1 Mar 2019 12:21:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122113euoutp01562b0f68cd2fcd79cb04c12635f0d81f~H1RLtmV2c1385113851euoutp01J
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442873;
        bh=Dy+VGQ0HF20VIsRN7nb/J+fk3IZ2gY4XCMx+YNQRV/g=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=KKSUXsYBDKfRP38iGR8hYOQYvZVJNNBYtXlUmP+7LJwOAYMxcU7lWE22DmBkp9Smm
         4UcbpFu5r41tDe8tIkhREcDuPIoAtQvSw0whRtNNLV3GFKoMXdY2BCt/caG9WhbV7S
         qQe86LrvX9vuxjFd5y9POa0znPXqdSAVbrhMwt9o=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122113eucas1p145a9443103e3b3aeb0826364c934f701~H1RLRuZRQ2241822418eucas1p1e;
        Fri,  1 Mar 2019 12:21:13 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id 34.5B.04806.9B3297C5;
 Fri,  1
        Mar 2019 12:21:13 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122112eucas1p2d389c3d94c691507d5ac2c3d224e2e32~H1RKkyc7I2978929789eucas1p2G;
        Fri,  1 Mar 2019 12:21:12 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-8f-5c7923b97b2f
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id F8.6C.04128.8B3297C5;
 Fri,  1
        Mar 2019 12:21:12 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21: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
Subject: [PATCH 18/23] arm64: dts: exynos: add DSD/GSD clocks to DECONs and
 GSCALERs
Date: Fri, 01 Mar 2019 13:20:50 +0100
Message-id: <20190301122055.7135-19-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupjkeLIzCtJLcpLzFFi42LZduznOd2dypUxBtOfcFncWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZWxqvMFS8Feq4u3alawNjFNFuxg5OCQETCQ+/eboYuTiEBJYwSjxoP0LK4TzmVFiwaLlrDBF
        J5tiIeLLGCWef3/ABuH8Z5TYPO0hUxcjJwebgKbE38032UBsEQFliVX72tlBipgFLjFKvD7Z
        zQiSEBYIkzg/8TqYzSKgKvFry2NWEJtXwEJix/dPYLaEgLzE6g0HmEFsTqD4wZUQgyQEPrJK
        9DQ3skEUuUjMPAOSALFlJC5P7maBsOslmmZeYYZo6GCUOLF4OVSDtcTh4xfBNjAL8ElM2jad
        GeI3XomONiGIEg+JhnPX2CFe6wYGxo2zTBOAwcDIsIpRPLW0ODc9tdg4L7Vcrzgxt7g0L10v
        OT93EyMwlk7/O/51B+O+P0mHGAU4GJV4eHe8Lo8RYk0sK67MPcQowcGsJMLLx1AZI8SbklhZ
        lVqUH19UmpNafIhRmoNFSZy3muFBtJBAemJJanZqakFqEUyWiYNTqoFxTYBOf1v077vOchZC
        /f8L7BuyOXIYhPb8e60wlW+a9GxpQ9MZi8qZs8u+nbg4a5HcnZyYl4kLehY94Y9Mfc+meUV6
        34Szy02FT2saG9R5X+a6c+WT2/6AlzmNQa94LEuTPl7xy3Z0jYt5Zrqy5vO1BS9c9Ir/T3/C
        uU3x6ZG9T2LFG/6+/HhGiaU4I9FQi7moOBEAJ6zE1KECAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7o7lCtjDJ41qVvcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZWxqvMFS8Feq4u3alawNjFNFuxg5OCQETCRONsV2MXJxCAksYZSYv24jK4TTyCRx89oG5i5G
        Tg42AU2Jv5tvsoHYIgLKEqv2tbODFDELXGGUaP/WxQ6SEBYIkzg/8TojiM0ioCrxa8tjVhCb
        V8BCYsf3T2C2hIC8xOoNB8CGcgLFD64EGcQBtM1cYtPpqAmMPAsYGVYxiqSWFuem5xYb6RUn
        5haX5qXrJefnbmIEBse2Yz+37GDsehd8iFGAg1GJhzfhZXmMEGtiWXFl7iFGCQ5mJRFePobK
        GCHelMTKqtSi/Pii0pzU4kOM0hwsSuK85w0qo4QE0hNLUrNTUwtSi2CyTBycUg2MWiKPUqOM
        eOUUg5zfZlSk5d1LjYtd281Xfb6qp/JLVsPBmceXz/u6lls64JzJOds1YZr7L7JPXVRhc6rr
        9DyFD3/O7RSYwxB+YHt6TJ340VP3dCz8Y2Wu/HFZ4X1t/ZLOkv6/dv/4zq+5YXr32bJQ9dMH
        +ObPfDO/XnlCfnRm8pVnSz4+y2z4pcRSnJFoqMVcVJwIAHjwDDsKAgAA
X-CMS-MailID: 20190301122112eucas1p2d389c3d94c691507d5ac2c3d224e2e32
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122112eucas1p2d389c3d94c691507d5ac2c3d224e2e32
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122112eucas1p2d389c3d94c691507d5ac2c3d224e2e32@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 Fri Mar  1 12:20: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: 10835089
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 C2E62922
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:18 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF75D2D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:18 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id A05CF2D964; Fri,  1 Mar 2019 12:21: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 C748F2D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:17 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388177AbfCAMVR (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:17 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39183 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388125AbfCAMVQ (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:16 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122114euoutp02e3eef106989b39c99a0cb14a93b589e8~H1RMBcTmC2132421324euoutp02V;
        Fri,  1 Mar 2019 12:21:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122114euoutp02e3eef106989b39c99a0cb14a93b589e8~H1RMBcTmC2132421324euoutp02V
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442874;
        bh=D/Q3pJwahUPY+c5OphoLI+w4qUa7jWUNPKnp2UOn9F4=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=LV0fvL7f3tDIaLyPID1eph9g8i2gBEZaX2j5iXyOIpnPybc2vpDB1y6S1ulSSYc8i
         F0EMZbIeFPK/norM2oqhWDhSL6Y8K1Bz0S6+WEJ4j9FRW0NqsCi7gU7/Yp6EF9DO2S
         hLfDZZnwdjT8D9PgbdB4l8m4HSqVioAP+lLtHN+c=
Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122113eucas1p1095b5db76db21365ab57421dfb6e3cb5~H1RLfIsJa3036530365eucas1p1Z;
        Fri,  1 Mar 2019 12:21:13 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges1new.samsung.com (EUCPMTA) with SMTP id C5.5E.04441.9B3297C5;
 Fri,  1
        Mar 2019 12:21:13 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122113eucas1p2c3cce6f8651859bdef9785e3c7042efc~H1RK2poBZ1653516535eucas1p2f;
        Fri,  1 Mar 2019 12:21:13 +0000 (GMT)
X-AuditID: cbfec7f2-5e3ff70000001159-6a-5c7923b9cffe
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 89.6C.04128.8B3297C5;
 Fri,  1
        Mar 2019 12:21:12 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21: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
Subject: [PATCH 19/23] drm/exynos/gscaler: add local path support
Date: Fri, 01 Mar 2019 13:20:51 +0100
Message-id: <20190301122055.7135-20-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupjkeLIzCtJLcpLzFFi42LZduzned2dypUxBis2SlncWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        Zfy42MlUcC+sYt2mf+wNjBs8uhg5OSQETCQu7/jA1MXIxSEksIJRYuGcbYwgCSGBz4wSWx5l
        wxS9PvQfKr6MUaJzYQxEw39Gic3THjKBJNgENCX+br7JBmKLCChLrNrXzg5SxCxwiVHi9clu
        sG5hAUeJyW0nmEFsFgFViTevX7GD2LwCFhLTn5xjh9gmL7F6wwGwGk6g+MGVEIMkBN6ySvTP
        6GWDKHKR6Fy2DcqWkbg8uZsFwq6XaJp5hRmioYNR4sTi5VBF1hKHj19kBbGZBfgkJm2bDlTE
        ARTnlehoE4Io8ZDYsmU6NCy6GSVuL29hnMAosYCRYRWjeGppcW56arFhXmq5XnFibnFpXrpe
        cn7uJkZgLJ3+d/zTDsavl5IOMQpwMCrx8Ca8LI8RYk0sK67MPcQowcGsJMLLx1AZI8SbklhZ
        lVqUH19UmpNafIhRmoNFSZy3muFBtJBAemJJanZqakFqEUyWiYNTqoFRJu9Ju9zFSWvaFjsV
        nD5dLqnNF+5xnf9p95RNl2TmXZvpsfl/2/yHbjYuQp8L5ntMWWX6aWvv306O+KlrHu+/I9G+
        P4DHkFcoNln5hJ2Hv/0HuSMTYv9KeYm87b2Z0LZPUEvS/UI047Kte935Uz9xbHE5bDn3wiuT
        U1v8Cq2iV/ZsMVs5dwGbEktxRqKhFnNRcSIAEmI6XqECAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7o7lCtjDI4usrG4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yvhxsZOp4F5YxbpN/9gbGDd4dDFyckgImEi8PvSfsYuRi0NIYAmjROuBc2wQTiOTxM1rG5hB
        qtgENCX+br7JBmKLCChLrNrXzg5SxCxwhVGi/VsXO0hCWMBRYnLbCbAGFgFViTevX4HFeQUs
        JKY/OccOsU5eYvWGA2A1nEDxgytBBnEAbTOX2HQ6agIjzwJGhlWMIqmlxbnpucVGesWJucWl
        eel6yfm5mxiB4bHt2M8tOxi73gUfYhTgYFTi4U14WR4jxJpYVlyZe4hRgoNZSYSXj6EyRog3
        JbGyKrUoP76oNCe1+BCjNAeLkjjveYPKKCGB9MSS1OzU1ILUIpgsEwenVAPjDMHZLD9z3rQp
        HFXdcWHKp8tMdo/PKCwri+0KZHj06dtCPneJj7t/JX12qlsUMvX1Z8Uzfjb9H7pexDGEGZfw
        /DnE802ZTZ57vu3n09MunfCccFWoJuft07s8fpVF7z39XzKfWfpQi2OD8RRmq2emW3kEdIIL
        FC4tb2NozZulbSxx4jL7c59SJZbijERDLeai4kQA8e7xvQsCAAA=
X-CMS-MailID: 20190301122113eucas1p2c3cce6f8651859bdef9785e3c7042efc
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122113eucas1p2c3cce6f8651859bdef9785e3c7042efc
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122113eucas1p2c3cce6f8651859bdef9785e3c7042efc@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

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 Fri Mar  1 12:20: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: 10835093
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 3BC181515
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24DBA2D931
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 1620B2097A; Fri,  1 Mar 2019 12:21: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 1E3AB2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388125AbfCAMVR (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:17 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39188 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388208AbfCAMVQ (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:16 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122114euoutp02a5a54c4f491c6ff170a09160dd2410f8~H1RMh2qnG2133221332euoutp02N;
        Fri,  1 Mar 2019 12:21:14 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122114euoutp02a5a54c4f491c6ff170a09160dd2410f8~H1RMh2qnG2133221332euoutp02N
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442874;
        bh=3XLHoKB/gX6jbQYLpF9D12Y31faiwvzTIy/3lMIsTZA=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=fqZh0cdoNlconVaReCN/skcQkltqGJTXhUJzME5qxG5IWJkiePmmZpd9HqGQOjEzd
         QTC7eX6CH3CzKy5kBvOVtq6WzIO2LWFSGPhZH/b470wHEMEaO4xyMXi2tArt9EW1i3
         yDccK8DTJQmV0iCDamAQa+X1qX/BctsNjrBdJ9xk=
Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122114eucas1p159f0f8111b6bdf7044d6edd02b449606~H1RMHlf442241322413eucas1p1h;
        Fri,  1 Mar 2019 12:21:14 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges3new.samsung.com (EUCPMTA) with SMTP id F4.5B.04806.9B3297C5;
 Fri,  1
        Mar 2019 12:21:13 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122113eucas1p2bd3c00441025c99aa20e933441bd3f21~H1RLMRAEu2978429784eucas1p2w;
        Fri,  1 Mar 2019 12:21:13 +0000 (GMT)
X-AuditID: cbfec7f5-34dff700000012c6-93-5c7923b99245
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 8A.23.04284.9B3297C5;
 Fri,  1
        Mar 2019 12:21:13 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21: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
Subject: [PATCH 20/23] drm/exynos/decon5433: add local path support
Date: Fri, 01 Mar 2019 13:20:52 +0100
Message-id: <20190301122055.7135-21-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupjkeLIzCtJLcpLzFFi42LZduzned2dypUxBlOPmVncWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZfzdMYW1YJJxxd9HfWwNjBu0uhg5OSQETCTO/5rI3MXIxSEksIJR4tyF+0wQzmdGiSftH9i7
        GDnAqvY9dIGIL2OU2LryASOE859R4vGSV6wgo9gENCX+br7JBmKLCChLrNrXzg5SxCxwiVHi
        9cluRpCEsICzxPv3R8GKWARUJb417GECsXkFLCSmt0xlg7hJXmL1hgPMIDYnUPzgSohBEgIf
        WSX2/fsGVeQiMeXpVUYIW0ais+MgE4RdL9E08wozREMHo8SJxcuhGqwlDh+/CHYqswCfxKRt
        05khfuOV6GgTgjA9JK4eUIb4rJtR4tihtUwTGCUWMDKsYhRPLS3OTU8tNs5LLdcrTswtLs1L
        10vOz93ECIyl0/+Of93BuO9P0iFGAQ5GJR7eHa/LY4RYE8uKK3MPMUpwMCuJ8PIxVMYI8aYk
        VlalFuXHF5XmpBYfYpTmYFES561meBAtJJCeWJKanZpakFoEk2Xi4JRqYDzx+qSv3/7Pfw9v
        5XVe/OXHO9NfTtffJ3+2u3OnQebBJ5bUmXmtdRM7zJifPTBp63z02Dn/U/qS25b273fdUV8y
        aZK6GK9G7Qa/rjwe1dnzbl279Fcv7JS78cE2lWSju+wLcnzWRlbcqtxT6HQrtbr8QuU348c6
        LgnhMhNXObTcMzO6/6vMqU2JpTgj0VCLuag4EQClDKrjoQIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7o7lStjDKbOELW4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yvi7YwprwSTjir+P+tgaGDdodTFycEgImEjse+jSxcjFISSwhFHi2Kc2JginkUliXvdC9i5G
        Tg42AU2Jv5tvsoHYIgLKEqv2tbODFDELXGGUaP/WBVYkLOAs8f79UbAiFgFViW8Ne5hAbF4B
        C4npLVPB4hIC8hKrNxxgBrE5geIHV4IM4gDaZi6x6XTUBEaeBYwMqxhFUkuLc9Nziw31ihNz
        i0vz0vWS83M3MQKDY9uxn5t3MF7aGHyIUYCDUYmHN+FleYwQa2JZcWXuIUYJDmYlEV4+hsoY
        Id6UxMqq1KL8+KLSnNTiQ4zSHCxK4rznDSqjhATSE0tSs1NTC1KLYLJMHJxSDYzc7y+KTFR4
        Nz3jx6wJP/vXJDF9kOkuOuz/y/fBulmqsave/fXpeBBr4ydSeEHMtiJj7fFV/k/MnjZcvTjT
        /8V+gfpPi7Ukq/+or3ubwmZy+Wfw2ows5fa2/dsOGktky/1X4Jus/+ziygLGzIKc5zeCvULj
        XNrm6bgHvShg9N/ddXfVm4Dvyz4qsRRnJBpqMRcVJwIA8nSiNwoCAAA=
X-CMS-MailID: 20190301122113eucas1p2bd3c00441025c99aa20e933441bd3f21
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122113eucas1p2bd3c00441025c99aa20e933441bd3f21
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122113eucas1p2bd3c00441025c99aa20e933441bd3f21@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

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 Fri Mar  1 12:20: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: 10835097
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 8B69E922
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 799AB2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 6DBC72D8F5; Fri,  1 Mar 2019 12:21: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 0ABAF2D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388221AbfCAMVS (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:18 -0500
Received: from mailout1.w1.samsung.com ([210.118.77.11]:36640 "EHLO
        mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388213AbfCAMVQ (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:16 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122115euoutp019581fa78f4a07b8bbea448dcea9f85e9~H1RMysiGK1452714527euoutp01U;
        Fri,  1 Mar 2019 12:21:15 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
 20190301122115euoutp019581fa78f4a07b8bbea448dcea9f85e9~H1RMysiGK1452714527euoutp01U
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442875;
        bh=cpYT42EusnvUENfsBe2CbH4a+nZgA0tdO6X2xO+kOvw=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=qD0cpXdniLeugHQ60ckxP07ojB5k0N/lXyafW0oh1pMI47PLsP9PeVtHmUm4KdzjB
         hzq2t96YezIwnr2bz+mAx4jHCaxfdUpe1jybFYJce5W2k8N4gPr2RnycC1kBxah/jl
         DejFl+R3BivZvLf2Ntklx2sP2iPbGUsYqmQ4sR0M=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122114eucas1p2fd609d15a0ad6d3fd24ed5e02e5bc461~H1RMVZQn62981229812eucas1p2e;
        Fri,  1 Mar 2019 12:21:14 +0000 (GMT)
Received: from eucas1p2.samsung.com ( [182.198.249.207]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id 5E.CC.04294.AB3297C5;
 Fri,  1
        Mar 2019 12:21:14 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122113eucas1p25f441847f19e4d1a355bffd7633dcd5d~H1RLjV9iL2978429784eucas1p2x;
        Fri,  1 Mar 2019 12:21:13 +0000 (GMT)
X-AuditID: cbfec7f4-84fff700000010c6-16-5c7923ba58b9
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id 2B.23.04284.9B3297C5;
 Fri,  1
        Mar 2019 12:21:13 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21: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
Subject: [PATCH 21/23] drm/exynos/decon5433: wait for finish previous update
Date: Fri, 01 Mar 2019 13:20:53 +0100
Message-id: <20190301122055.7135-22-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupjkeLIzCtJLcpLzFFi42LZduzned1dypUxBqdOC1ncWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        Zexdupi9oEug4tiOf0wNjB95uxg5OSQETCQ+7v7F1sXIxSEksIJRYtn2uewgCSGBz4wSs6Z6
        whRN37WMHaJoGaPEmg87mCCc/4wSj5e8YgWpYhPQlPi7+SYbiC0ioCyxal87WAezwCVGidcn
        uxlBEsICPhJTLxwHs1kEVCXeXZsH1MDBwStgITH3oS3ENnmJ1RsOMIPYnEDhgysh5kgIvGWV
        ON5zjwWiyEViyq2dzBC2jERnx0EmCLteomnmFWaIhg5GiROLl7NBJKwlDh+/CHYpswCfxKRt
        05lBFksI8Ep0tAlBlHhIHD3WDvVZN9DRE1+yTmCUWMDIsIpRPLW0ODc9tdgoL7Vcrzgxt7g0
        L10vOT93EyMwlk7/O/5lB+OuP0mHGAU4GJV4eBNelscIsSaWFVfmHmKU4GBWEuHlY6iMEeJN
        SaysSi3Kjy8qzUktPsQozcGiJM5bzfAgWkggPbEkNTs1tSC1CCbLxMEp1cCYZ9GdGXupcM4k
        DXGur10FAgvnt53TcCiYPonx6BP3kymTT5svjbl+Iq7xtqPntqNvUtbvMm1LaTLXEAuV/ynI
        6tV8l/tI5MT2+9N8xLk6FqpU5n1K23T+BdOxs5rfnYJ6T3AGv68K7tlY8zSZ2/H4lX7un1Xz
        4wsCEtxvCbe4q/W1vW+enafEUpyRaKjFXFScCAA2eJKCoQIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7o7lStjDPoO6VjcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        Zexdupi9oEug4tiOf0wNjB95uxg5OSQETCSm71rG3sXIxSEksIRR4tyKiUwQTiOTxLzuhewg
        VWwCmhJ/N99kA7FFBJQlVu1rB+tgFrjCKNH+rQusSFjAR2LqheOMIDaLgKrEu2vzgBo4OHgF
        LCTmPrSF2CYvsXrDAWYQmxMofHAlyBwOoGXmEptOR01g5FnAyLCKUSS1tDg3PbfYUK84Mbe4
        NC9dLzk/dxMjMDi2Hfu5eQfjpY3BhxgFOBiVeHgTXpbHCLEmlhVX5h5ilOBgVhLh5WOojBHi
        TUmsrEotyo8vKs1JLT7EKM3BoiTOe96gMkpIID2xJDU7NbUgtQgmy8TBKdXA2Ns+6XODYOd0
        zaMOU+4a6ju/Mfh/YlLLno+Rb2VUZAOuzEt8O21jZmfCpUc1GnMS1i0v1GhzdmI8G7vzt1Iw
        X9qE6wf7O98KvE49Gb6nOXvZjESvdcp1epv5551fqOI247B/b3p4R9QnXcllDbP9mL2ltnis
        uzJJJ+mXJWPwrPTN4jEO339lKrEUZyQaajEXFScCAMe2e/gKAgAA
X-CMS-MailID: 20190301122113eucas1p25f441847f19e4d1a355bffd7633dcd5d
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122113eucas1p25f441847f19e4d1a355bffd7633dcd5d
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122113eucas1p25f441847f19e4d1a355bffd7633dcd5d@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 Fri Mar  1 12:20: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: 10835091
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 EE0EE188E
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:18 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC1AC2D900
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:18 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id D067D2D964; Fri,  1 Mar 2019 12:21: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 48E7F2D931
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388198AbfCAMVR (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:17 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39191 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2387769AbfCAMVQ (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:16 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122115euoutp02108db8dd894820c8ea2ef2aef9cadd7d~H1RM7w33p2156121561euoutp02x;
        Fri,  1 Mar 2019 12:21:15 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122115euoutp02108db8dd894820c8ea2ef2aef9cadd7d~H1RM7w33p2156121561euoutp02x
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442875;
        bh=rCyWFMfEVy9YOrKqMuoPYN29tJ86LEQrYAp9QJAHdqw=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=QiHmKk9Oj9WABFZkfWoIKORzGDz/pFbeRNSCa33bd3Mhxjn/18vPa+LVd/f8gt0Ji
         mgd72jptGp9sVieHwgVk/DvAyAsktt6/hXmQq+2TbcBNLaYYBhAvjLav0RmzaW/0oa
         hhVGJPr6zEx9UEPfR1HRiU/GDHUGKQwtdaE/hs8I=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122114eucas1p2d2e8db3cb2ee3e4b5043a8767bc4dc7c~H1RMhF0Hy1653116531eucas1p2s;
        Fri,  1 Mar 2019 12:21:14 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id DE.CC.04294.AB3297C5;
 Fri,  1
        Mar 2019 12:21:14 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122114eucas1p2f8722a93496077bfa60c7865781763b9~H1RL4SCab1654016540eucas1p2Y;
        Fri,  1 Mar 2019 12:21:14 +0000 (GMT)
X-AuditID: cbfec7f4-835ff700000010c6-17-5c7923ba0a7b
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms2.samsung.com (EUCPMTA) with SMTP id 5A.6C.04128.AB3297C5;
 Fri,  1
        Mar 2019 12:21:14 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21: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
Subject: [PATCH 22/23] drm/exynos/gscaler: change supported color format
 BGRX8888 to XBGR8888
Date: Fri, 01 Mar 2019 13:20:54 +0100
Message-id: <20190301122055.7135-23-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWy7djPc7q7lCtjDCa/U7C4te4cq8XGGetZ
        La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg
        yrjw/hNTQQtPxdOZ3awNjPO4uhg5OSQETCQOH9rK2sXIxSEksIJR4vfv6VDOZ0aJmQuWscBU
        LX4ynQUisQwocXkTM4Tzn1FiwdNfbCBVbAKaEn833wSzRQSUJVbta2cHKWIWuMQo8fpkNyNI
        QlggXuLNpHlgRSwCqhLL9vwAW8ErYCFxYddHRoh18hKrNxxgBrE5geIHV0IMkhB4yypx+lMH
        E0SRi8TxTc/YIGwZicuTu6FurZdomnmFGaKhg1HixOLlUEXWEoePX2QFsZkF+CQmbZsOVMQB
        FOeV6GgTgijxkPjTdgnqtW5Gic/Hj7FMAPqQkWEVo3hqaXFuemqxUV5quV5xYm5xaV66XnJ+
        7iZGYDyd/nf8yw7GXX+SDjEKcDAq8fAmvCyPEWJNLCuuzD3EKMHBrCTCy8dQGSPEm5JYWZVa
        lB9fVJqTWnyIUZqDRUmct5rhQbSQQHpiSWp2ampBahFMlomDU6qBcaumeqbUg08Bi4/P/FA3
        VcZq7dm5LzT48+uLmrg2zQrlS68ptd+59911Kb7ekuNbFp578+5M/q5pl18ee1P3pzKWLamQ
        v/uDwJ7ozNCJvRZiGm387ycc45kve2eCtvf9lICH+2+9OJ0xt07B45Ha3beiXFsn1SSdeu8c
        UFR+yS7F4ObSynvb1JRYijMSDbWYi4oTAcYYUgmjAgAA
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7q7lCtjDL51s1jcWneO1WLjjPWs
        Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw
        ZVx4/4mpoIWn4unMbtYGxnlcXYycHBICJhKLn0xn6WLk4hASWMIosaZ1BiuE08gk0XuqiQmk
        ik1AU+Lv5ptsILaIgLLEqn3t7CBFzAJXGCXav3WxgySEBeIl3kyaB1bEIqAqsWzPDxYQm1fA
        QuLCro+MEOvkJVZvOMAMYnMCxQ+uBBnEAbTNXGLT6agJjDwLGBlWMYqklhbnpucWG+kVJ+YW
        l+al6yXn525iBIbHtmM/t+xg7HoXfIhRgINRiYc34WV5jBBrYllxZe4hRgkOZiURXj6Gyhgh
        3pTEyqrUovz4otKc1OJDjNIcLErivOcNKqOEBNITS1KzU1MLUotgskwcnFINjKHcNaWbOpse
        Kd9Iyz3+X7rXMWs/e+WFEyv7et0+ZWyo74qbXPzusuN8uSLdZY9WSDAlP/L+fsy1kEddYZrK
        5vn1OmEhmy6suVZdOrXlyK7cbTNm/XsjcHbRvs97JdTalGd2dns+lz979OQtpavpoRvU2K5L
        Mv64eulqgFJYqH24tJN4TYziRCWW4oxEQy3mouJEANaKaUYLAgAA
X-CMS-MailID: 20190301122114eucas1p2f8722a93496077bfa60c7865781763b9
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122114eucas1p2f8722a93496077bfa60c7865781763b9
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122114eucas1p2f8722a93496077bfa60c7865781763b9@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 Fri Mar  1 12:20: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: 10835095
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 53EA818EC
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 435DC2097A
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:19 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 2CB782DA38; Fri,  1 Mar 2019 12:21: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 A86EF2D8F5
	for <patchwork-linux-samsung-soc@patchwork.kernel.org>;
 Fri,  1 Mar 2019 12:21:18 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2387769AbfCAMVS (ORCPT
        <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>);
        Fri, 1 Mar 2019 07:21:18 -0500
Received: from mailout2.w1.samsung.com ([210.118.77.12]:39194 "EHLO
        mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2388217AbfCAMVR (ORCPT
        <rfc822;linux-samsung-soc@vger.kernel.org>);
        Fri, 1 Mar 2019 07:21:17 -0500
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
        by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id
 20190301122115euoutp02cab259e9f4d353606c3e5b37ed6dedfe~H1RNOHaT32151021510euoutp028;
        Fri,  1 Mar 2019 12:21:15 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com
 20190301122115euoutp02cab259e9f4d353606c3e5b37ed6dedfe~H1RNOHaT32151021510euoutp028
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
        s=mail20170921; t=1551442875;
        bh=TyKT6bah+kd2Dl9KQ7/ARjwuR+1go7zEaegsvg3AlHE=;
        h=From:To:Cc:Subject:Date:In-reply-to:References:From;
        b=Ouy1aaGftnewHd2PZE0XduyMAE3/JC3nxzhM4TaVD5F0LuKVJTiaA76NC1FunJkP5
         CwEBMzhM1YT6rterkebs1CNTajDjDZ5kbuax8JgTYPe6vgRPhS14TMMlLakW0YAbhu
         frBfr/XahqU07teYE8uDrQRsC2UyvoTkQRe1tSA8=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
        eucas1p1.samsung.com (KnoxPortal) with ESMTP id
        20190301122115eucas1p1fd59473e1d583057f4434436f03a225d~H1RM0hYFW2241322413eucas1p1j;
        Fri,  1 Mar 2019 12:21:15 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
        eusmges2new.samsung.com (EUCPMTA) with SMTP id 4F.CC.04294.AB3297C5;
 Fri,  1
        Mar 2019 12:21:14 +0000 (GMT)
Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by
        eucas1p2.samsung.com (KnoxPortal) with ESMTP id
        20190301122114eucas1p2c257303e00546f399ee3e5f97962c28c~H1RMOkAsx1653016530eucas1p2y;
        Fri,  1 Mar 2019 12:21:14 +0000 (GMT)
X-AuditID: cbfec7f4-84fff700000010c6-18-5c7923bace95
Received: from eusync3.samsung.com ( [203.254.199.213]) by
        eusmgms1.samsung.com (EUCPMTA) with SMTP id BB.23.04284.AB3297C5;
 Fri,  1
        Mar 2019 12:21:14 +0000 (GMT)
Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by
        eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0
 64bit
        (built May  5 2014)) with ESMTPA id
 <0PNO007ENSZ56Z20@eusync3.samsung.com>;
        Fri, 01 Mar 2019 12:21: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
Subject: [PATCH 23/23] drm/exynos/gscaler: fix handling YVU420 pixel format
Date: Fri, 01 Mar 2019 13:20:55 +0100
Message-id: <20190301122055.7135-24-a.hajda@samsung.com>
X-Mailer: git-send-email 2.17.1
In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com>
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42LZduznOd1dypUxBlOaTSxurTvHarFxxnpW
        iytf37NZTLo/gcVixvl9TBZrj9xld2DzuN99nMmjb8sqRo/Pm+QCmKO4bFJSczLLUov07RK4
        Mpq+7GIraFasmPJnMksDY6tMFyMHh4SAicSFXZldjFwcQgIrGCW6tzewQDifGSWuX57DClP0
        f4MqRHwZo0Tb1inMEM5/RokFT3+xdTFycrAJaEr83XwTzBYRUJZYta+dHaSIWeASo8Trk92M
        IAlhAW+JlRs72EFsFgFVibd7zjOB2LwCFhI7NswBa5YQkJdYveEAM4jNCRQ/uLKdHSL+llVi
        ykwRCNtFYsbTM6wQtoxEZ8dBJgi7XqJp5hWw6yQEOhglTixeDjXUWuLw8YtgDcwCfBKTtk1n
        hniNV6KjTQiixENi0veNbBCfdTNKbFs0j3UC0IOMDKsYxVNLi3PTU4uN8lLL9YoTc4tL89L1
        kvNzNzECI+n0v+NfdjDu+pN0iFGAg1GJhzfhZXmMEGtiWXFl7iFGCQ5mJRFePobKGCHelMTK
        qtSi/Pii0pzU4kOM0hwsSuK81QwPooUE0hNLUrNTUwtSi2CyTBycUg2MjtrvbQOU/x9NnVXk
        vvddJguv5SFb2TNSt2LLzBd3JBkufK3J+otDoDMure5afpO1PHPjxLht9sfP5Xi8Ojj3bor0
        1Mlai/sPrT/11kn5hvWcEHeOpPMJt3Xs3y6/v9Dk3psdZb80HjZlWL+cNCdO3+2em3z/zZP/
        ditmeprvNpx3y80jeNFmJZbijERDLeai4kQA35PwBqACAAA=
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7q7lCtjDBrapCxurTvHarFxxnpW
        iytf37NZTLo/gcVixvl9TBZrj9xld2DzuN99nMmjb8sqRo/Pm+QCmKO4bFJSczLLUov07RK4
        Mpq+7GIraFasmPJnMksDY6tMFyMHh4SAicT/DapdjFwcQgJLGCVeXrnFCOE0Mkn0nmpi6mLk
        5GAT0JT4u/kmG4gtIqAssWpfOztIEbPAFUaJ9m9d7CAJYQFviZUbO8BsFgFVibd7zoM18wpY
        SOzYMAesWUJAXmL1hgPMIDYnUPzgSpBBHEDbzCU2nY6awMizgJFhFaNIamlxbnpusaFecWJu
        cWleul5yfu4mRmBwbDv2c/MOxksbgw8xCnAwKvHwJrwsjxFiTSwrrsw9xCjBwawkwsvHUBkj
        xJuSWFmVWpQfX1Sak1p8iFGag0VJnPe8QWWUkEB6YklqdmpqQWoRTJaJg1OqgTFWQD9LoYzr
        Vlf5hZnZLXGytYcTE79nSnd67IuxY5+3SkI8eELyl0qr449SVPe83bVbNyzS11yPM5NnYUPP
        pbk9XPv5Fxgpda+ZpFCcdyNZ5ekiJ4ESSbmDUxeYyZbOUln8J/bNLI66UwXq7w+sORzlZqv0
        b2nJk0deKx7PaF00RU1ur9KKbCWW4oxEQy3mouJEAJWUIO8KAgAA
X-CMS-MailID: 20190301122114eucas1p2c257303e00546f399ee3e5f97962c28c
CMS-TYPE: 201P
X-CMS-RootMailID: 20190301122114eucas1p2c257303e00546f399ee3e5f97962c28c
References: <20190301122055.7135-1-a.hajda@samsung.com>
        <CGME20190301122114eucas1p2c257303e00546f399ee3e5f97962c28c@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);