From patchwork Fri Jul 20 21:15:08 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: 10538393 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 04361603B5 for ; Fri, 20 Jul 2018 21:17:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E71B4297DB for ; Fri, 20 Jul 2018 21:17:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB45F2981E; Fri, 20 Jul 2018 21:17:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-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 8E96C297DB for ; Fri, 20 Jul 2018 21:17:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0794C6F0D5; Fri, 20 Jul 2018 21:17:20 +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-eopbgr20055.outbound.protection.outlook.com [40.107.2.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 87FE16F0D3 for ; Fri, 20 Jul 2018 21:17:14 +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:17:09 +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 09/10] drm/vc4: Use __drm_atomic_helper_plane_reset instead of copying the logic Date: Fri, 20 Jul 2018 22:15:08 +0100 Message-Id: <20180720211509.23605-10-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: 2d98ee2f-4bc8-4880-6c11-08d5ee862839 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:IM7x7nDwZWtO9vf5eJacwtRx19onLqtevUWdteRmupKjEiiK9dbFGk4+Hxhi7jroHBmE3EuR8n89k8GuSjHdXrEc2QE4AXgfv0640426CpsmYItJk9XgdQpdFAlbDv0PXQgxFCxzfaExS2QRNhSjbVyrvTg+wgdNiGXqoAy/uj4DCTQhSGxRmF7rphq/GVC2k1PdkdMTac8KrZTinsZqe7yIn5W3MFca1xho4DZ5xfKrzORCLMj4re/M1JdaT/4h; 25:NlV07PiyAjxtRBJKX4I9vE7p6mVUtGR2Z7dLheAxAKrgk8vdf4c4DgCuWuYmys5piY7BidHNWdL3L1WSZpuRmEm2KyLTfVcaPdbEQ2+IlwRqHB/2lPx0CPP6CSf43Gx8Ci/qGdQS6xDn7B85Jsb6ngrcT57MW03y49GBcm30j3yU8Tymp5DCOnJxpqKjIZojauN22afGW9Hw7DFTJrvWkv55U8d7xIn7wkH5RtoYeL79rTLwBmMTEPnOVpNbYnAnABf44KLWqrFx3geDJtJt+hOViil57K016XN+BrGmiKm8U8eUJMAU1gx3I/9btUGbFc0CxkryyQ8h3FrvXjCRig==; 31:LwdltFOjGEzmfs35E85iz+x7PsbfZ2eNRFNBvkdPOYt0b5P66gIFcovR+LJdmMfNq3QwbsKYALFWP51om/cpfMQChESHQ4zC8GL63NgR0sB5xj3YGJJV5Bkb2kG6ktQFgILoz+TFGy+2JDTjfcHUz2sc0jKbcPEPdhB4Hy4SFVpl7VqphYbqtBf9IE7/uEVLhqypi3LnFQJ6NkBc/f189fJeSubCEUFrLQ6Z5rnbrt4= X-MS-TrafficTypeDiagnostic: VI1PR0802MB2557: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2557; 20:HVuYYOrC0znARKosoKanvJCcbSY3jZJY3a6aUi3bc+rrAINFo49ZbpdZjZK6lbyZRAs9xocHmP8/EY4QDHMfgpVCKsS49yIZpmfD+eHvHrP8pqMbxglccoNKI6krNwhdkJXKtY0xSm4u1I+vBFNnObKYjlpFnCmRkOW5GtvNst5lg54bAok1NE8J9twvRApIC1gwwOoYCAehklV52cHNlvPpMxijLzRgD+J6hXYegxcGK/Q71j124Y5tuYkVVAM1aLF3EThBzD7KOMh0+g1FJBf9QK2eS5XYBsNFBh6baPJDVrqB97xDkaaYbzdFDnIhltmm1weAaugEV5Uk71lIbg==; 4:oS2gCtM39Mv7LmBzENagPX3Z0kI/bUwVqsXnv3coT0hesfCMYlHOntLN4blv0abs7atRqnxyqgFQUKLi8NmkYsZ8YfK3O1N3mxa1ESewMfX5PJGlmTIOYHLTNX3OhXnlpvdvtNpQ0PcR2+7V03YBFdDHdsECofE6QR6hPRF7Kq5MY7XkCxnHR2I9CBAOktBkiCrVGGLUOxloJGVP1pEk5YXyCvfvjdDhBqA+szIEn4H2OgE4mAqIvkRfMibpIAXYZL6YP5cYvNddGdmvSJgm0cPjKLTO0q0ahyspq76qtU2vQIpyyGa5mMIWjAwHFwUL 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)(1496009)(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)(81156014)(2906002)(48376002)(105586002)(26005)(86362001)(575784001)(186003)(16526019)(97736004)(486006)(11346002)(386003)(956004)(476003)(2616005)(921003)(1121003); 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:JZLOfj28RRtvRHO2gPSzwFrhGetdRfeNQOn2xnD?= =?us-ascii?Q?PXxmu+MnsR2yz85UMpeAWDFD4TYOIrK8Zvu6kOTUhURJQ2R1g7McgZUi+RvL?= =?us-ascii?Q?kuTxUjpBPJ97pf62ffhX+dFOnKJ2g9dbSCkBAOoMgJANtc2Eaki3+9gmD+9t?= =?us-ascii?Q?m/KAUlHXLwZvFmca0M7SmgcYifOT9Fjp5buU6Y58dINzt6BX9yhfyNQxTY4q?= =?us-ascii?Q?m+7r7hUkSGOPXplr8pIZy4vA6oBG+qG9hyWhp4NTN9sHER3YrfzZJXCviBo/?= =?us-ascii?Q?viUY8BgL6tLdzTOZzujQMy89y/d1059w+bxHDD4emKr3BQ1msPBtrmMfn/oc?= =?us-ascii?Q?J7WoKEqG3FpLSIaBmAX2QA1xjDbm43sFcJ0gWNx0y/QEf6zAtrEk0rwPok0l?= =?us-ascii?Q?5JMEaQtJtYVNyHZywDrFIUkeMNKatb9ag1XRmYGF+s2a3/7dnyfFhD+fTOce?= =?us-ascii?Q?i00Cp0tiy7ADEa2cZG2XX+ZbI0F/X771a3T/r9PYz7+spAl3Mgvv7hXqNXDs?= =?us-ascii?Q?b5s0hWzYQwMh3YnPy4AsqIB2VLeQ3DqY0Vm927kJxN0Kr1vRTWLHfCdjBKqD?= =?us-ascii?Q?fSrwj0OV9nI2wwXie1dNf19ZHctzY1ACiq5V8P7WzSKJSIn9MmteZpWfBABw?= =?us-ascii?Q?H+leAgDTm/oVtQMoi0pEg5VCOCEeJ/5G5UmNZEkj4UeWNNMAQNgKJqBAoahc?= =?us-ascii?Q?miVAmCNuUax1aZNNyH+ecvuPoU1qy7lIx+PUDSxAbnRAssZXEtXY5JWsvGxe?= =?us-ascii?Q?CrTUTJhTbJRHY6SpIF+w5+UjgJfr/GywZQqMyNrnFFaMQVPW2c/xopXo2OEK?= =?us-ascii?Q?90MloOXv+eW0ZJeu31Rv2H7QRzAjyYO4e/LahDBLVZ+rY16GJ8gx6XW7WpKM?= =?us-ascii?Q?67fwwuSo9PMK+GsqxrZyfepaTcO6WATSCxdM/ZXTK9eaZ+S/eWWbEbGsgjak?= =?us-ascii?Q?eE3FPUg6mRION+RWl4HCJC7gTtCJj4NVqyXL9UFp/R6W+i6jLaqcJwb4LJA8?= =?us-ascii?Q?c/gkbPTRCPlwwy0XxTfDEOpvjapbsHqvXyGfZhqptjejmf8ur/7lZjMKoI9H?= =?us-ascii?Q?sr7sQzuJOy1Oespzctw7SZ/aobYjvZaDVOF29YCZ1rRbTu+jC5oaNZQ9W/oc?= =?us-ascii?Q?pVJr0M+G3jlhfX08dFdSkOa0/gTsjkRlAshPyrt3pgYzWGd3msi+dTx5Avou?= =?us-ascii?Q?okILW0oZF0VOyLl692oeZDT7EbB51IozseQQfFvuvq04tpPN5verPnaBtzcm?= =?us-ascii?Q?bclDmL0QqLh5JzKBQeTuDZ0LoIeba4v+azV1Hmnkj?= X-Microsoft-Antispam-Message-Info: 9JLmJbwg6hyzPuIX+7dj95eHw7mhNnmfnmV45HEQUiWO5oB/CtmLnwBM1CCg4pVPtB9Ht87ewszhAqoW32jDX7FDT1ZKE6nn8h8+uEwbUVXiH4WefjrZsZCmU7xAK8Mx7HBVyE/yIc9xC4FVbkui4zn6EtXnAIXNIaybYazTbe+tyoUzTNknvtJsLQx6JvqRR06Qe8WTe3O13UeZMOznUchegYRBEeqBwfF0IN5koPFkhT8bCZK7sjbRTpie1NradYjlE9ZFqIGHHV+Jpp9aYou88lvMrDJ534YZlvtU1UB2GGASPV38Z6TOIjIXA4ixaEdjsJnzgEGW1q4UwsH/BK0SN6jywyBEr2RTwzbbsgc= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0802MB2557; 6:X7lRFWt0RP/FSDqzX6Is1InxCqtrJCgbMCXsjqxNU7VvkIwy2vSSpuMhiXxzoRm9zOEpztr8VNmetiU7idH43DuZlWtob4y1GbaHWGRB6TyJ9bgB0enF6xbbnc5dGp5DZm2r5A+zwN2KG4Iv4WXNYMr2KF+1UzYOVQl5K1XgCJdlWfxWt07qQNF+yUIElYAAyG31sb7C0mOBm6J9ga6/S/sKgRU6OQC3Ds8IF+vvGC+i5qYajqBE0rOStB8qbtExt/5U0k0LwRUKfONJsHELs/uAYBUrbX/zjfzT1NubCykBDQ6cbYWwXHGcKKq+zN14Xw1nBreW5axiiL5jlNNJmcQxjTkPZCPIk2v1kbCkQD5cmQLuItsqbqhS9Hw3V9yxWpKlo6WEhnhVaacG76SDX9QJBdiAAEahsL+VejdTpPy4Ed8IT9fYBS8wgDXntJkxuxS9rkWG5ps2BqeqGrhS7w==; 5:brUEcNzR95Bw6Hn6p1TZNP3KyuSfp2Rud+id82hSsB9VvkjBQfgiropSAOHoZDlAOmWbtjvdX1cqgY1rBGQ5wGnDW6JBJ5jfqgShVhBX5DFGGTSt2uezXcobTyQ9zk8ODF2Dh2peER7eQf8Rh8H03qiCWoLWgBr6c+e72GTYKyU=; 7:ZepS13xnsl0YldkGtYgNDOW+T9s7i/DYtp8MHfuImW4bGuUKKFkNu5tFx7gEaszyckAHT25vmthObvJcwPFl1ksxppkT539RQrQ/LNn1VFbirze8+Cek8S2ZrdXAATu3hMBsYaYyx5V0bcoZrJfsUaMXw8Q22V07Mfexa4Ev71qAT/brqubsZF7/85jorok21W/659TWpSUvFdvb+7nKo3npwqQEKkKFqxVApmuHOeWITw+toY9lor+0FsNWGUcS SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2018 21:17:09.6298 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d98ee2f-4bc8-4880-6c11-08d5ee862839 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/vc4/vc4_plane.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 9d7a36f148cf..688ad9bb0f08 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -200,9 +200,7 @@ static void vc4_plane_reset(struct drm_plane *plane) if (!vc4_state) return; - plane->state = &vc4_state->base; - plane->state->alpha = DRM_BLEND_ALPHA_OPAQUE; - vc4_state->base.plane = plane; + __drm_atomic_helper_plane_reset(plane, &vc4_state->base); } static void vc4_dlist_write(struct vc4_plane_state *vc4_state, u32 val)