From patchwork Fri Jul 20 21:15:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru-Cosmin Gheorghe X-Patchwork-Id: 10538367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C9E69603B5 for ; Fri, 20 Jul 2018 21:16:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B98D6297DB for ; Fri, 20 Jul 2018 21:16:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABB022980F; Fri, 20 Jul 2018 21:16:40 +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=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 58775297DB for ; Fri, 20 Jul 2018 21:16:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 17DD46F0BF; Fri, 20 Jul 2018 21:16:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20070.outbound.protection.outlook.com [40.107.2.70]) by gabe.freedesktop.org (Postfix) with ESMTPS id EFCB76F0BF for ; Fri, 20 Jul 2018 21:16:36 +0000 (UTC) Received: from e114479-lin.cambridge.arm.com (217.140.96.140) by VI1PR0802MB2557.eurprd08.prod.outlook.com (2603:10a6:800:ae::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.21; Fri, 20 Jul 2018 21:16:32 +0000 From: Alexandru Gheorghe To: seanpaul@chromium.org, airlied@linux.ie, dri-devel@lists.freedesktop.org, liviu.dudau@arm.com, brian.starkey@arm.com, malidp@foss.arm.com, ville.syrjala@linux.intel.com, daniel@ffwll.ch, gustavo@padovan.org, maarten.lankhorst@linux.intel.com, alexander.deucher@amd.com, christian.koenig@amd.com, David1.Zhou@amd.com, harry.wentland@amd.com, andrey.grodzovsky@amd.com, Tony.Cheng@amd.com, sunpeng.li@amd.com, shirish.s@amd.com, boris.brezillon@bootlin.com, nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, p.zabel@pengutronix.de, laurent.pinchart@ideasonboard.com, maxime.ripard@bootlin.com, wens@csie.org, eric@anholt.net, linux-graphics-maintainer@vmware.com, syeh@vmware.com, thellstrom@vmware.com Subject: [PATCH 02/10] drm/amd/display: Use __drm_atomic_helper_plane_reset instead of copying the logic Date: Fri, 20 Jul 2018 22:15:01 +0100 Message-Id: <20180720211509.23605-3-alexandru-cosmin.gheorghe@arm.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180720211509.23605-1-alexandru-cosmin.gheorghe@arm.com> References: <20180713161407.GQ20303@art_vandelay> <20180720211509.23605-1-alexandru-cosmin.gheorghe@arm.com> MIME-Version: 1.0 X-Originating-IP: [217.140.96.140] X-ClientProxiedBy: VI1PR0601CA0017.eurprd06.prod.outlook.com (2603:10a6:800:1e::27) To VI1PR0802MB2557.eurprd08.prod.outlook.com (2603:10a6:800:ae::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fd1c9c4f-0f81-447e-7ce1-08d5ee8611c7 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600067)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:VI1PR0802MB2557; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2557; 3:BkI7P5H/1bkGBn9mipGY88xk1LiiEtn2jrKBGlRguAVIf7dEoPzaD1wrCPEjxORv9f6dAzBfZ8ZSi3Fe7yKLS/qu71FYKwMcORZGH1UYXOHCI2XjxD4wfWpHWU++RwSiF91NUw+JeIu0b3iojcvljT1VTDTIkBOOHIKic/BQmxpllqMT6hK/7III9PlRc2HgXnsC65S8H83ODMn8FsCZEpvmMgayOSoAVUsdbi+4C2O05gAexVGTPPKtATh0IO9p; 25:5e2SrlK1lx13DUEOVvZy7jwMUu9l0FUQXq8tJM7yWEHvheDpJic8xaT4wKufkocll92GZCu2bDp5Ri4tVtMY90Wnb94ePdIgNzdcOVa1xI3ZMUb1emsiMtMu7LSXn+nouY1g2n6ri2HO42U5pIHlvL1RbiSiPWA7iJRdIGDFXNV/wiN+2MdxEH5p5m4toJsv4xVjmoOrrEo1zt2sXPQVzt1PE+Jxt6Kk9cjsUrk1loCeBm5uy+mXKJ2oiyeSrjeAYmZued9XjyyblhAXjcB2J7GYU6Uy3t9FbU4z0ryjv9maRoU9/dPKw2s/gi2Y09mhZfYLD3I2pRvc0YniJ8SFAg==; 31:QnOjQqwr4c/Bv8kwcLGacwrx87iK2WKp/O+jOcDgJdhG+PHH3SqLqD7GnmX/kR8bC+DoYzot1hDXVaTyprFRaA9ijb6upXTCD6XCckKzfqmsVvhudjAdgoy6xEfbwASQtEyPhqgL//s5QX4HmnzJIn3QKiwdRqoYHf/9G1P5uO/pmK6wTnC1bxBK6pk1paBheRRThPOBXHU93+TcWKa3gVNHbWM3bCm9wzjN/YlOZ1Q= X-MS-TrafficTypeDiagnostic: VI1PR0802MB2557: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2557; 20:7qzID0cp058FYAPxLE/KD2n6AgQ25/lbKj3VBwegeE8COpP+ibM16g3CwppneofNSEov9jhk3GPDP4qn8LA6zI6SSiBPIIbpW0bJSTsFOyqM2vlkNg1SNJdr4cz9/qJpGre9n1VC6fDyiBp9VJnQFZYVMbCsS/eqcjzwzwHg6R6ccl1wSAxJCJYq35YPnlSsZ0JksOLotBvNWmucTaWVq624srkIpNd6+MA4CrIQK24ckHAx9RQGTGSyZ79uc987eVteRaqPqiY50vjWe30XmJEZq19OWGfmZqosErUTGXMfRorn/xoKlEYeiR3XTP3GroaziyJYWub0TLTBnNR+Fw==; 4:UrNY+z+0dUtwC/HmkUtTxPmvqVrlWVeBv4Srm3t892Dj0XlcBO1xQRjP9oPCYrYz0Yo4RcpwMwVXkNU5vtBkaLwkySBNU7YTnqZxylzvW0EDQqlXG7rONePvA/viZEtbZ1+PdUAigeQsySAClpPbmC7m+u3wy7yL3j3V3B3/Mwa1RBeLhIklRsDz5im56QaRoWwAxtbP5Z3vrUFNAg41OnK8MNCAMIsfMJixtuQO4Sx6nY5r2No+iokVneYjD7CbuHOPdA33ad44ae+VlFyB1AYHY3oSKqz56mrAYuArRFp066zfLuy54LP5EAc/Hlgw X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:VI1PR0802MB2557; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0802MB2557; X-Forefront-PRVS: 073966E86B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(376002)(366004)(39860400002)(346002)(396003)(136003)(189003)(199004)(6116002)(316002)(305945005)(478600001)(25786009)(3846002)(53936002)(1076002)(7696005)(51416003)(52116002)(76176011)(7736002)(72206003)(4326008)(66066001)(6486002)(47776003)(68736007)(5660300001)(7416002)(7406005)(36756003)(8936002)(446003)(50226002)(50466002)(106356001)(16586007)(8676002)(81166006)(6666003)(81156014)(2906002)(48376002)(105586002)(26005)(86362001)(186003)(16526019)(97736004)(486006)(11346002)(386003)(956004)(476003)(2616005)(921003)(1121003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0802MB2557; H:e114479-lin.cambridge.arm.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0802MB2557; 23:Lo2tvnZp7E88xGHB/IGvdN8sNZMn7Ym8YtX44D/?= =?us-ascii?Q?wdujMX8CQ/1SqB4d6wkHnJyI+2IcerSm/whPA2RtLlqftsHEV5AdU8ssXqjI?= =?us-ascii?Q?K+LgVgVkFWxAIqzArLXkle62AOaDI3Ljz7qHghNy02Bf4liRgjaAjd43iNp1?= =?us-ascii?Q?e2KMRcFO0/mGN5FHYX2hEzA17dcIO33rSLS/x4gY3Ax0fLvPAOCDt/Vnqs5n?= =?us-ascii?Q?TbvBNcnRMancqVoKWqu9OjpgUUCdK6SWg0VCVgNjgS8cqLB6Zf5HUTVNkZDA?= =?us-ascii?Q?qeK2e3iHpv7vUcxYHCCrpUi3ZdwQs8nmQKIxfB+dS4wUf31y892P2aSfNwcZ?= =?us-ascii?Q?sPWnYJfSygj/TFhWPX9K2qi66fr5kP9gnsxmvRmbGxhFl1njjbmrk9WIa3f3?= =?us-ascii?Q?6mh02uhSYpzp5ulokMUHIRCql8sIh6m6U7PBLqhDQKceT0TdzQneRMDdh7Uv?= =?us-ascii?Q?5eIHZSAMCcwx5hlSNKpIAxbBXZ9cG9jf9Ozkjwr5hHVXFFLHzsAsc+Cw7mXd?= =?us-ascii?Q?7z6KePDUWVQvaYemUDBR4qE5zgbR1KtYmZcEvg7kCTAX/63gXEAZxDyr1WeM?= =?us-ascii?Q?aW5H69LqsHSG4qkC0dV169/zydmavEXWGEZbpVXg/lPHe/SINpSDu2fFaa9z?= =?us-ascii?Q?Eu8bt7hzl0Gz9K/USJ10MttYcFdHT929kkzI2W5NilNJK8K4eH69zx89IzET?= =?us-ascii?Q?EZd+shpSaGAW1r0q2UZQHSXW8De5gxTTMDsKDuwu/wI3OT36XPB8ZsEHDXdZ?= =?us-ascii?Q?xNtimM80ogwRYCjNis9N2s/w69cpOhhw9uTvK2vGoSQsSDQRIMN8CIj6y6/C?= =?us-ascii?Q?dGG2lbzV3gGd8FYXaZTkBdW7rQBOuF0uBkwyBjGohv8iQGEnIpQ9kInp0a4h?= =?us-ascii?Q?BPA6HlFoplE9U/MQvcC8pi6I3MMCyu3vpf1nmX69KOxo8704QR47X/boEJzZ?= =?us-ascii?Q?DVO5ZjujBWoWmROsqD64PYICZaUAHrb/zJPGO9e9I7zL2ELIFL5LSn+2U03Y?= =?us-ascii?Q?S790Ao69NqoxjMfJD2MRlGd8emLrFs9jEzgYQNfUViXJspjVns5XTKHdYsbQ?= =?us-ascii?Q?fYKYt1HvStKtsjvPUbgYjkb4pryh+VGeYQZtP8fkb/qSQY3u+rCow/H5aJHz?= =?us-ascii?Q?gSJ5eG6NGMVPnWTD6mxGwBq78KMzmqwupY8AVdzjXupKRF/EOlzw2vkoD3No?= =?us-ascii?Q?P/05h0wX4TtkzEsqjy1ykPtbvIG516igdKb6hytpcfz2EooGoS7YnBkaYk9B?= =?us-ascii?Q?nCg+iTT1UcxPwWUCc80LS2XxxIR3cokVOg6vYhb/Px7s6HgiJAjJH2fsM3Rf?= =?us-ascii?Q?gYNlgXg57EImZ9YA0eQtQVgZUEPBAJVakjbF9NmLlYkaL?= X-Microsoft-Antispam-Message-Info: f+HVYjLZRkyjvjM52sEwe4DZnAjONcofr+hsJTbdu+BIXoT+VkuE1I3Fwua4PR1rSJJQu1I7wtMM+l74bq3D6H79kmjRLiJ2xSBPhKgHi8KlbHux4kTPYRiqgZ/ZqMar/SfKD27iFThvbSMGS1KafIeBMtHFEx7prDmSJ/IUCHBp05ToXUVtNN+Q60hstf97ycvUElYvN+tS14dQKnLJms9S8MzG9L5Aty3atQjsSbnW3vhKIXYwq2cENCM7MUuCgBfUbdMECzqhNsYop9EQAnM4lQavNQ+jYTmo5z/m9rHYQdFhrZkFAet2Ps1t/KUbwTfMwHOypDNpZChQJZ2Eofc8gD06u0SGWqJ/2v/Wab8= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2557; 6:GvlntZ/1d3K5rOKT8N5bVRKM6IZoxBqwZHFBdGhup+DAO3Z5V4J72pJvfSCbdwZeAoB5YzIG4d72qaaMGcfO8qXrvGvBcaOUh8G3viuDYEh8pFsMQQMMkdgXoNKbFRCNkyiuRVp8VMQf8Cqab2MR9tgCVOJlm4hXqGoBUj0hPDsTlqtl787tj804fVRAo69LkOTctgG0YYGtmSNeTZmy+ssfre/5AppQCD9wtB1Bmu+fnBrQNwyNhZTjC4asiC8SUhglM02ICgnKsl3f3FPeVXM0YHBGZbc2sn0iRS3/EBquj0sRjmb5Cw7/AQCq6iVyjaTxc6nmHTW95esIZ8kkEa7AvjgJgqpVa+/nVYeAELb1j58/krWpNink8n6shTBvojp1nNyyxZGOHPsqxAcF1uD1bpRKB+y3YEb+Zms2uFgTE3scDzDOAZwPgW7bJsUiquHxBABEL8r2LUY03kj1UA==; 5:qqv06K2KuSzjfPrlvaXhIKYFqSXqelqAaaSQz/O5KtGK8dKgmLpXLWovmgK0B+lWUpWJA9vhOD7Vvm7B023u2fE5HhzqZlmS6F2g+u4ECqFKAFypipz3LQVeANdefhOY9h6pS7Dnak+x6tKxuidFawt3PJnnFFQOX6n7ndqcI5Q=; 7:DHE3nbXaJLI13HNLNouPnR/1VD37scu8YwoYfb0Own6IegVyBz+14eZPDzBIrkjxX0uKyLyWgMpoiXsWEPnDsZXmy5FyecqWR6mH4uK3h3mc/pzaVmDwJcpng9oHIJ73eIu0XZMBd3Ok8A9HVQW7fjbSJsLYFPkUh4OPeShaQYYGxBhk4bqBa3vbsrRUKco+RRnihXQ2WGjYjJgRyNfdHkICudmmqNpcEjUwtpZapPPKnbhXHwq3E7+EwKWE/nGY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2018 21:16:32.0357 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd1c9c4f-0f81-447e-7ce1-08d5ee8611c7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2557 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nd@arm.com, Alexandru Gheorghe Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alexandru Gheorghe --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index ca017c1dd4da..c08157686782 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3013,11 +3013,8 @@ static void dm_drm_plane_reset(struct drm_plane *plane) amdgpu_state = kzalloc(sizeof(*amdgpu_state), GFP_KERNEL); WARN_ON(amdgpu_state == NULL); - if (amdgpu_state) { - plane->state = &amdgpu_state->base; - plane->state->plane = plane; - plane->state->rotation = DRM_MODE_ROTATE_0; - } + if (amdgpu_state) + __drm_atomic_helper_plane_reset(plane, &amdgpu_state->base); } static struct drm_plane_state *