From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-4067599-1516203251-2-9507420714160886789 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='SE' X-Spam-charsets: plain='utf-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516203251; b=r/W0/XvcksaSJzlwi63pwjn6LLKJ3LPS2GdI8tJUzEj9NTJ oIAq8Qae7La2ubqYpv+hBx5NHOk+2PmYaITUITpYyFzZH1kTyD1OtWAlUZ3zJlTZ l9DqIC43Xqs5R4IrOkdkpbA1xx5NvbtOCp2ixVD4pQgsemHDlIcIyOeDnpgiKhcC vGWdztaWvZSdLshG+4D29298F3IqLXpa4e97MGU4kB2rw8lgUD9OiKaiox/0XzXn IN7GdVwNBTcQU6IAK+WEmRZEe5198RqUoCjiqMHra0avJ+23YVLA2N2jFuozhCe8 E9N9lKXZfm+0G46OVE7fUbaADV6LAXKHZQ5Tv6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=subject:to:cc:references:from:message-id :date:mime-version:in-reply-to:content-type :content-transfer-encoding:sender:list-id; s=arctest; t= 1516203251; bh=41bn9v3RDyEXpkGvZnsQ+xTG6OfcPrV+lcKRHVG2eSI=; b=T FT/sB3y05Tst/o9i4DDvSc/V6CoOJxjHX7nJh6fr58ksQBjkhIzLSnSR1wWx0TR6 NG3nfIA7tbn340Je+wa5DA/kgvwATQRZ0J7qUzuxDmIgCYhRUUS4/NVYaqiP9Qc7 EsyOJPDROtMw+XKlbiIYQw/FVbCxx5cqT9753qly/Q6ddvPcB+sQQTY5qKcVei+f 4fDwN4JR0i3gFxT9NJLTS090f/FUy3J4pFAycvdM+MwEAl+irskImNplYHSho7xU UNCYLhev7hfNhsg+t/cqk4OFjcxeK6ANltxYc5TsL6kVi35P4Xw0IN7svrm142oP B7A+EvUFqARTO152pzmMw== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=onevmw.onmicrosoft.com header.i=@onevmw.onmicrosoft.com header.b=seFb63VW x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1-vmware-com; dmarc=none (p=none,has-list-id=yes,d=none) header.from=vmware.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=vmware.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=onevmw.onmicrosoft.com header.i=@onevmw.onmicrosoft.com header.b=seFb63VW x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1-vmware-com; dmarc=none (p=none,has-list-id=yes,d=none) header.from=vmware.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=vmware.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753700AbeAQPcH (ORCPT ); Wed, 17 Jan 2018 10:32:07 -0500 Received: from mail-bl2nam02on0047.outbound.protection.outlook.com ([104.47.38.47]:9088 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753158AbeAQPcD (ORCPT ); Wed, 17 Jan 2018 10:32:03 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=thellstrom@vmware.com; Subject: Re: [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou connectors To: Rob Clark , dri-devel@lists.freedesktop.org Cc: Rob Clark , stable@vger.kernel.org, VMware Graphics , Sinclair Yeh , David Airlie , linux-kernel@vger.kernel.org References: <20180117151629.27423-1-robdclark@gmail.com> From: Thomas Hellstrom Message-ID: <1706f2da-1349-4461-3a16-7287dbf12958@vmware.com> Date: Wed, 17 Jan 2018 16:31:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180117151629.27423-1-robdclark@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [155.4.205.56] X-ClientProxiedBy: AM4PR0202CA0021.eurprd02.prod.outlook.com (10.171.80.31) To BY2PR05MB757.namprd05.prod.outlook.com (10.141.224.15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfb82f04-337f-4a3c-6ca7-08d55dbf7287 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020);SRVR:BY2PR05MB757; X-Microsoft-Exchange-Diagnostics: 1;BY2PR05MB757;3:etDfEvs2spSR+4inDdvHPj4RhutpGGCMccfvz8x98QVm/bgyMhQoYcEASWPsSYZejpxWSNT+k78l4hbEi9f5qU4mE8YXv/v9N8aZ2iqyeQ/lIL28+vWv+tRQR1d7VeaMpHkXgwg6aynaKQpT1zJbPUfnDNhYn56PSRvcOHGzikgwBJEAXqt8LPYTjDU/4k3rCm56hxXhPtbqS3pa3w8RNc3A7papUCdFJYgUnWQJcsT68dn8Wf70WQ+qfsLkbpmh;25:9c45BayCgTJfRr6q0hwqBl291HOUdQLKL2+ZdeNSHIH9ViO1KFXJId2g+Np4CChLaDMmBtft08Kql+EhcyBVwgt9pnMF4MA4kPWAuAArB6SMHxN2VTZ5zvqmahXuwO2jZd85MBQ6DlK4gmWYRyPU3W6B/4Ug7zk+5UBmGRP8MjmhcBFBvKIp7gM2EI7arb80GCsgcwhMFyASV6CMxe8wGvLREC4P2BZPR6mCj0jz5aIC3kev6D9NdgAxpqL10af94Hvs81iinwVlpiN4jtDB27jjgO+mkK++x50Aqhr74xd1ZzhAR2+NwAz3GUCuXM9TtoH9QXw/NBcULYPaNRwWIA==;31:b7iJ643XDTRsbIYGy6QsV1orfreIFlYaZ/pOvRpDrHQIwru7cNpha0ZwR/vxmdEnzZUHL0WnclbMz15WiFznIByrN5HTArAyt5OzXrPJ1E0At/INAX2jF+uvKKUvE3HFYMsTPJAlpgEUjA1W1IzYVtvDlAZJ5cJnunbPR/7TnoVh9g7L+vl9VwbodbnbpE+eB8VNUmxX0a2Ds5cM9RW2v3+h7zFd7+mbum2PLBBOhyA= X-MS-TrafficTypeDiagnostic: BY2PR05MB757: X-LD-Processed: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0,ExtAddr X-Microsoft-Exchange-Diagnostics: 1;BY2PR05MB757;20:HvtPA38X/qmFQAeCwLlgO4vGd4K0AU+Fwtec9pt8hoKlyjmZW80ZpX+3/kNwdUpSPbrxe6wQuzYjsdoaOqhRQZKDWthv53dkS5k388Z6ioCSymNUJgzx4jErsvHjXJjUH+ogYCf67ecbp95ombiEsAwwQB0oveg/IjcyOZr4eqfhjnFEFjMQFW8IqHqQnYtGSQlnTREEP2Nctdg9uzSNZIDQDoCqysFsagAGh/OI7Arvn9wbLXbrDD7bVKrxm9saWxwEKtiDzSik+pcWZ0OlW/4I4djeJ6Yakc6Bo2LxGDRDWCd3pEthb6Zi8cmbL5k94zXhQddYVvhwem/aU0m4Pr1rD+PJv9rdtzufz0nA4HQHnt+bi+V8X9jXAzPSdNDWD7v4AZJ7oP1KuKB3WpuTVxnVGOCK2flTNs/zX+H2nX2TJJY9nZ7QfC88lKsOXCZlMViJCRX8q1U5qHTBy7iZaRkA6OcPZcpJfNZNo3JcTEs4BonXWZp0wXHQxmgBhWzo;4:O5cs2qihdR9oBudQkeQSUzwvlhQ/Td40Hvstq/i7IxVp7DKZmlECGI3yJEo/AK6FhoXg2SJMV/YoSWWl1ZTM0Ly2SrmmxLw4V17IAzDJZxEMtvrrO6I+BNOciLdMP+mpacTq9t0H/0doG5wWDAzT95C03xtnMwTpe5w4haup+AhlL7e3XAvY2sXYQmLB2uUw2yN23tSVU+p4iga89SyWoypkiYwlcs8ATUDM2Oj9czDnXRe0XIXaS402Lgz6s11kKMHYYohgLuaPxDM03p/3GhwWin4wRILqzR3SHNYFxJ8q2iiE/lSvGZFnIlrOVck64yHHrW8YQKpAbZh5wjanC98bHHEJ8MbzkXhxiwA2FrQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150)(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(944501161)(10201501046)(6041268)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011);SRVR:BY2PR05MB757;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:BY2PR05MB757; X-Forefront-PRVS: 0555EC8317 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(396003)(366004)(376002)(39860400002)(346002)(39380400002)(189003)(199004)(24454002)(66066001)(65956001)(65806001)(64126003)(47776003)(31696002)(86362001)(50466002)(36756003)(97736004)(67846002)(305945005)(7736002)(6246003)(25786009)(6666003)(39060400002)(65826007)(2950100002)(53936002)(68736007)(81156014)(81166006)(5660300001)(8676002)(8936002)(31686004)(58126008)(229853002)(54906003)(83506002)(26005)(16526018)(76176011)(4326008)(52116002)(2486003)(23676004)(52146003)(316002)(6512007)(106356001)(105586002)(6506007)(478600001)(53546011)(230700001)(2906002)(386003)(6486002)(6116002)(3846002);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR05MB757;H:linlap1.host.shipmail.org;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCWTJQUjA1TUI3NTc7MjM6eVM3aDIzc2lTbkVVTVVzQTRIS2VPcDlOYkZF?= =?utf-8?B?N0hiVnk2OGFjVjJnQWU4UWQ3UENldzMrOUt6ZzRadnBEQ0MzV2k4emVVTDdx?= =?utf-8?B?VUQ3eURVSVAvNkltM0lvMjVpR2NIbkwwU0U3d1l2Sm5EaGlKZUdBVEk2VGVY?= =?utf-8?B?Zm1jRWpCRmdtRHNpcjBFS2VUc0JtUlFWZ2JTdytaWk5aOVFDb0dPVGJhTktB?= =?utf-8?B?dFhRWWRLVTk4RWdzQmtoaGcvemVMQis3b2tFWlU4VFJBajd6Qndxd2dXTW9I?= =?utf-8?B?MnRRcjV4QzUwS3E5WkY1T0VTZW5vbC9mcUJRMDNKdVdCNDhFWGo0MGxpOGpW?= =?utf-8?B?eXRIYTgvUWNHajgyQ3VudkNyNkJnSHlLeTdwYlkxWHR4SlQ0YW5WK3BsNjRI?= =?utf-8?B?ZjlJTXdFaVZvalY3L1hKYTJmRzRrMEc1czJoeVQyWHhhUmd1YkUzenJzNUVu?= =?utf-8?B?R3h3M2MrTjcrOUh5QVhqa3dLbDlTL1AyQ0p1bi9UbTJhUUdPUXhDbkZmWDFO?= =?utf-8?B?ZHczK2haUTlvSnZIV3FicGJuSWw0ei9QMG9vdVR2eWgwR3g4Q0ZqOURlTm9s?= =?utf-8?B?aFQvVkExMWNCTlFpRG9QbDJNVHdrbXZqdUJ5c3BxWVZBTUtxVFJJdkhLVWVv?= =?utf-8?B?ektjcmRqdlhXYmJ1Wll2ekNGZmIrV1o2NkhnNDY4YTMvQ1g3M0tlTWJhd0V6?= =?utf-8?B?TEd4aEFIVnZyM3NpQUFnelpXRlp6aTZ6SDJMQmZDMm02T0xrMzVmNGtORVJ4?= =?utf-8?B?RTNtNXVQcmxucWNJdDREQlN5azFUaEVHQ2FwbmZTSC8wVjUxYk9qMmNzcHlP?= =?utf-8?B?bEtzR0xSaUd3ZHZzTE03VWpGbE1vdFRiNnUwS1hMbEtSQXRqVWlDUnJpS2J5?= =?utf-8?B?bDZhaUwvNVdVdGc5eWlPdklJUUlFbzV2dzdBUnFBbThKU3FObnVnVVlGNGJv?= =?utf-8?B?TnR2MlFmT0toL1BtNDRCUm94SDdjL3U0T3dUWG9yRUhPMnFQVGVZRkJOazlt?= =?utf-8?B?SGhBc2ZUNVp1TUVKUFNrWjJwOUFGSnI5Uy9nOXBPZEZ5U2FYem4wemxHZlJH?= =?utf-8?B?ZkNKbnh0K1hwNWhpaEpWT1NCMUw1MmhLNjkyemZrOTR5SExyOVI0N3l2STFy?= =?utf-8?B?NW5USS8yZkJnNDdldWljbHhTSEt1YlIwWHVveDN5R1ZVVG41MjR2NkVTU2hV?= =?utf-8?B?dXNyUHh2MkYvcXBiVVlpREsyVmNDTkozTWs5aUNOZW96OHhDcGRROE80dmlP?= =?utf-8?B?RElqaU5CYnBvc2xWeWh6MVpJZVBpajgzaG13WUswLzl4eTM5YmZsWFJVV3li?= =?utf-8?B?bnJldW4xV3hYR3JEbUFPZ2psazRLK1BTbmxaN0dodlZGbGs1aWhHSWNURjJp?= =?utf-8?B?N0JjU0tvcFFaeXFCQUt0L3ZBd3JaczIrT2l5MG9UNlczKzNMRWQ1VXI3S1Bq?= =?utf-8?B?eHJWZEhFQnNJcVdtWGdUcGdzRkpVZ3g5VEFOcVJtMlRSYzRUTGNCTGZOUUkz?= =?utf-8?B?M2FTNHYrbGU1aWxrM3ZNWGhBY2E2czlNdENhNDdPNHVPRkgwdjZrYzJ6NlE2?= =?utf-8?B?QmI4MVg2S25YVHVjRFUxRjJ5V3pROUNuanJ1NVJDd2ZSWnZiUWhhUzdpbUR4?= =?utf-8?B?Q2RiWGt0UXlCbVRmLzhUZDYxQ3l3SFc3dTlGM2orNGhubGFQTFE3Y2REbG0z?= =?utf-8?B?cE1KVk40MGNjbTFuZTZpWHJvTmhYVFZkb0pmbTBKSFIvNWJJc1Vielh6ajFS?= =?utf-8?B?TVBEald5bVRQSjZhVjRRU1M1ZzNqM1pjakRaRmUyUEltbDl2QVp1cytJM1JP?= =?utf-8?B?K3R4WGxjZElNek9Tb2xjMXROMWVWeFJxbkQvTGJETHF6SGZZL2haREpnNzl3?= =?utf-8?Q?AaiqIkwWZxxbRvVpib69g0LrP4kiYy1?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR05MB757;6:R8gdzweh5t46EEkP2PcKeXGC/1KAcLTWgiSTXoFcQn2/+YO8AOmaYtumueZtMhjH5MxcY25Fg2+6FDpvVGss7AtDE5bwDRwOkFVsqtKMCK047h7JA+4J4oJrN1W5WMeo9Ty7kux6fJWG5iEZQx5Vx1XL9mBaQiR80LzTnijRJ3ufsQnUKfYBBLOMV+mA/Dm2PyB5bWv9GSN4eMyn3BG/cUe0Ap+Uk/dX0eYM+a1xRom0cBF8ehzlGAycLtXLTorXuTvgEVsN8RPPBz+j6zHiJP2XbU77gz4kEzh93QMB1pfuq+fLziaMlwiNfvDLDd3Oz12Z4oSfT1j4k4qgjlD0T/IzpGGEjPUXAQaXP+sObPI=;5:9Sn/GuY6UwND1L89i7JkStth/ZNvuAKqRwM0rbBoZ56YFkpHLa6xxlp7I30VlVUCY8rDNpJmiWudGGDyrsQB2ldbz2Q4Kp1ERybOUp9pHIWRb3uo3PuW+xlOUYXJ47OlXjhcPf3Il4fLW3Z4tyoAYhgDh0qUrQ2BkIiZ8PdP6Z0=;24:a1DtTNnOY53kFYYwanUPng30MMy840zhM5iv2WXkiUELwQYJcBSUVh2j7vg6boRBfgCU1Ozpnu1VdArfj5uAEtD4RAbrsnbgpZV0A5CBzsM=;7:6yHzU1RJQDr25b1ozyZaICSZr8ds9b0LoUDZF/xqkSv08ZiC7/4s/0EQDGKUp7h2rboyUOrxtVD3ZRQ34IuwLA0j5K0B1gdK/gsOHKlelMTZ5Y+P7SdOE8fMrFkN5SOeg6ePwWfBgeb+OAFg6I94oC2S0luRCGONBVT2YqxHh2iOwAPnsThzxWGhdmi+NyARomA9fKHRKbnlaI9HWpF4O00efmPFokDZu103TOAWeHskIwtYfJTDqc+QE6CTjDci SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BY2PR05MB757;20:0d/GRXS3cCAAGwfxmVgHzZzIeIz1m+S81jWTkuP7gfcJjztLKVO+foRLYSqOE+FZHx69orv1XnGuJTgRHEuBBVMzxcbserup9Ei+s+WPaJ2R5Ym7rbCnmgXIMgPuyV+UZYyizU45AT6T+xhuquGc27wuDWoFPnXTVjUBYo3KCRI= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2018 15:31:56.2688 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dfb82f04-337f-4a3c-6ca7-08d55dbf7287 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR05MB757 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: On 01/17/2018 04:16 PM, Rob Clark wrote: > From: Rob Clark > > It looks like in all cases 'struct vmw_connector_state' is used. But > only in stdu connectors, was atomic_{duplicate,destroy}_state() properly > subclassed. Leading to writes beyond the end of the allocated connector > state block and all sorts of fun memory corruption related crashes. > > Fixes: d7721ca71126 "drm/vmwgfx: Connector atomic state" > Cc: > Signed-off-by: Rob Clark Reviewed-by: Thomas Hellstrom Thanks, Rob! /Thomas > --- > drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 ++-- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c > index b8a09807c5de..3824595fece1 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c > @@ -266,8 +266,8 @@ static const struct drm_connector_funcs vmw_legacy_connector_funcs = { > .set_property = vmw_du_connector_set_property, > .destroy = vmw_ldu_connector_destroy, > .reset = vmw_du_connector_reset, > - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > + .atomic_duplicate_state = vmw_du_connector_duplicate_state, > + .atomic_destroy_state = vmw_du_connector_destroy_state, > .atomic_set_property = vmw_du_connector_atomic_set_property, > .atomic_get_property = vmw_du_connector_atomic_get_property, > }; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > index bc5f6026573d..63a4cd794b73 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > @@ -420,8 +420,8 @@ static const struct drm_connector_funcs vmw_sou_connector_funcs = { > .set_property = vmw_du_connector_set_property, > .destroy = vmw_sou_connector_destroy, > .reset = vmw_du_connector_reset, > - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > + .atomic_duplicate_state = vmw_du_connector_duplicate_state, > + .atomic_destroy_state = vmw_du_connector_destroy_state, > .atomic_set_property = vmw_du_connector_atomic_set_property, > .atomic_get_property = vmw_du_connector_atomic_get_property, > };