From patchwork Tue Dec 1 08:16:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongsheng Wang X-Patchwork-Id: 7733871 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D1F56BEEE1 for ; Tue, 1 Dec 2015 08:38:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C5EB2069E for ; Tue, 1 Dec 2015 08:38:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1FD032069B for ; Tue, 1 Dec 2015 08:38:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 170A1720E7; Tue, 1 Dec 2015 00:38:55 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 923 seconds by postgrey-1.34 at gabe; Tue, 01 Dec 2015 00:38:52 PST Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0125.outbound.protection.outlook.com [65.55.169.125]) by gabe.freedesktop.org (Postfix) with ESMTPS id D751D720E7 for ; Tue, 1 Dec 2015 00:38:52 -0800 (PST) Received: from BY2PR03CA078.namprd03.prod.outlook.com (10.141.249.51) by CY1PR0301MB1610.namprd03.prod.outlook.com (10.162.166.24) with Microsoft SMTP Server (TLS) id 15.1.331.20; Tue, 1 Dec 2015 08:23:26 +0000 Received: from BN1BFFO11FD049.protection.gbl (2a01:111:f400:7c10::1:155) by BY2PR03CA078.outlook.office365.com (2a01:111:e400:2c5d::51) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Tue, 1 Dec 2015 08:23:26 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD049.mail.protection.outlook.com (10.58.145.4) with Microsoft SMTP Server (TLS) id 15.1.331.11 via Frontend Transport; Tue, 1 Dec 2015 08:23:25 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tB18NLuf003565; Tue, 1 Dec 2015 01:23:22 -0700 From: Dongsheng Wang To: Subject: [RESEND 2/3] drm :fsl-dcu: Cleanup vblank interrupt mask and status setting code Date: Tue, 1 Dec 2015 16:16:07 +0800 Message-ID: <1448957768-14627-1-git-send-email-dongsheng.wang@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD049; 1:gy9L5yByhvWmFQawnqsOCXfz7phky9AFBwQjs6kzJN7cGQNhpO8P/JJMRUxn3DEFB2f/0AWt83N7PJUWPpAyZ85+o47bklWTHWNOhNptc4iNVE49qeXWx8x1Yjv7OyeOR0OePIty8P5j3HwEup+MPxHsPhCPBRCnq5+gXqpajaEM8tutg/KeTS1bmjLXClzgT2StDV4cGJ6MuWmKlGJjUkC3yfgdwYTOhA4O3/WXfSlRXvqZ3FEwE03rE7qK65qVm80a0ypBWWBorhXAvjj9h9CFbiZ2buX2li5ObJ4cHQLhMbpkzKEU1pBK9VlGMpdrlf2Z4TH+NX/UvI/uJW2BGN8iFve69LVq+Fdjyz/2A8sXHo3mfhI61/KfSXZ0llNkdLPMnnoOVgyE15IfVLkl4IkRVsBji1YgJPQOoZdvan0= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(4001430100002)(87936001)(189998001)(110136002)(5001960100002)(106466001)(86362001)(97736004)(81156007)(5008740100001)(50226001)(104016004)(1220700001)(11100500001)(2351001)(50986999)(6806005)(92566002)(107886002)(47776003)(229853001)(69596002)(50466002)(33646002)(19580405001)(36756003)(5003940100001)(1096002)(586003)(19580395003)(85326001)(77096005)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1610; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1610; 2:gLPFAqXi1Ks7nLzNm89lbEceibWAdQs65THLWwx5YpTYBFh9/biBHTHq7n5I7AINjuWm2LAR3LlR+6GAwsBE20vxeCPWyztm/WzDl24BrebUHrH2qdzOC7q6BD8xEi0xebCwDG9MIGrQ0PnSzVwOyQ==; 3:EGbb3pfAkGiky9K2hMyMcYN8uhgowB5/RvLAfBULxiSBzRPOjGtECit4aFFFOk8tCST1qmCm345YVCtvKzY4rLBQL09Kutr2gizS0ammrVII+r78gw5cYN4AxpoBvWdxuGsNOsymtF5vy/nGEL2c+0aHP2sFpcInwGSSo3silp2yoPvf4lFMf0Sqh5LgOdwTKmgYy0kVypv/iV9RvSobSgztn3yqoEyVKAXi+bKBHuo=; 25:GvrXQEAAa+FnF2+e5TGNyuoLr1Ra5jFtT/lzbT475GbuxDl/gDv+6BhV3ZFz/PWg+tEbncJEm/81h1Z4f+Juu6CwKhHvwo3VNebCH6N2c5+6cjWptFURo62octwnfMPh1a3W+GhAutvoJKXuJ9qFni5Hl8tc2M+KsvoEHT7HNnHgZGrCKJEuilZpBnz2AZwi6Pu1H5SdLd8YrDVRjX5hV6vmLVr0Q1tDw+BMcpgbz3EfKEBeGyBH4pVtsEOcXiJxWRvTkurU0rCaJBhX+RlycA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1610; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1610; 20:9ZRTCPjZi9iyxQxqtdq+86QrutiYctguCBVXO7+iKJEkJFjfcRy7wgQOYcudFfe56DBKzLNCOfH/YEg51i9yxjcUr7igTiUGfpHj5OGTguXARJFJsH1otD1REXyU0nqBtCtQldfJJkMooOCsSJxyf+Zoe195B1gJzJuPTJIRlCYhsGBKFdz4keMHqsBjUE129HM38EMmEOLxZ+936hhgTh8lxfZN6rESTs0k9KxeHBX+u7ur4vF0sxHUxsaV/6cUJQR8Yqft7YEGTtrzW+icpPDb79+7vN6lp84nq5jFW0RdCInk5BV5LCK9vKokHTD/CX7TOh5DPpoTVH8s+fbdyd421E/Z3GywoVOwH79CN/E=; 4:EzDzC1ydE4toyYvr8/FmEjkxaGKX53O+uZVQOaQc00wtPoUvBKNm5eK+fMu/rDcvFloPA0RHFgzFOcZ7Tld9rw7jRy+WqMZcjIN7z/GNH7Zr1ze7FWIf89Fr1GmllvzVbsFXrDg+yayRv6udetIk+5tDewAxJekkiRG2V9vrezcGnJumUAToSONrosYTrguj5d1v+3CCgXBBX747Ycif8I61ulPyAH/F8co1pigRpkdSRZC9Ycxqwv+zh8H7g1O+dwM/kFdYbHlkZQzP8Eou/xQ0xFKCgngaHKz6t8xOaOLqbCYxM+UAO2459YgctIJukRXfmw0AWUGwwqDCYDpQTojVFjgLbb1gdU0IwzUzIkk3WXOQSgHS9DfTK1+1r2cLvfPjZEkwYOu/1hfSxu63eobD5+QU2ejRfZF8aqp9F90HuFo53ccTN8o1j3zSD/G6 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001); SRVR:CY1PR0301MB1610; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1610; X-Forefront-PRVS: 07778E4001 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1610; 23:JpNol+vIAWPb5NxHTtRNqokhz20/4HCUiIM2USl?= =?us-ascii?Q?rff0iQ4eu1EN269TROUbNAu/8aB1y9ZGu5+asTt105RJBFEYmhWDcJwsdZG0?= =?us-ascii?Q?qQM+5ZTO9gioICdWRolu/XT2DLiCghrkojm2l6kyg8olkvrK4uGL1RUsj/JA?= =?us-ascii?Q?ej45USJknsztsgULtwzQOiM/jh19eByHZ0yVqC5uJvU2oPO2ImkE05uexnfV?= =?us-ascii?Q?wce/Eyu6Adb4qKINQDgJ5UE9SXuuH1efspRJ2+7hS6jslyehJ3gaMLbTMJTU?= =?us-ascii?Q?Fd0Zim3RzXjDFzZKc5qlbLUMEwLSusnogppiB03qqARJTAPrs3z5NfQr3/B/?= =?us-ascii?Q?ED3Zav5Qt1I/8AyNVK4Ppq0ZEDUlF67FsH8tQ1Le8QBQfdtaGutPlrEizkuq?= =?us-ascii?Q?coLzrX7PMhJpAsfjE76wh/6lHCZCVLGH9JnKMYcj8wXxK7B9v3Rk6/RgVmHR?= =?us-ascii?Q?bTxJcf0Dm0uQG1DF7qRF+ShPKmFRIxwLtEXv1NLQgjLrqQ87dCM/wqwqmbFc?= =?us-ascii?Q?7Pmsqk/Z/iXigA4RKQvnPc7VkRZkzGOeDbBtqsy8VaaWYRDZcMIgJ9ef+1C5?= =?us-ascii?Q?BBFh47ein8Wh3MdazGT1ZoOhESpGbJKL9/vU5qB5GzXMSAYaTMVCV3T4eDSu?= =?us-ascii?Q?tgONkmEy6TYX2ax98mzg9loomNr5X0jzGHwkbfvA5llMiowpvARni5Ryk8fn?= =?us-ascii?Q?imv6654tIT6wdrrRfqDX5LCUqoHkSyn5vkSWG8EVUOll/xlbbLhK9+DBR77+?= =?us-ascii?Q?Nn4u/HpR9gpZ3jRzouZ0RHAWd61m2YU0CflDSwVIjVE/cJXx4rwrizwiyIvU?= =?us-ascii?Q?zCIxIgvkHRH47rz+r3MH0aUsrkwh6shuCmzD4ugfwaUbTI9n+96cy6Q9tKLy?= =?us-ascii?Q?4qwD1Acp1QQ7ucxDFZSY8JI/fuE4d61AqKZQXTgu/soPmJcwUPvpyMyJyrre?= =?us-ascii?Q?uMaR/pOC4W0BK2hz3WcRR9kcBYdtxFSjnCqvO0qZDRSD2j0oS1/3b9RYoPPr?= =?us-ascii?Q?3a1RH/np9QinBl1ksdVfSqdshf7FEHmoEsLIW5Bwyv/5Dpw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1610; 5:WOOAlWN0L+Aw/4kZIgq2fTWpH+UoR5fpFGs+w4KwU00puIc54Ayv7REVr5yTeUfg81/iaVdvQL+QnH+jDC/nP4tY3/XKI4uqO6Y65kzDM5VFPwb5uHJS7VC0MkFEX0T9UxUxEedVlzTvgy4E6ykQmQ==; 24:LOMh5ZrM+bFznT27to81nsy50w58t2bGe9uZxGjIQIhjgH2fn+3X5658RNhSdvNEVDsbPd6UOr9EXGziJDCgVEZYnx0C7Z1HiNxAsCcjhO8= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2015 08:23:25.4390 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1610 Cc: Yi Meng , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jianwei Wang Switch update interrupt mask bit with regmap_update_bits, and clear interrupt status by writing 1 to relevant bit before setting mask in fsl_dcu_drm_irq_init function. Signed-off-by: Jianwei Wang Signed-off-by: Yi Meng Signed-off-by: Wang Dongsheng diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 1930234..5c29ff7 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -38,21 +38,17 @@ static const struct regmap_config fsl_dcu_regmap_config = { static int fsl_dcu_drm_irq_init(struct drm_device *dev) { struct fsl_dcu_drm_device *fsl_dev = dev->dev_private; - unsigned int value; int ret; ret = drm_irq_install(dev, fsl_dev->irq); if (ret < 0) dev_err(dev->dev, "failed to install IRQ handler\n"); - ret = regmap_write(fsl_dev->regmap, DCU_INT_STATUS, 0); + ret = regmap_write(fsl_dev->regmap, DCU_INT_STATUS, 0xffffffff); if (ret) dev_err(dev->dev, "set DCU_INT_STATUS failed\n"); - ret = regmap_read(fsl_dev->regmap, DCU_INT_MASK, &value); - if (ret) - dev_err(dev->dev, "read DCU_INT_MASK failed\n"); - value &= DCU_INT_MASK_VBLANK; - ret = regmap_write(fsl_dev->regmap, DCU_INT_MASK, value); + ret = regmap_update_bits(fsl_dev->regmap, DCU_INT_MASK, + DCU_INT_MASK_VBLANK, ~DCU_INT_MASK_VBLANK); if (ret) dev_err(dev->dev, "set DCU_INT_MASK failed\n"); ret = regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE, @@ -143,14 +139,10 @@ static irqreturn_t fsl_dcu_drm_irq(int irq, void *arg) static int fsl_dcu_drm_enable_vblank(struct drm_device *dev, unsigned int pipe) { struct fsl_dcu_drm_device *fsl_dev = dev->dev_private; - unsigned int value; int ret; - ret = regmap_read(fsl_dev->regmap, DCU_INT_MASK, &value); - if (ret) - dev_err(dev->dev, "read DCU_INT_MASK failed\n"); - value &= ~DCU_INT_MASK_VBLANK; - ret = regmap_write(fsl_dev->regmap, DCU_INT_MASK, value); + ret = regmap_update_bits(fsl_dev->regmap, DCU_INT_MASK, + DCU_INT_MASK_VBLANK, ~DCU_INT_MASK_VBLANK); if (ret) dev_err(dev->dev, "set DCU_INT_MASK failed\n"); return 0; @@ -160,14 +152,10 @@ static void fsl_dcu_drm_disable_vblank(struct drm_device *dev, unsigned int pipe) { struct fsl_dcu_drm_device *fsl_dev = dev->dev_private; - unsigned int value; int ret; - ret = regmap_read(fsl_dev->regmap, DCU_INT_MASK, &value); - if (ret) - dev_err(dev->dev, "read DCU_INT_MASK failed\n"); - value |= DCU_INT_MASK_VBLANK; - ret = regmap_write(fsl_dev->regmap, DCU_INT_MASK, value); + ret = regmap_update_bits(fsl_dev->regmap, DCU_INT_MASK, + DCU_INT_MASK_VBLANK, DCU_INT_MASK_VBLANK); if (ret) dev_err(dev->dev, "set DCU_INT_MASK failed\n"); }