From patchwork Thu Apr 21 13:48:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J.D. Schroeder" X-Patchwork-Id: 8901171 Return-Path: X-Original-To: patchwork-linux-fbdev@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 C8BFABF29F for ; Thu, 21 Apr 2016 14:21:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E78A9201B9 for ; Thu, 21 Apr 2016 14:21:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE7B5202EB for ; Thu, 21 Apr 2016 14:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751679AbcDUOVT (ORCPT ); Thu, 21 Apr 2016 10:21:19 -0400 Received: from mail-by2on0142.outbound.protection.outlook.com ([207.46.100.142]:16110 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751850AbcDUOVQ (ORCPT ); Thu, 21 Apr 2016 10:21:16 -0400 X-Greylist: delayed 1892 seconds by postgrey-1.27 at vger.kernel.org; Thu, 21 Apr 2016 10:21:16 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garmin.onmicrosoft.com; s=selector1-garmin-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=L7drO+aCMeZ9l2ZE3PWBoU2u4COBqurL6nmLyKXVBuY=; b=Ic9j3hovCXtZgoXQZDPHzBLT7VsTHfYh0vWfF18bmPCKsyZ6UuELZJ0ImSt62ZOHHABl4KwPseENgL6ggZJJWESZk7xaDO6fgYfbEEdZ2J/WEW1UnT5JyC9+Ww/WOqDFtjMHXEk9+Z8+2WiiDTpt+PPKOIaMo8x9IlyqN2aKXvw= Received: from CO2PR04CA042.namprd04.prod.outlook.com (10.141.240.170) by DM2PR0401MB1343.namprd04.prod.outlook.com (10.160.220.142) with Microsoft SMTP Server (TLS) id 15.1.466.19; Thu, 21 Apr 2016 13:49:26 +0000 Received: from BN1BFFO11FD036.protection.gbl (2a01:111:f400:7c10::1:165) by CO2PR04CA042.outlook.office365.com (2a01:111:e400:1428::42) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Thu, 21 Apr 2016 13:49:26 +0000 Authentication-Results: spf=pass (sender IP is 204.77.163.247) smtp.mailfrom=garmin.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=garmin.com; Received-SPF: Pass (protection.outlook.com: domain of garmin.com designates 204.77.163.247 as permitted sender) receiver=protection.outlook.com; client-ip=204.77.163.247; helo=garmin.com; Received: from garmin.com (204.77.163.247) by BN1BFFO11FD036.mail.protection.outlook.com (10.58.144.99) with Microsoft SMTP Server (TLS) id 15.1.472.8 via Frontend Transport; Thu, 21 Apr 2016 13:49:25 +0000 Received: from OLAWPA-EXHT02.ad.garmin.com (10.5.143.142) by edgetransport.garmin.com (192.168.18.223) with Microsoft SMTP Server (TLS) id 14.3.266.1; Thu, 21 Apr 2016 08:49:48 -0500 Received: from ola-5cc9c42.ad.garmin.com (10.5.143.129) by olawpa-exht02.ad.garmin.com (10.5.143.142) with Microsoft SMTP Server id 14.3.248.2; Thu, 21 Apr 2016 08:49:23 -0500 From: "J.D. Schroeder" To: , , , , CC: "Lodes, Jim" , "J.D. Schroeder" Subject: [PATCH] OMAPDSS: HDMI5: Fix AVI infoframe Date: Thu, 21 Apr 2016 08:48:40 -0500 Message-ID: <1461246520-26734-1-git-send-email-Linux.HWI@garmin.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.000.1202-22274.006 X-TM-AS-Result: No--6.778300-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:204.77.163.247; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(438002)(189002)(199003)(189998001)(5003940100001)(81166005)(50986999)(11100500001)(586003)(229853001)(106466001)(4326007)(4001430100002)(1220700001)(5001770100001)(19580405001)(1096002)(86362001)(50226001)(40036005)(47776003)(2201001)(48376002)(2906002)(5008740100001)(16796002)(107886002)(87936001)(50466002)(19580395003)(5003600100002)(77096005)(36756003)(92566002)(6806005); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0401MB1343; H:garmin.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD036; 1:unYBcoF9d6q9YCq2f5o3qSdCLAHeheQfL7tWo17DDsbcNo53KYgqFHd07DE3ctCIaacNhWySrZgM6MsQRAefJZwK+5i5FeFkw/bfq/V+/tjK0vFqy2Rk9pOWppsuuCsx218I4c7FjPcK+XKQHytK0SYZOkR+I3voPw/RoK8j1lyI49x3OdDev8CGLDF5qpBQgbfrZ6KaNznjaGyLvE0Xk3lbUMSWab6+MJWc95LBYXwlO49uxqs7ETHa1DhNDiTbG9w1WdGkrW5mbrmU9AnYXm2zhBakiTNGPcbUEhmS/HIzDONfwr4tYtOJyTQiXS6cj/whYVMvelSd79i/qCantpdcac26CEcGiYZAfEINleftxR9PlPnTYnYi0wYbOzXxOYQTQmdZVSkQzFfU3D60Aw9OhJU1zrsCVvf7pSRFAIyt5uLzLOowoYoZ1wiqaNn4HL3rDaQUF4Eo73keVlAfjJkaqODqRpmlXGGbrpGP8YsqfhoL40OToiAGEZKToRvc X-MS-Office365-Filtering-Correlation-Id: e91f32f9-8408-4707-6335-08d369ebc085 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1343; 2:/L4bhYB62lfzdyuiZS+r/KXGYzE0ka5SYXwK2Bf2AEB8L9K/QLaOpALhIR8BhxSHUsIg6X9g082J5EYxvhFKDf2Otp8lkJggS1iWmRpBQrH8ngCS9YyXB10iLCIuKkENoURGDpHWYDbNaeu+Tw/Rnm11s8wdNnW0iOEpT0RgZZvt2PKLbLCo27DW9kBcGmMV; 3:Brk0BJ9SOwf3KHZJpFGdrPJYrsImgFo5eM3l4s+oqtBHzcG36wHYPwH0SVARfbm9IUZImuObvjXO7ptqivoHd/b6qmOQ3DUwsRRySqedLn7Y1+HRyewun2eqDJOJrYyk7lRVTuhwnDgo9huDAXZSTdPqabds3ri86XaWqSTWVXOq7PQMUODkOiu/T/7RQHjPwvCaCl5cq+VCLA8Vp1fb3Kz8OOTTg0ZQ1cxeGuUgns7EZ/ZOOJDeV+2BobhBjDdbTXD9iufClRnBUXwTSYozOg==; 25:7CrOLnHUPZE96Wu94NAmZe2b/Ae4GpSrfPF3DpcW+ODEqboAwEVXcN5TwTW/AVzl/08EDk7gHcc4FIAEteX34t0lNTOrIc+qndA3ZsMKRQeqLQCJ96VZaj4iR5P4rcOuQTv0pBNvDdJDUN0es6VVaLsNCeWJMhqElGBzSoCjmlrPkkmcNtbbmUW/WeWUiZYsgNQk4JA4VshYsxzgD7k7ujJwzUMIsyJ66iiWcMfsmI55gVFFx1vLbfaL6omAGHXbhKrl7N6mSxEBjbHP2fpLpY2jt44cGH7U0kBhBtq6LbOHylSWUqRO7mTkLtxIG0hbOBRWNDrPWC/SVmQwI+jo8w== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:DM2PR0401MB1343; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1343; 20:6mNO0bmWUIKZiKfMnjLcdW2Fd03gjViUj9I6mwMF6wzd6Wfv8TN8uFJHzXVG90GxaP5zvFPfCizQUhtcxgCZ5q81RvnBF/W2mSNFydXYQ8BRQlXIo4i3YWrAqWSo5iv3AjLmdYF6nNsfU5as9nhKXB7c3/Q94yumKw3Lzgo4FYDzPykGgHhZRXrM+NW9d2pLWJWnAOZRextF6dzX1Yu/HwI9TZyKM0eU9ShARlT8mEpZ4Ksjc6ovtnlIkLdaxGwJWpJNO8GZbUjNpktuj1T1zbzs+TxwYYYBWIjziAeO5fc3qhHqSb0FPs1dsocvsqlYJ/oHOjwwpJ3hJFY8fQcVYczj7FkaxcLESzJdKGZl1KPrSG7P+iVI06YFhOWH5DExSOnLU70eAKLwNBacjHEvPutt/q7zv1HZvSqeWC4ChottRiVHqkdi+NoSrFgBN6/XxbJdf6UXIf0dHsxE4f9tVFahyg2HRzslIyqdrM0jMyP2qvBbu9BxYwrFnMELZtdt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(13017025)(13018025)(13023025)(13024025)(13015025)(3002001)(10201501046)(6055026); SRVR:DM2PR0401MB1343; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0401MB1343; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1343; 4:35/HLLVvinNhTHhpChvRmTWG0/wywudbOZ92prBWb+M0UXUHyQwAWpgmLBObgfX1tiXsGAkI1KqrRL/ks7olytv6Ui7UqBBCsxgV6AIy1ZU+PZ8iGy3I7l9n7QC+S0QmjfRPKzjrSzsqxXiapYFWiKgSGMS3U2Vpls+e/h0/iU+hY6nsAVRLe0uSv4sAuVnVSHtyX7iWTAd2TPxtLNZRNgHeDqwcgaE87audw5cRe4yE08CiPlvCrdMgI/0xuNrE+0s8nQCFlcxhjx1g4Xz88KjTIAcdyRQVlI8OZiewPNyY01Kc9gm8SQBzPbSDbXF3qOn6gpapvMviurMyWlMY/IsQIYr7a9XsxLExyLbLc5KYupr1fkBJNobcNvfzYBS6eWDlpQ2kRTvvQ65jl0blPJlF7lRZWOhJYIKhgoMsSVnRdSWLNYpkIapsiPBTGjEx4DV4aO4pXYJivspZ3xwGz5UIQ95tjaWvIJJqCtkcGPM= X-Forefront-PRVS: 091949432C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0401MB1343; 23:dVkj1eoXX6cnQAqXkTv+eC40PYS1Yy5Ns2sHJEB?= =?us-ascii?Q?BheSQkmcCUt5XdYVFsFv7ov5GMC3kP3mFUSeto8QFkVcL7mJOqnopyBKQEZN?= =?us-ascii?Q?C3M7oK56VDZS0GaGz4KsJ9KawYXMbe82by8PLHezir05sJn5H+Ylni210E9/?= =?us-ascii?Q?HwrRs9FEYyb8D+xV8UJDULj0h1z8IW7p0yWZfMVZSeMggALhFvKdSSUdspv8?= =?us-ascii?Q?SZo19F6lrKykJeuNZKrhQNXC5MDNfg9OIKYLUUtgT5+Gfezw+bofYAq8jAMC?= =?us-ascii?Q?LGCHFvh0rVPWziODFKka5J4H1CYudDVF+O/Vr/3j5bWrqUkPvS27CmsCCAXh?= =?us-ascii?Q?V6oAru4NXA+WZrAb61CgkXrCk+7JTHgtFR2gKi4h/Wu8uXU6FcnYDZnP3u87?= =?us-ascii?Q?3/qD+tWcC1x2WgznPYdmnVY3nfFcOOWGqiGO5xeodc3oYKO52hEzRzDDiRWA?= =?us-ascii?Q?G0WSx8Bai9yvzgqKEZf20aQrFAWH3V+upTOgrzAqRPYm9Jm/F3J2U7HZ9Nk9?= =?us-ascii?Q?OIafdNqJ+nmCpl9byCb4mlQvX///b1a5HzKzY5sKLGxTp7KgBi/G3F1zS27w?= =?us-ascii?Q?H5TfxvFIH8tYgSi9MinDCEYOh3QPZhHCeDHADC7y90A4orJzSBtOiITtbDG/?= =?us-ascii?Q?e/wmox9m6VlSOENsVzKYU63DsPMeu++njBdtsE03+YdPONIgBu8cUxGeBJ/s?= =?us-ascii?Q?d4XxuYiNlRNLb70pOX9OijoE7f3x0l7H67exIg7bAUq1aKLrlpIs4ufA9DEO?= =?us-ascii?Q?Q7OCFJ68v5r7ugftRWil//GX/ULDI8OuLuebwTszCez6xiIJXH21gN8ouSx1?= =?us-ascii?Q?rF+DHOgRqcV5ArNdcA8kA9h0k6PIs88iLLk8U69K0g+wX9oLtvmJVSSkbqZM?= =?us-ascii?Q?ghqPhdR9wztc8ZREacMouxJ2uCiKl3TPihschsRCxCDxSHuB1vAxpFFydDaD?= =?us-ascii?Q?uJfrm0EA5LnTgalwf0A7yRsOc8q0yJf4eJAUe/k2Mo9iRVh/E2FhYCY7VYrD?= =?us-ascii?Q?CXShnXI4b1wTFUwz6snXiyX97?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0401MB1343; 5:RYrVHeOp/IzpDyUrhBtZwp7fyR1RFBPXeu3aSyNnqX8JpRn7UJJclNxt02S71gYSDPc5+3DUO98sA8mF5lf8Bjhw0a8OHwNsxtxiK8i9L+iE1jRcdXWwYv+l9L521BYNuMSol52V1GqIlnkxw5kBaDPfEouwsDyKq/UHHUWWDgKBr56BZ5UUUE65Y+y2BBBR; 24:gYJutDetCpBEEqYa+GK1PnI4Ykz3wYPkhF6gIBO8gmkFE5fyIq3QkZgZELvvysizzCAKdcBkhHuNW0wKCOPs0GjRmBwf47anMZMCd99iArA=; 7:XXtbzolgY4rkQDodqfsuSCiWuIXHDH9BNjXX5I5k3zgNIBhs1NBvmvUfst8myTcv2+ezhw9Tv+XanW6RyfRz7ZtRPoqAW0oKhjbgb7pMLkd+2a+CV8JfhSGWRsPmZtX2abJiyMUACHtbwb1KdP5ROPHvtXgQqFTPwOZ6fOvQhF1krQTATgIKdLyFolr9SoGTinHRIwCf2FofwOQHdl3yJwQ/r1BrTfZzLrpdrbZWOCs= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: garmin.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2016 13:49:25.4762 (UTC) X-MS-Exchange-CrossTenant-Id: 38d0d425-ba52-4c0a-a03e-2a65c8e82e2d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38d0d425-ba52-4c0a-a03e-2a65c8e82e2d; Ip=[204.77.163.247]; Helo=[garmin.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0401MB1343 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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: "Lodes, Jim" The AVI infoframe R0-R3 in the 2nd data byte represents the Active Format Aspect Ratio. It is four bits long not two bits. This fixes that mask used to extract the bits before writing the bits to the hardware registers. Signed-off-by: Lodes, Jim Signed-off-by: J.D. Schroeder --- drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c index d993f78..8ab2093 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c @@ -458,7 +458,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_core_data *core, c = (ptr[1] >> 6) & 0x3; m = (ptr[1] >> 4) & 0x3; - r = (ptr[1] >> 0) & 0x3; + r = (ptr[1] >> 0) & 0xf; itc = (ptr[2] >> 7) & 0x1; ec = (ptr[2] >> 4) & 0x7; diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c index f3e4b81..bbfe7e2 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c @@ -442,7 +442,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_core_data *core, c = (ptr[1] >> 6) & 0x3; m = (ptr[1] >> 4) & 0x3; - r = (ptr[1] >> 0) & 0x3; + r = (ptr[1] >> 0) & 0xf; itc = (ptr[2] >> 7) & 0x1; ec = (ptr[2] >> 4) & 0x7;