Message ID | 20181108144353.31363-5-nicholas.kazlauskas@amd.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <dri-devel-bounces@lists.freedesktop.org> 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 E0FCA14BD for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 8 Nov 2018 14:44:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF32D26E97 for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 8 Nov 2018 14:44:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3FA02DC8C; Thu, 8 Nov 2018 14:44:20 +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=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 64A922DCC9 for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 8 Nov 2018 14:44:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 322966E660; Thu, 8 Nov 2018 14:44:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-eopbgr700078.outbound.protection.outlook.com [40.107.70.78]) by gabe.freedesktop.org (Postfix) with ESMTPS id 020E96E661; Thu, 8 Nov 2018 14:44:15 +0000 (UTC) Received: from CY4PR12CA0027.namprd12.prod.outlook.com (2603:10b6:903:129::13) by BLUPR12MB0610.namprd12.prod.outlook.com (2a01:111:e400:594e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Thu, 8 Nov 2018 14:44:13 +0000 Received: from BY2NAM03FT058.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::200) by CY4PR12CA0027.outlook.office365.com (2603:10b6:903:129::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1294.20 via Frontend Transport; Thu, 8 Nov 2018 14:44:13 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT058.mail.protection.outlook.com (10.152.85.184) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.10 via Frontend Transport; Thu, 8 Nov 2018 14:44:12 +0000 Received: from kazbox.amd.com (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Thu, 8 Nov 2018 08:44:11 -0600 From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> To: <dri-devel@lists.freedesktop.org>, <amd-gfx@lists.freedesktop.org> Subject: [PATCH v7 4/5] drm/amdgpu: Correct get_crtc_scanoutpos behavior when vpos >= vtotal Date: Thu, 8 Nov 2018 09:43:52 -0500 Message-ID: <20181108144353.31363-5-nicholas.kazlauskas@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181108144353.31363-1-nicholas.kazlauskas@amd.com> References: <20181108144353.31363-1-nicholas.kazlauskas@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(346002)(396003)(376002)(136003)(2980300002)(428003)(189003)(199004)(77096007)(106466001)(6346003)(426003)(336012)(105586002)(50466002)(4326008)(5660300001)(53416004)(1076002)(2906002)(186003)(26005)(305945005)(14444005)(476003)(2616005)(126002)(486006)(44832011)(446003)(11346002)(86362001)(50226002)(54906003)(8936002)(110136005)(23676004)(81156014)(478600001)(81166006)(8676002)(2870700001)(76176011)(68736007)(72206003)(356004)(6666004)(66574009)(36756003)(47776003)(5820100001)(7696005)(316002)(104016004)(53936002)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR12MB0610; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT058; 1:lqKy0ZPxeUaCiYs8kFyHmy2J6jK7wFfYOMrMl96qp/SEu7hMHVanlLnihTlFEjBeVOyRjZvjWC7gnvkyH8Brol1BmmixWpE00KlmZsWlXONwAiugxV+69Agfh5kHbz3u X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d2a7ae4-bb66-4e06-a57f-08d64588a625 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:BLUPR12MB0610; X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0610; 3:7pzdWSxiRkgDZrJD74emjQ54go6lNM+nT3cL6cTDmtOboosykkLqE8GcrR+rArT5/YQOaRHZMCBhn8ZMsBAUjeqWzSgOlXCzu2G8RJal7JcB92CIYBNJ6utCfk6tZgT0bqPF0dA2DDlDEvh4pgtiR2p8x52A6f8zrfEg7mLUSM8aeA1+o3j7VU2mAGmt4BGj8+NLFHULCPLwBsKnZ84vSsNiUZETsLRyc1hVzd0xsIUqFrf+5CXY5GVmU6qbqnLJwZ8yRfhAYzr3qc7jpfMPSKRM0tX+itfGKW+GvZLMUu86huWmDRWITjZ7qpSWZ8jm48mXwqiWEtKfOG8k3los0u9t6RNguK4T2cYyJ72N8LM=; 25:b4AH7xZQWQo7GpBZoufIjXa7qzUktpwSgLuAZdbW9me/nn/KEDqIwsYOkoP7+vS86TSVW0UeFwQ6ToRKNr8H5OPpXlFuWYlOBgSY75D8+77OAzW9yKk7SN/8loVN9WzCvv/fXKdlGdv0fjcFAbHvEoE6D9miIKeXYrZPBEwbs0txBLsCR7RZAjLZp6/a31Enqh2cVcPg8/G5HMqWIBIFKPPOasFmmKwzkaXVURFDpLXiQymltMJhru80N17lECrBFuNMBfa8YMlgB67HEnT6oK4w/MMat+X9RMplMk4aR1ElU2/MEWGqdl5tVNVfGX4GdZwOyg3K/p3FzJRbV8dACw== X-MS-TrafficTypeDiagnostic: BLUPR12MB0610: X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0610; 31:02OuInlfJOqCwGfxnP78g8H8Jec3gYfZdYfsTQHu/YCEYFgDxvShJehov/QvAAohDZfigExSBKqlM/sQSbhgldW1pTR9AX8l25WXzGaZwlPgPATQEYfvnFaY/eSYPuqLBLMBI6iP883XgvMpyii0gN3U+aTjqJ902HvZl/RU9nhvNpeArDkPARgQJmqo7ZL58PvyT86Ark9e4kKOT5h9k6KiIARXSC/yFrrd2Zelj9M=; 20:USUWn/XOv3KAoyw+1DbnWvdle9dxoI6jIGg/hY8v7NCMsn3MiBqShtPCcikPgWcuoZh2WYBLMlYYnXYg5rtUrby89REmgOUx0ajl8Q4UT4re1BZaXL9WmBcfONHMO1vXmAHy8sAGoo638tht0qwPk1P95TcRMiKBElwycc2RlCp+vsuqBrTyG5wssht0aqgyhxJcAyoDuxU55LgPT9LRXsxUYnmDb9yWla20FE6uR1M0Ko1KpV6ZEuSt04rxDod0hQBTv2PsDZCy9XUJiNxJKDO8NrV3fX5hW6LIQz0eLbv+xRvXWdYB1ns40Qv2Ytl1j8wQ5/UdCJcGuAq6hNxyo//OYmZn4zhMwV3EgSfIR8RwUuzxtl/TYOg/n/DFHhGDV2ZMW3dhJefG2WQJ4O8+oBdS2OqOAi93taEacpLSL2lNgNxO9sGTieDvuj3SMw0YSRNbVp/KOLAH9mCf6ydhJbugEcnQI+kIvKtLhH5CTQDV4aHIJBB/0U2wdOVtE0ex X-Microsoft-Antispam-PRVS: <BLUPR12MB0610CDD2846ED95578B086EDECC50@BLUPR12MB0610.namprd12.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(17755550239193); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231382)(944501410)(52105095)(10201501046)(93006095)(93003095)(3002001)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:BLUPR12MB0610; BCL:0; PCL:0; RULEID:; SRVR:BLUPR12MB0610; X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0610; 4:3kLAKQYObmikBT9Qp0Y149ej0Zd/qfOLsBtTCRov1NyWE3wZTNzGmoHkjqz9lh3NLpgETO+W4T6jEa4HVYm+t4/ELkry4HXCbP347DkvkSsCaEwtplO17ynCPqnYUtkZn+Yvm+CQbRN+W3w3UubfkrrzVF6Hl9ypWvnEqvi6GrlrHKJNEZIb/9NT7TACViJLZz5cMm0keEq660AWqk5i8AFHeR2F9HbVm0kekYcb9N5faOOxp3bn+OuMVA7gd+WnRuPK4sFr1T+GGerFMK3HgSsFzbw604hWjs6R5uLScdYGvN89ApPTwefEABkz61gz6nMzmdr/XCpkBwgr6kxqlN88ONLFa91mg0HiUjaacPg= X-Forefront-PRVS: 0850800A29 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBLUPR12MB0610=3B23=3AEPoql/K?= =?utf-8?q?Q86ZZzbeUxqkvYNV9+DdTvBZEMtxafzNEe9rrdyrgkT7024gV6cVd8AxXu/K35x/6?= =?utf-8?q?BdKZGSqxyDenfMoYhJQuatYUM+PoxvLKYH4k11vN7buoACBxbPouDd2R+9wmcYHQw?= =?utf-8?q?NxCvUQlEsBNz4ANgCKq/ZN2itw5Pa79tESeK15J1GFj/nIuCvDJxi8xYiEafoge5v?= =?utf-8?q?/KxmJZBJQ3pBmXkdvTgfMz+OOXvVJMFNBoHS6VrULt8j5ObC204+MAdPcHrjh/aRm?= =?utf-8?q?aT5ElF4iS4DojkVQIEIL0kSyriy9trAlEkJnTppxAyh88Um3k1nFSdR5xA2cg8vio?= =?utf-8?q?RNxl2DbIgBaN+QthY1wNjoXzRPV8l4VekxzxmcEF9OaRw8HnAZ3qX6EZ8K1ZhfNtt?= =?utf-8?q?1wb6Y21HieyvlKPHt/cwGLG/mLf4pijTmgiKE/10UZpBZ87AVBbTL9uaSdMx472kZ?= =?utf-8?q?PdCt54wNafGUsFPoBzATk1ERxRma2g8y/86iKYpmcbHdWEgl/toUq36g6TXOPyPQt?= =?utf-8?q?O1ysTPXZzrLy1jC+jPKfmNvlGKRm/W+DJksjxD943IuXZzFVdR7iJvjAIfcpEjIjr?= =?utf-8?q?PFCfmdq7EETVqHyFlsQVAKtFY2OO/pTZYT0U9/3dufv4kJZ8Xid+wNcluvpNQbGCr?= =?utf-8?q?WZILTowuRgqCYtO9VWNjt0/E91f9HiESLDkiXPk6c1gCEQpE0dUFmyhiQzJNO7adh?= =?utf-8?q?sT8t04h7rBa552MEjiI3jnhb9Gt5zj3huoT21t+Yr2YvuIIvxoaDG3OnrTEB35Ccl?= =?utf-8?q?DehX/I/1TsD8qh5C0w/cha+Q4zlTPjVgEZTy8Zjl1OCR2SUs9cuvcJoa3z9UgKE45?= =?utf-8?q?SMLuqFqmpx0L3cLPMODSLo9lkXlpKabN7PKnYmq01l1mh6OoMltFaUZ3kXavFDcLG?= =?utf-8?q?5fkwwEdCQyQ07icxq7egw1B1R4VBLcse57FoT3aZpmJFQHsMlCGcJsb12PEHaCneY?= =?utf-8?q?s7tbN/Et6RdovZ09NYgcyiPJO0Xzn3/0bMJL32SxwSNj6TILuZVb/Yhzc/SVfuItA?= =?utf-8?q?/7DZxsZBZ8MZaAiG/ScB1IvfSyAh+hQeELsQjzsYizwz9HohZ+yYKwxttvssS/NdW?= =?utf-8?q?EQcrWzA46I5suxjNPFX2scIjq3OYYAxu13+wXsaQxAaB7OKHdmK3Ri+G003V9rfgH?= =?utf-8?q?S0GJbpuORr8EG/MFytAPr6ruXstlugXgR9JawimViApFfTXmdHW8OrhZyAnGh+dMf?= =?utf-8?q?WRlloAUnqyjmxl2SEjo6hk5rNdoYBwu9ayOL+E?= X-Microsoft-Antispam-Message-Info: PPkOog6csj//Ih/zCKEJXKQ3DTu7H6oMk/gZkUOEMEEE4bF4JjknmAG1/Hj4gIh4MBdcuL35FLBPBnoCHrlq5AA9vh4+mQxwa6wDAM/qSPcDteQf8dNFumswR0TlFYy2Wfok2Ao4xtsArD07/7uOyfCJUyCQi22S2pQ6CY3sYY9gpLM+ATJUplOfJ5yZuUwnxjzHwQ2GWP5tI5xbDjxBLE/srERfgSIHQPD6iTbGTsMKixOfwJMHQewqQax18QK0g2dxIMw9rE71w+KyjOtth0u4/G7LcGykLnfRsbpP8fqv2RgwS5L7ycrVM0E8C4VbTEWbTk1GTn8pLHIpcqFKiWz0OEMTPCgRzYVFOOQqXuA= X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0610; 6:BkC2S8RUwATNr95CUXlVQpFTXmY61XscFVdXv9SJIqSPhabutize0Rnso747q7bWspDTER9o+D2lYoCGZHVVH2kF89rdkPLTgirqVCu421olnIKuCvPiF6lmINYpRWS+5qPsGurhvqVdzNlhaGTGBRMAkeUDpJDUqc/s99rZXvUJ1sr9LP6jqqAwV92xYid5fn3Y2IdJw4+jCNSormCBH5yMwkj36Gp8wvKyP0dJeQI19O4gxEU58c3Kj+MfXdUhS0ftFbTtSIukcEevG5BCtB/z6vi2VRgO9WCpBQmItkmG+0nET4wGqWmauqFnLdN5qcMmptcHSUBLB8CkIUo+EqUWxv+k0xP28EfW03sMDmbAgeyeDwIDPE2v6dVofhD9reaNpkoKVkmh8NBWtwcqofDYv5DJa9RzHKykiT1bUEdd9+6zgIW9L2ooxb9nzN1mw6aY2E4bMqV2i8cINaOT1w==; 5:FaBQXhlKBmt9He6fNEIC2CoPhr96ZOxfjjtb6ju/G+tzrDxRJtS4MQ+UOZApuuX5YGt6Q74gIsBpndkjmSWC3c3dRaInW0806I4wpzs3r0Ghr2oN0yC17RiE4j4gdWo+HhXHieLttp13zjaQ0XWTf4hG48UvDiG7py3A52iTol8=; 7:ADW+W5kBzwkVEsc6RUNQe/D0WbNKcuwkdZDb2vhWPOoKXo7jO5Sgl6jC17IcksPUhlndTBjhM8VtoKTD0DOuqeuLuBlMYQg4/HtiELljbyqCWPQyj9QFh5VRkwNpvo8kftJ+bimgm+bDeiZzo+BgBw== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0610; 20:Ogh0k1AZizExXGyAq2QR7z6BXluT4hEc3Hpi2qj7I53Ha2zCbZVnbuWkNLkwh8AgwQSD7dKRu9WaEixYQDlEdvDD26xKZTueyyQQrKy3sjGA4jo4kmHBvU8oJHm4IuvPSdJ/44KLlmzW66nuhK8KOe+m6k+SvvtkQjNSSCQqKigGKsLEUwDaWzdzLTcUhxpLxj/hwKrBkmOiwZV29A3JCB3Ga0F2aXF9DXlgJzB69msN9z2JiDKi9JnoQp4AJx+F X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2018 14:44:12.2826 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d2a7ae4-bb66-4e06-a57f-08d64588a625 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0610 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Cc: michel@daenzer.net, Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
A DRM API for adaptive sync and variable refresh rate support
|
expand
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 6748cd7fc129..cb331319f225 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -850,7 +850,12 @@ int amdgpu_display_get_crtc_scanoutpos(struct drm_device *dev, /* Inside "upper part" of vblank area? Apply corrective offset if so: */ if (in_vbl && (*vpos >= vbl_start)) { vtotal = mode->crtc_vtotal; - *vpos = *vpos - vtotal; + + /* With variable refresh rate displays the vpos can exceed + * the vtotal value. Clamp to 0 to return -vbl_end instead + * of guessing the remaining number of lines until scanout. + */ + *vpos = (*vpos < vtotal) ? (*vpos - vtotal) : 0; } /* Correct for shifted end of vbl at vbl_end. */