From patchwork Wed May 30 17:30:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandru-Cosmin Gheorghe X-Patchwork-Id: 10439737 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 7F56C601E9 for ; Wed, 30 May 2018 19:51:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 718DD2940B for ; Wed, 30 May 2018 19:51:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A62E29486; Wed, 30 May 2018 19:51: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=-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 B92742949F for ; Wed, 30 May 2018 19:50:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CE24F6ED08; Wed, 30 May 2018 17:31:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0040.outbound.protection.outlook.com [104.47.0.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id 956A36ED08 for ; Wed, 30 May 2018 17:31:31 +0000 (UTC) Received: from e114479-lin.cambridge.arm.com (217.140.96.140) by DB6PR08MB2679.eurprd08.prod.outlook.com (2603:10a6:6:25::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Wed, 30 May 2018 17:31:28 +0000 From: Alexandru Gheorghe To: gustavo@padovan.org, maarten.lankhorst@linux.intel.com, seanpaul@chromium.org, airlied@linux.ie, dri-devel@lists.freedesktop.org, liviu.dudau@arm.com, brian.starkey@arm.com Subject: [PATCH] drm/atomic: Set current atomic state in drm_private_state Date: Wed, 30 May 2018 18:30:52 +0100 Message-Id: <1527701452-1934-1-git-send-email-alexandru-cosmin.gheorghe@arm.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [217.140.96.140] X-ClientProxiedBy: LO2P265CA0216.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9e::36) To DB6PR08MB2679.eurprd08.prod.outlook.com (2603:10a6:6:25::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR08MB2679; X-Microsoft-Exchange-Diagnostics: 1; DB6PR08MB2679; 3:Tt+0Bj8hCmFSPw1ULBNDtL/11yCMb/zq1VphPtD47udAKHPOVa77bBcXUxX6QjMYeZRTbHctCPzhAXajD7SHOKUC4ZN/LRaN1x4aOt838MLnG5mwY5Ru+NglVumieEp59tkR+CLsfndjsy/n4dDZO/oL7dSqcZQ0HxYRJBixhUG72wo7WCHo9u8E3Odh5qpCKjn/5bv7T/yU35zxqEWkU0ZsSdV0n64vsTWTYsOSVcpBfhf5ohPZ01kHEtGY+FjH; 25:32ghrAn0dQfx2fPHLtGu+1zk9ehWr2d9USoro4rszU3UNUm60fJ8xI07hUjkbHEANBesgB26F0UIBlInrqgBoOySj9Aq1BuavIQ7hl8MpWaYnPWlzFiHh87pwxnLnSDbJaok1PpbbhN/VcuZVyLiP54DQEa4VWZ/iiTnXwwzm9NtBBjMzm+h2JJnJhZ4xzcLmO0EXMQLLFZeT9jSQ+Udrw5xUAmeXtPBEf39/UuxLmswoWCh6khhy3L4SnJQsYB3dn8PKsJKeSwLPNbPqMY7+NlZWs6C5NXlkGnjaM9PdIO76RO7a2Or110PYgtgulfAzBcMgkUE8Czare58CMJTeg==; 31:foCWiclmP9v2lOxm6UtRrmHewVmYpvH0X8+OdXokhPLnNg7dfn0UiyTSCgGew9NXvbToLkJ27sQ3Uvhy0XxoLoeVj8IpLASCqDFt5ZvZw4N028cwfeX35Mnyf9Bc4hFJg+w//2YTT3yAqU3FyDEDAZ4whov4XMupNMHu6PUKmU7KRM9qO6c+aQd3kBXPsY3u5sQ6GIbjNQImIENZe6MKd8aQJ8MUKmfzEEgWv6foDnM= X-MS-TrafficTypeDiagnostic: DB6PR08MB2679: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; DB6PR08MB2679; 20:C9xmMevadoZtpzNYmMIYtxXzM+VHIirhkGW/o5Ua+rjME1T4MuvYzcjSW5S8uh6nlzhgJg6PdbXbLionZNX3OSqZsxg6K92E9trtFnVEVok4Wp9zUtAz38PhM80RMt/E/oBC7cWPTataAmfOp6NcWpRzL+UXDSmeRA5fLZBbm/wQZIDtFRPB/mi/56OVcZUznUqNr9PaU0a8BjqmChGFfXN1HdSlQEyvuWJfqBR8M38keDrSO/kCRvMQrLuIuXBm; 4:8rtFYePjOvMWhhMCpPI7bvkRLK8auo06/bsUtq2COdYRVucaJRcllnSNnET7xr+dv8hQrL0DRQNxf4uZGHc3yLgVFxLsajwvngxmw/v9YFY90GDXZ+Y/jOljcqJmqAuHqI7oC/POEyPGswwNokWPbmyGXS2oEfXlK7jyW+I7nYDfVpaLZ7lOraG9+N4iDOUXnz90WtFHN8/bRX737+sYjTgbRBtMkUzVAqZsQ6Y6BjEHA2OLzIKXZmtT8U5NiL4WCPt11QYdtETIgnTTVvvkICljnrEWZfCNEdMmIW7AsDRFxiOmQTAOvXdTozayUZLi 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)(3002001)(93006095)(93001095)(10201501046)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:DB6PR08MB2679; BCL:0; PCL:0; RULEID:; SRVR:DB6PR08MB2679; X-Forefront-PRVS: 0688BF9B46 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39860400002)(366004)(376002)(39380400002)(189003)(199004)(3846002)(5660300001)(2906002)(7736002)(8936002)(305945005)(36756003)(4326008)(106356001)(66066001)(105586002)(16526019)(186003)(81166006)(1857600001)(8676002)(47776003)(81156014)(386003)(316002)(16586007)(6636002)(478600001)(956004)(68736007)(26005)(97736004)(6666003)(50466002)(53936002)(7696005)(48376002)(51416003)(50226002)(52116002)(25786009)(486006)(476003)(86362001)(2616005)(6116002)(72206003)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR08MB2679; 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; DB6PR08MB2679; 23:qW88B56f+EvbwVTGl9DatzSeDlOE1a6fbJw/Azo/v?= =?us-ascii?Q?UEEdVum+GihtTbjp8fRPmdd7BueajoOS9RZb4bDSbeS0X39JF42ARYMaMKcU?= =?us-ascii?Q?pBox5z4meF2+RdnTRUsMNuCdTrADtgypbV+by9av4t0OXB4i61tRVKbZ2a9g?= =?us-ascii?Q?LJays4PGlztoOg5PKdTgeeL3xWGYbwQD0dD/AdP9wq6clA2KogYDqwToaMeZ?= =?us-ascii?Q?uztKJ6FX83Xxh1/qwi3sYnER8dFCond7CW96dfAZGOqhR0NCkHQURtl8Kbsy?= =?us-ascii?Q?avPC1v+YURlU5jGnU98Yvx3QMyDjGukpqPS6yWBRIr5quPbfwfV38aAF2iqb?= =?us-ascii?Q?XcKQQJoeEqlysLy9x8QOJsYhANqcQhpmNXlyaHuwde7ZxQfD8y24Hgaq3SD3?= =?us-ascii?Q?Puf5Dh+1PUcrAstbEIn3/DnNLpoMwWAZuegXULksCObFf9/XC2GvYmIuOoaT?= =?us-ascii?Q?IXgloeUJUYl2a5kUQmjArOESUJ02Dnq2GjXx0qQvC1ybZzR2TKQ/j6ZLn1zU?= =?us-ascii?Q?x00QChp69T3cHJBMsJQG/KPcyEe9ImVhb3qff6AJfLRHJtT9Zw8DLup0y4YN?= =?us-ascii?Q?GL1BlDrMT+ESzkLX+6M5kwlzYYZPD46Jrg+Rzm/VRUDf/YatTBCB4q/dultY?= =?us-ascii?Q?TpQYfOG9GkVCF/PRpPJFXymO/4bnxEt5kefq8RwOnD/2WuzGCJzIl9HmqI6/?= =?us-ascii?Q?um87PgBQlmSJ57xmgKOqEJthDzXXuQSCT/NSK8Uhw5Dv8VuIJKtsHKFSXorZ?= =?us-ascii?Q?p2YEErIS0mjIJuleEWLioJy1XUgTi/AlS3Kp22Ud1lC4gyzX8t+PfnIZJ3hL?= =?us-ascii?Q?LIjm5WJX68SYcbQha1hj7qpkiCj1N3kBL1sfQVwfRPnba49a5MV4aV2x+RMv?= =?us-ascii?Q?z59LzBN8q5MDe/5w8vxrYr9yAEvjEM91XWUy5LXI3rjdSD+LEceaDkB6Z9py?= =?us-ascii?Q?ssE27wgYFqH3tYqslT4nr5/Uj+AhCZbsjfViOhEa4rQFBIuAhxVZDLS2JNV+?= =?us-ascii?Q?H/hkBj7iu4ciPPEp9ioAPaHAaouQc1hhxuYjRx6E0FsqY15nuat12Y17O4/d?= =?us-ascii?Q?vFwwVa5c7Y4TUQvX1xkvn4xlXnUfXRyHXR5pFMcb8VdMo3VgL7xLDWpY/ci0?= =?us-ascii?Q?K+30dX711IjQOrAHu5DhrnaX5n4Uk/f?= X-Microsoft-Antispam-Message-Info: eq6D8Xg2L0F5WopnMJZxleCGLWZqHLfGmMqddj4DtU9kflp8xGSpHnkPXDVPqqjW4MptnbNODLw+JsQDLowXlAVwTqwB6c2DlGF1WbMvMJcEy6vuflFlNtrubVhuO5TOWKUwiNrg5Zj2irl90HUX6RBXaRmOa2EV60KKTzMRSNHCmaykMkF7E4CVUsaxpFGB X-Microsoft-Exchange-Diagnostics: 1; DB6PR08MB2679; 6:RK9IwRE02eJ8KL9sohPijyct9/kTeaqxX8pnkcIOmx9HDYlU51rrvamtMYi5sAafxQ0Bj+KtaGVQ7IsAiBNm6h95P2AiJOcdpGv9b7bHmlfcurCVrd0NQGc0UqvEoKWS7f6keo8QA5kts7cp/FjPE7smjEwkf9FIumi+0ApQJBqixLa9J52XiNPM6H6+K1dRmEbqnlW+nsABW9NK3cNbCv1RM5H1R5hH1P/e5jKXJvGwXbyol/tjzATuB7T57xCEGOR+TyDl2TKCC1rL9eDlQfOGT6uc56sN3+ducAwbKpTQhPs8Y6rKz4UBDnCUCcXqJSBSKMVamALUxzqQPNBVO06qX62U8cqcQGMRP1Er8bFy+qbcAyvPGsSYBywLbeBxEkPK+AFupcqVnvzkilM08xh42NwchsoXl+nntF7jJUN7S5hy5QFVBLd4oT5pOY+PWne7TsfmcxON2L5GAmQmDw==; 5:ZnctZfvgFcl6QgukUlyx3VxuOAO/2LnMTDj3FqrvAts00Qb7TAZSsXu76eQcFCtECA71WEf+2roWdEfF6PrC6JeQHvKkTTg8k44mbfO2YzjZAfO5L5S/MM3BjqNcFg5pK4DtpA/GOV3GLDtsrZMqujsfYbd7PSrROhhz9cYnnRc=; 24:orNvUfzlK13lyrml6Nld7Pw7oqv/K7YikKky+Uq8mGQLUzIW/ofhev27A0TIrHv0VEJQjJofMFSsbrJeBbWstnwrWdCOGeOtR7H3bdKvXOo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR08MB2679; 7:1ONhc9ttDdxhXb8KU7RRAfe3dq715GHb9OfD4zeLz2sFdqg21K141z1gS4wnUKXwyqPUnh2XtmykGs0iXJRJnNepC7Tu/v8c83VatpDVubIsVuX6E8FrpMGtqvpSXnt540Bu/uRi3YK+FnX9qdKnLksh00MAhrs7bHo3DBoMX8nxmgcMsCvXeCAWNbRUwximb6X/l2m8LPLcJyRLcrDC84HhGyl6bbRYxhzbta/90LylU18ZpMjASfhFCdfi5mQz X-MS-Office365-Filtering-Correlation-Id: f11a62cc-2cc7-451c-bac3-08d5c6532d3e X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 17:31:28.4120 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f11a62cc-2cc7-451c-bac3-08d5c6532d3e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2679 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 drm_private_state has a back pointer to the drm_atomic_state, however that was not initialized in drm_atomic_get_private_obj_state after duplication, as it is the case for other drm atomic getters Signed-off-by: Alexandru Gheorghe Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/drm_atomic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 7d25c42..249aaf8 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1108,6 +1108,7 @@ drm_atomic_get_private_obj_state(struct drm_atomic_state *state, state->private_objs[index].old_state = obj->state; state->private_objs[index].new_state = obj_state; state->private_objs[index].ptr = obj; + obj_state->state = state; state->num_private_objs = num_objs;