From patchwork Sat Aug 4 16:15:22 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: 10555785 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 426DE157D for ; Sat, 4 Aug 2018 16:16:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F64829CF5 for ; Sat, 4 Aug 2018 16:16:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FA8329C72; Sat, 4 Aug 2018 16:16:10 +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 73A3B29C72 for ; Sat, 4 Aug 2018 16:16:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7268A6E12B; Sat, 4 Aug 2018 16:16:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0065.outbound.protection.outlook.com [104.47.1.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCA736E12B for ; Sat, 4 Aug 2018 16:16:06 +0000 (UTC) Received: from e114479-lin.cambridge.arm.com (217.140.106.49) by AM5PR0802MB2547.eurprd08.prod.outlook.com (2603:10a6:203:a0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.14; Sat, 4 Aug 2018 16:16:03 +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 v3 02/10] drm/amd/display: Use __drm_atomic_helper_plane_reset instead of copying the logic Date: Sat, 4 Aug 2018 17:15:22 +0100 Message-Id: <20180804161530.12275-3-alexandru-cosmin.gheorghe@arm.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180804161530.12275-1-alexandru-cosmin.gheorghe@arm.com> References: <20180804161530.12275-1-alexandru-cosmin.gheorghe@arm.com> MIME-Version: 1.0 X-Originating-IP: [217.140.106.49] X-ClientProxiedBy: DB6P189CA0005.EURP189.PROD.OUTLOOK.COM (2603:10a6:6:2e::18) To AM5PR0802MB2547.eurprd08.prod.outlook.com (2603:10a6:203:a0::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 899629f2-490d-4d5b-ccf2-08d5fa259408 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0802MB2547; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0802MB2547; 3:ydeL5gF/7Ph2NlsX8++NMntQFF5L87lp25j3MnFD932L9jixAugDSulBNf4nEDe24MkUS29ahkFuoRU7ZjpHn+QhWShKGIJvLw6STO8OAod78bOzep5krr6fJJoI2Klv1T4IUW7Fn3LoaXKn4muAQVpVFh8kipE1L6n+/gl8aZlv6jwuXIb0JytO9sATtCYPfVGqFxnNQrR1saWYKkusTGp9wYrlnngaNuzgjUpxKwtWfaGun1YYh34gfRVcsc0/; 25:zxIzx3O2uuAZPQuh3S/vOo2PYgxTORK92Un4MCAuvVK94BKIebYR/ksIj0meCToGfmA5BxZQItE2Qj1Ekjmz61d5BZ4m1jc8WRXEncjJXuLPXSTgQZXi8INFHVajQEeBusn74guDgE5aH1QLa2x+ZhJe5cEoBpPn8izrY32NYBBUQOVyV4CXwA5hjqcgelRZdiTLxMQFbe7qvKzR8CobRz2C625nJ1xlrPuX53Q8ctZ/4tXAbKIdlm9aPVGPJO6qZFq23rqJZ/soFCWe3olgGxrgX2AhqJFWrT9tpsHwVV2GgcNuDu9PuGHAHC5u3lDCYYAWRgD9SYVHlguwOnGbkA==; 31:kkQzOOI81s2X4gFXAOV65+i7oD+yVjEUG6GeidnPc3plz4JRWgkn6m1aiJvfBPatyiRsQaAtjwCo/dtaKq6O2E7MmxHFToXtUn9bAv0TcIAghy379nCmH9DqtPAe5GzSJpsRIWOXgGNvH7nzeKas1Ee94ANxurynBWi53Lpp7iNpTKtWMzN/Yzjz+pnf5RYNeFZ30WuJmzD4309mZoJy3nnqkvxLHrXOT6N3a1pGdm8= X-MS-TrafficTypeDiagnostic: AM5PR0802MB2547: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; AM5PR0802MB2547; 20:L5iRXEw9brbwduA+1topeaf2Sb8NZygjBaCJfaTfY1JhhlXLMDFSR9Lb5vA4oe3w82Nijyz4qoqGEmLXhm1yElBkuY/bOGBVb3GKTotOwACkMGH34Eg5CkXIvhBF08zLSaePy4T17gRXDM2OgwmiaOVI8t0rJBP5EJsV5iAGUYVpAlT6ncOyj7CtqOJ4MR0lid34ryBmuneOM8Yvf7s7c1G8UgVruLKZPqgW0jikbl53Fc7+7xRc7IuE0ubqncqaHvcAJLs3B4NPNHQ0c6z8WZvqsnkX42xSCKsByHtNE3UDM34wBiZ36rnaSPWPMY/7OUDNt+19RbsFEouaRNQaSA==; 4:u2QOkbSaNgzHyl3ZN0Vaj8DvsCRD5fKDKPtnn6RvXdQ65yKphcJTTdqOv+ZAshCQDGEx1tksn+IoVP5+PWYgrJW+Mi/8wNf5dFTPOf5kLotVGzrXiLnpUlpuu+azkAAvpssoiwH/1Ao3bwZjeEusQsytkjlzB9/gPgUKzrcxQVkmIH/lwYw4z7gyA28VcHthtefye5korhH7RZySA7NRYTdmALoIzs14b4sjjLx7eV+EXKSpK0aWIjydBXoVFQUefXuoFm1tFZhMze1xnf+QeaixbOFQPlNH5adfiyqLVbfGghQ3/9OiXfNe88bq6xMviydRHPvwi+HLdAzOnGMvLA== 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)(3231311)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0802MB2547; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0802MB2547; X-Forefront-PRVS: 0754F7E325 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(366004)(396003)(376002)(136003)(39860400002)(189003)(199004)(51416003)(86362001)(76176011)(7736002)(4326008)(66066001)(47776003)(52116002)(97736004)(7696005)(305945005)(25786009)(16526019)(186003)(105586002)(6116002)(3846002)(956004)(106356001)(7416002)(5660300001)(446003)(1076002)(11346002)(26005)(6666003)(2616005)(7406005)(478600001)(53936002)(72206003)(68736007)(486006)(8936002)(36756003)(50226002)(316002)(50466002)(81166006)(476003)(16586007)(81156014)(48376002)(386003)(2906002)(8676002)(6486002)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0802MB2547; 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; AM5PR0802MB2547; 23:0eJOkbOR8Z5adursk7lhyS1GprKEcMr5fIiwmxH?= qT3luBzI+J86FWGI6Gex8K/VY67Wa5Fva0FKvT7bpgOl/PXJqlChOCtmqlGttFVTzIgLasKcCrF/b3K9n9rfux6hn1E2eKGrj2qfhBm2lzW2j/+BOPICERxMt1xuYJ7cq2zWezGaPVWgIArvkWqJmPlwpZawwna90no6FG1PxIgLYWK/MkIVkIe7fMSyH8JlLfBkeeJYVWeSYC2dZZEWoQ83lOnHFtvjtkna7rR5+RT6OAO7eKyEbwhvWpOJYbFaM7pnu6xe5yTHS23eGuc+OEXLW0li+Pz0baPPagb6RRFA3EJxryWHa7KHdzG262nmwiNSEXdI5IAB/dF8KhO9P5Z9D3WwRjplKLzgpzfdlegLCMXp/KHoB5JvSzMPrKCTiKkDy8zZXuK8GT2wrNBMmO53k9Q0zQ+2t4R04ABon/QqwVeit07QdxyRz1xdzuRT2fV8An1ltryhZpileQMzuPUhp6LucsbGZXZimIbhRf+JaFTvCRrwkqoIHtShEN19mwp3sC3eAFugNnm58moZEWgdvHzpZ2vxE/s0ayl1TaKZfUcvEyQ6xI/xCuyBVFgfceWtF625v5ZHMfOIe71bitXmtaiCg/ttpYBBFuZ/1WfLNL3aOj5Z4rFaDAM8Or6Xi9ZzvdpIsMwvO0niRIjNgY1itnfUP+7TeW3GzysQt09IFMAtW3arwOObzaHxsedw4VrkQoSea27EqHreQYJyXMaBRYJPmpR8SbJcit82ejLUZNK41QnleoDJ2FiFuWqYaWgd3Prga/KcbT0c/WMSp7ICf0wz3rQMtguvXqH7f+oeH8B+3n5kHAcjIJkd7x0SIqAuEQ4mxgKl3FmZ9eR+7cYgcr272WdV/DU8YyCvbyL5Av5RHvgwQSMUus8xYeBWePCCAoa43ArUTTWdPGLjvhRZrnB/PFNImV/yXFTN6fL/h1iz5O0tmU/XpFJZMhPERFb+nxxQJ/Qc5y7UpMidDbHululOz2mOnCcWJICrXpL2XmKOvkIXCZdwlLP/qqUxzyoxWKYFK+vbpBCMiYeNehah9mB3S60xRh4Rpd9gsMOn4eCTmQ7ugqlxZiftKX/CWNQ2iNfwGMA4WpVaS/xK6knvtzYw7NZ67HJzOdqLywViHiUtcMomJ3LknPwvMRzor5WVYBs2tFviENuwVJmzxRUr5nf0A0UN8uYE7SaVN8xMLqvDmaWTag3qeeYCWK+8/OY8= X-Microsoft-Antispam-Message-Info: aIToY082PLVVhJfAydNJto2WVbR0atFMYBMIQrYlEWo9wJeu9J1l62Xm7M2/PMjNh/cfU+frPaGuK/tw7hTj9/O/7nYZsxKaecU3uHvqRLTh14tatsOfWfspChJ/9ek26K1s1xn8B2fhGl/zQ/Pb7xDIPVVs80XMZNxUkRUS8Xxrp4tQfj6DAD/+IVG/KNWvNKkj5ytJGqQvucc6OKQRKZmTiFFkLuMLYH8cGvornr+ECjCOxW8D4MR4oI1e8pVtezpcAbe31jK3wfLXJi4bFygDo9SHNkGSJ/Xd87S3alPvKH3MufzbXlippCrm6Ci9/Os42p/nxEWO5fPYKe8J6FrL2gIpeVMrOdgzXhuuUOw= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0802MB2547; 6:H2DlwjUlHAMP9WyPiy5Uu09C6HgJxMh5e7qq3xaMNNkFySYqkw3rogdw/T2kL4v6/A7RNl+lHnSc8O91dfXRCKEq41x8PyuNjxP/AZOOFsJ6mlVkKevUNOgkaPXU3vmyJ75AJJzipHY/1mkuBra+Gm5beBGVMx7KB1pv4RfDkipfn5WHIBp48gHPC9CIdSpdcR86YKj0mKoQZNsYyKeNPXtAQ0I0Xd6OmjH7JP8F04rQWY7yRcLS6L3AjvWoG+G6HrXzAhMCClbj7m5l8/petQ+0LKPV4pCS2ErJNZWGfFCoXWgHzW3jXKCGHELlxDX9lXkKm3rLR88JnyHhfSBSkdzT2t85iQQI/JUN67w9DDsv5v6v0Ef8GPVMSjfQwynxPKPLGkhB3jDBihuwWKFi23JlwkxVpcyJaNq6fqryFMaybXThfqFrZA1rTtwjrrN5nZlnjUN1S7HEn6Zs5zY3LA==; 5:Vzpp0chgN0BbQLbpovoACgzixmOxNSMh6bfwHfUi2pRwU8wh8KcBdUn1T8QJcRDd7g4tleCPKPBIxxoLckLw3NrssYnaTC2QlX2UWBxs4MMvS8RmaTyEQsVwk+1YGDXNUsyaNh2j96t3po7zb8MBl+tyVuC2kgp31kMd/qvg0z0=; 7:Rm41WdW+ihDWkGS/uYq6uWiX+JLHh3cs4hqtPvpnZeB41VgFOxgQ357wAJJY9UQtaWM5ZENHPZ1QdlFHJiJVCBeyqSN4er8mU5mtt/mQCv325InvJfvheMbueJpTx9TUiZJBYGkOcqDxtSaDTOHRvsCuP+IvOOjIfqxObr0mCvqdZX6gGqycdMAz1KBOxdkZySRm1El2EKiTIYPh5HQY0MUVorIteoRQarExgRnakW6OKAjJ6mFvrSTLsoVML83s SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2018 16:16:03.5151 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 899629f2-490d-4d5b-ccf2-08d5fa259408 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2547 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 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 *