From patchwork Thu Jul 26 16:17:48 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: 10546117 Return-Path: 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 B0D6F139A for ; Thu, 26 Jul 2018 16:18:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F2B3296A3 for ; Thu, 26 Jul 2018 16:18:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 923E72B898; Thu, 26 Jul 2018 16:18: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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 AC9882B891 for ; Thu, 26 Jul 2018 16:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731007AbeGZRgK (ORCPT ); Thu, 26 Jul 2018 13:36:10 -0400 Received: from mail-eopbgr10052.outbound.protection.outlook.com ([40.107.1.52]:34018 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731803AbeGZRgK (ORCPT ); Thu, 26 Jul 2018 13:36:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DlpQOLnwONaKzLpnF0WxrsliRRlfdmWDpIzV6xFwsRY=; b=f0PM3RC9C02L8qaOdvC0D1T9wthR2AofeHUnmsuR1mpc4tcyiSB42VQ5JZSGSRTnd2doZG+PyAjSeQ1tdAPzjLtT5cleEoBdCaXWu0clqet4+Mm2+kneFdaLIs0U0TvrF+1ahPnMLkwrWuYaIx72H0xes9Vpb9YipDx1zc7aGpw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alexandru-Cosmin.Gheorghe@arm.com; Received: from e114479-lin.cambridge.arm.com (217.140.96.140) by DB6PR0802MB2552.eurprd08.prod.outlook.com (2603:10a6:4:a1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.20; Thu, 26 Jul 2018 16:18:30 +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 Cc: nd@arm.com, Alexandru Gheorghe Subject: [PATCH v2 02/10] drm/amd/display: Use __drm_atomic_helper_plane_reset instead of copying the logic Date: Thu, 26 Jul 2018 17:17:48 +0100 Message-Id: <20180726161756.1794-3-alexandru-cosmin.gheorghe@arm.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180726161756.1794-1-alexandru-cosmin.gheorghe@arm.com> References: <20180726161756.1794-1-alexandru-cosmin.gheorghe@arm.com> MIME-Version: 1.0 X-Originating-IP: [217.140.96.140] X-ClientProxiedBy: AM0PR07CA0031.eurprd07.prod.outlook.com (2603:10a6:208:ac::44) To DB6PR0802MB2552.eurprd08.prod.outlook.com (2603:10a6:4:a1::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d95161e-e8b5-4310-2a4f-08d5f3136e11 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020);SRVR:DB6PR0802MB2552; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2552;3:tyGP+jSk2YWRnjKdgy90Sun1lv2dD6QYRlnuiDndxrpBdDDtzOIVzx+3f3FRKq/XkWQqQK9WvOME4cGQ0uG98d2SLdnvVjiwSlAduP8JC+zrDY83gGenHWX4HgEAi+cYAjeVZc6HhmRG5zRp/DCG1OIfxyBuiy6I101ZLskGV7WtJ5o6C8ZSMbW4UuBwIbPDm4Fj145TJeJgwON3RFJm06zaa133A+cEGnhjX/olwKfDfePuwy0j/2STvwPuPclu;25:qFXBl9xMBlINAgh3voyCmeOQv2LXZI6xUU6Dke1yv2lZaI2h54KzMch0hD10BCI4MHet47T2YWlZlIawHKoziEenCd2y8I5ycuQWgJB6p22VOy7V3IjpdotBWwYlC5l6ngZ9rkKrfqO2kGwQubQn7hnLOwpw0VOEiKGtpUcco3HW8Q3hbm0C4w4nVqykcJzRcR5VBMf0o8ld/Q4aOfW9e4CE0Rtqm6bXqeiu3g460MKWmI6wfBmyCHIPRta4bumUoGYvkS/99quboQ+lmfkbeR9Jr16tSSzgcJ1O5oP273BnscKgIWWLZYH2WrN/1zBc8hdLBt7T6Hc+bThLXxFVaw==;31:yk0tpWjQ/nHTmoKPbLW4oAKf/BDj786ar9TRfhYMifwlUQRBTKY8vwogidruXY10bET4GBLEkAf5l4EXtJh83B+9VYxg9tGAAttFuZUuWJjYjp7O5geUuq9nWg1mcAEY/GyUpXEJoMVVdjpzOK4Q6fUf+dN/ovDFXGTmCbeJ60duxp5ZdxFpcNNpRzhjETL9jFwonaMCtRqM5BJruN7ZV1ZtZNbsZrbW1Wttq6Y6inw= X-MS-TrafficTypeDiagnostic: DB6PR0802MB2552: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2552;20:vL5xk22Z1lSZp0ChA1i5kFrnaZBCpKZXzcRpbiIk/QoNVteDVYOjbxPPWDMbsMsHxsfWHnoKSdLW3PRv9hItHCfmhAZwY+RdYiCBbv1DPGPLhD+DUqYiJBwlOk27NfLAFzHU2Duh9u3FXNSwQsJrqglArxaqEmOQQwzNcdRqECnovpc61iCISlCwiI04rK+2Ni7aaFskfOMaFLIRRZr/XdIx7LjqXAr+/uhDVUdQ/mWz60xjNnLhwdAb1BOjC06/ve+Dd4Y06By/7re8dGsVx0H2ECnmp17yK8WsbV25bYlwGI6cyAcquvopXHmJPMuQvQpaKpiB5YCSohkkhu/Jcg==;4:lkPNk7BwL5HNRTu/a9gZa+tC/IfLLqMvBz0LrxBychqhUkmjgzzENnc5vIG0IyiXsk4JH/eUSSBezAfF2FVg34nf3ieTvBY20Se+G3A7K1LUaZg7Z/oD3fR1w3FAlVTdVb6lyKidQcykAjwae9VYrWs3BJ5Spr1Mh9fAO91zrPsp50fTplGriRRaOuSbYyBD+rgh/+Ne1Iya80x4Up42kobu58l5yZOuvNKhtb+R6QEIGmRJr5aoSJd1w1qkeniEcXIPuUXdpRjSx0m/7iH62tciDnVhmZ+0cRz/6YB5UCeR3eEVKNPtUcFTWNga37lbYfxRfLHdBdCf6QsD94f8V+x+7wMqwgrRIRj8lN2v1E4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917)(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016);SRVR:DB6PR0802MB2552;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0802MB2552; X-Forefront-PRVS: 07459438AA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(39860400002)(136003)(346002)(396003)(376002)(366004)(189003)(199004)(105586002)(305945005)(36756003)(8676002)(478600001)(476003)(2616005)(81156014)(81166006)(486006)(97736004)(50226002)(16586007)(68736007)(316002)(72206003)(956004)(25786009)(7736002)(66066001)(106356001)(47776003)(6486002)(52116002)(2906002)(86362001)(446003)(1076002)(50466002)(7406005)(11346002)(7696005)(3846002)(51416003)(6666003)(48376002)(53936002)(6116002)(386003)(26005)(8936002)(5660300001)(4326008)(76176011)(16526019)(7416002)(186003)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DB6PR0802MB2552;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: 1;DB6PR0802MB2552;23:7JavtrL5jHtLbDqPhRiC5po7sB9CmmGa1EvAzl/YbedUKhMHi7IOM6ohBP7RkvIxsTn9E6W9lg2htc+GSM22abp4DLs9tgnLt/GcqWyGfUzkG8b3mrMxM6hcnMzSoSUjwqiaYV4M2ce4EdQ2/LvY7rLmuc3K9yuhw/zl3RwcMaqUXbK9V42VgCHiUAlsoeQG5uLVBDicPEyfnTmrbpzinRtFQt8XN8dVYuk11nobVwYGgMiOPyxq1+9cxYVuLqkYMIe7rswpH6S3/TVquMFDRBxfRqxPwXK2R6dvmUZY+N+d9Pn5Odm1lGzblDmnDzqBfh4hHDfpI9gyxLFfPv5VnJ8V6fNzCC7eEXUV9d6qQn/ExQFHD/VsJr/K491bjSYSWp+62MfZyglHGDEg3agEQKA8MQQPJpGgJoVW+QbyO8ipS+PsacGvrMKXTYPrMOAJ2ll4TUpiYfxnZ3RpU+8Ng5n6dVrlN21Qma0QSxtXEw0bhTQn+b+s5K9PFPCrIneWmpUiY1nrtyaYu2wpQQoZ+VG8iJUdiCY2gIhcvqnwdnl70JBKdBufXeAMgEIjnONhojpRQ7B26lghjDlokJHzhp4u805HqTjrVFvyRDHc1jCQYztGx9Rf3So4IuwdjJvyQdp015CCgwysfbSKq2Np5fRNz+4234If0e5YO3OuXYCE4goBTuFsWt9U0aUEgQkOeeXwUOYyyceC6J5UF5J7Gch4IjGuV0P6MrReVM61CZHtIY+WHP3S8d1NlggbjLE9Z7mFlB+6F679AY3yRWoUYWnl1xmwe4h0iOljQLNCdLcmS1esH0OjFXGZF7fa7GMW2mLEufhiyZXIlI3xyWYvnEY8T6l/t3GE4Esikw+WhA5CSvl0LGAVN8VA8mN5TruXLLpvvu57TytAsQx3jz6ehJZr6h7FbCPc3qnnJB1aGhas9XAeFeLrCtDAVGd9tfNxtLZ+D1ZNz9Dy1tdlwQNLkHCNc2PHzEQ70y5Kfbj6ux9NhhJUhS9dPDAWy3F565op+631Zjl8knXv/HZLAW9CY81j8BhBk/K0aq89RD1ZwWGDF/j8B0kO5suk4BD01GI7Q/H+BPjHPd2XBMMqO7xTaoQczJDMhTqRDjcdurqF08PWYsOX3H/lnTtvoVJrxzvxjnz1KX/tiSrdI0YtZbaE2Qn6wlg+dN56SYsfZw3vJdLJuCCQgyajldrEteKz4UYLWNj5meAbudwO2tLapVfQFza++hSNkf+Te01ajsiAXCQ= X-Microsoft-Antispam-Message-Info: MQYXaDIoaC4FelvvtG5dJ2Ljgf7OVe7/vJWn/K0aLX7QmX1nMb7hINOCGNxNth2VNBPFP/yqs861+X5TpmMXPUjOKYtH+FkAACNL2cuI3mfghPuc0QA+K+GuSxd/bU+1k9Xm/Wdk1WJxdIP9MDxeirrtJ+29+KsNr7GQMRo8MpvZet0xRNUhv91XMRu6JrezXZxUAZ8vl9NSk7bXuO8QPABRopTGAWKQ/35qcnVOKUbg8lPynj53EJssEwyi+5RYZdqWFKFt6i+q2pRq2YDCwCOVTuVVa9CbelKJIedomlSsnEju7mBgbLYImYQ3J2Kawykvyjuc24FYnuZEamTa7GBRWWpldK/8TiIB3OF3sUA= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0802MB2552;6:hekpwW7eBxEZ/Hur/9oGJNznjW5fnNTJEsR6VOirRRBV+LH5mxsziT3vKe5kK+Rnf5FySf0QzB2/kqTFEdZ7iSi1uipqIe75nVuhj0lfeDpd+UqAp3dE9WXEhV+W1tSEsXwooxcNfQaxhSKZXBid9Gh44n6oOR7mDPDYrbgyg/W87nZ4e/XJC/ca3qbb0yqtAaWczRjO3YgSsPN6BacU8NmDqIc0mSlxSEjPX06K9HoD5fQrK9tK0Olgn4HAMiX/o+0pcpCdXvZATeS4B89F86i1mDVsMiAj4zWooFUu62BCnefwBpN3fuErSS/+bm8qP3UX6nJZFwy9oedk1ydLB6EPmLohhiNIgKu2OIdMlH0b0NLEuc6IGPg6+9f2TsTMC+09fZM8whZ0pPz01UnY+PXNeubI/FU1n/dhDsDNyjvfdn/MZXZ1KY+nOMNfWZ9p4XGxAbeojA4ZeazAGPvCMA==;5:HW5MI6J7Hs54UO3suyxld8M2cHw3yeQ5SDrVf4PlJ/l81JWllQ2gNl9OrsRxhmzmkzUHtJ3oKtkqbSMtLd0qOcAvbKL0nWU+ISDVKSGB48AZ/MAaoaLVe6oeWQJGPcMFkcitWaG2grCzLUQlMsaMAeQ/7YWB/a+PDPCbekVbKwI=;7:hXv2ATpzoFxVfnGgfhZrKmV0N7cRQIaGCC7bg/ucESbMV6p9QAltxfQF6RuPTpnasAZDsbQRKgRK5qTYv/vKvjgJLf5szCoadR8ByNVxpgWiDpNJXaDhNB5v8hEbBRwPkCdH1eWESh+IoPXHHc9kD5j8fO/AqlKkWyDlDpzdoO0rAJ9QSpruOCx743ipVturObPX0pceoF/t82qryI6jN3n7utGZM0XW8dAMuD8JrSv8MNn/RTEV0NA7d65GL87X SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2018 16:18:30.5148 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d95161e-e8b5-4310-2a4f-08d5f3136e11 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2552 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A new helper function(__drm_atomic_helper_plane_reset) has been added for linking a plane with its state and resetting the core properties(alpha, rotation, etc) to their default values. Use that instead of duplicating the logic. Reviewed-by: Harry Wentland 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 ae09331eed00..8e4978d5b83f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2965,11 +2965,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 *