From patchwork Thu Apr 21 17:49:00 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: 8903061 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 580D99F1C1 for ; Thu, 21 Apr 2016 17:50:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5BCC2201EF for ; Thu, 21 Apr 2016 17:49:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 575412034A for ; Thu, 21 Apr 2016 17:49:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753466AbcDURtx (ORCPT ); Thu, 21 Apr 2016 13:49:53 -0400 Received: from mail-bn1bn0102.outbound.protection.outlook.com ([157.56.110.102]:51760 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751871AbcDURtu (ORCPT ); Thu, 21 Apr 2016 13:49:50 -0400 X-Greylist: delayed 6289 seconds by postgrey-1.27 at vger.kernel.org; Thu, 21 Apr 2016 13:49:50 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=JRIU8NzQqeRMdTFCw4nqFkJu4aC9y0dYbD/BmXBP5tE=; b=P2Zi+gdjGS5CZi8exOTaBEp87+WCntAoghEo1OE55pydmMO8E2aJMXgIMeq+pEqmuzmNJRvJ+weXyxSPVB45i3CmJJwCZT8nWA/lRibLtBgW0pTwaVJYTw5cVpWlK6EqMImnitpR3ohodCitkRQOUF0K/bai3su8YKxLOWgwQGc= Received: from CO2PR04CA024.namprd04.prod.outlook.com (10.141.240.152) by BN1PR04MB012.namprd04.prod.outlook.com (10.255.203.18) with Microsoft SMTP Server (TLS) id 15.1.466.19; Thu, 21 Apr 2016 17:49:48 +0000 Received: from BL2FFO11OLC002.protection.gbl (2a01:111:f400:7c09::133) by CO2PR04CA024.outlook.office365.com (2a01:111:e400:1428::24) with Microsoft SMTP Server (TLS) id 15.1.466.19 via Frontend Transport; Thu, 21 Apr 2016 17:49:47 +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 BL2FFO11OLC002.mail.protection.outlook.com (10.173.161.186) with Microsoft SMTP Server (TLS) id 15.1.472.8 via Frontend Transport; Thu, 21 Apr 2016 17:49:46 +0000 Received: from OLAWPA-EXHT05.ad.garmin.com (10.5.143.145) by edgetransport.garmin.com (192.168.18.223) with Microsoft SMTP Server (TLS) id 14.3.266.1; Thu, 21 Apr 2016 12:50:10 -0500 Received: from ola-5cc9c42.ad.garmin.com (10.5.143.129) by olawpa-exht05.ad.garmin.com (10.5.143.145) with Microsoft SMTP Server id 14.3.248.2; Thu, 21 Apr 2016 12:49:44 -0500 From: "J.D. Schroeder" To: , , , , CC: Jim Lodes , "J.D. Schroeder" Subject: [PATCH v2] OMAPDSS: HDMI5: Fix AVI infoframe Date: Thu, 21 Apr 2016 12:49:00 -0500 Message-ID: <1461260940-6660-1-git-send-email-Linux.HWI@garmin.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461246520-26734-1-git-send-email-Linux.HWI@garmin.com> References: <1461246520-26734-1-git-send-email-Linux.HWI@garmin.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.000.1202-22276.001 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)(50226001)(2201001)(16796002)(229853001)(50986999)(76176999)(87936001)(106466001)(47776003)(4326007)(19580395003)(36756003)(2906002)(81166005)(19580405001)(50466002)(4001430100002)(86362001)(48376002)(107886002)(189998001)(5003940100001)(1096002)(5001770100001)(2950100001)(92566002)(5003600100002)(6806005)(40036005)(5008740100001)(1220700001)(586003)(77096005); DIR:OUT; SFP:1102; SCL:1; SRVR:BN1PR04MB012; H:garmin.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC002; 1:rUXaFbOI85H7d47tidRoZdupQSSLYfmvymGPtX3WdHh7Lmm8yzuZGexnhBo/9r2FXZ9xwoD00It0EvNIVTLKeINkTgTAfJQw4jQOwO7Dz0bZUlKPbLM9hEuk5Lk2GKmxOajjQGULikGq1Hgp6vY0HNDbppjSdOyxzYvwNGn5DalQNvUuV82T0mVgkzzrLT2a+9RitbdWOtu+gFxnkCL/jRmGL3UYnc7ADUmHx8vpZ6mm6QQm6EqzwuGn0EBdEh7+32zqCbKJfv3z46znJA4PAxVmZUT6e9CrpAl5Psf526swRY1979mIyqN7U38SrIZ9BVV0r9j0vpR/BWd1G3N+dL7nGvZ46rucPL915gI32WTky56DkbjxIZ2JwJ0dyiJJdrPOP414BYS+uIGBYIKLDNfmrmV3tWrAT6x85WoGCF6XbIf8ncvhGNhFjJhiWUOq2urAyH5JEQorggmUKnH7zySLOnajr7twPQpAmKCtxSRp50woWP8HS9JqLnU8UE9N X-MS-Office365-Filtering-Correlation-Id: 2c94d4fe-18f0-4322-0e7f-08d36a0d544a X-Microsoft-Exchange-Diagnostics: 1; BN1PR04MB012; 2:mvwQGJDR9YrpQ1WZvNnBiwA8YopNP/Oz1WyRDeLO5B2coFnONRZosF7PLLcQtBNKEdcjv1hjshSFzNu6I6GmyJgq675yg08IPPWHeARGtR8SWJgKQOUOcuPYZ0bXCZra0p5bXjiDpd4ZQ+7PnuDJnubQji78BZcjVKZmzsAAb9dQoFYR+Xj8JA5YCrzvj76D; 3:7sJObzdTIG8x3w8QrcUm80IUIImLM2iOApbs9ocjL0UdIEFTOeGiE8JUf3uPKUDcHl0Fktb2EqgItC1HZ+q25ZEhBsssXddT7M8PfmcTGptvQH7IeY4CIAwuzhJXAEkq4OlLy8idj6nM9g1blpQT62mjSW8/YMbCvZpxAHpHvAepNnM//r5UTz3k8pgkbhjq+TUU7ZNXdGjRVRlTgvuwIXx6q8ndR70/J6U9elsQ0J/YqMsg8Cogq9kRjZ9z4aUhWW0yTdHsWr2VTCi/QVgftw== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:BN1PR04MB012; X-Microsoft-Exchange-Diagnostics: 1; BN1PR04MB012; 25:wH0PaQ6n9lhZrgKFomEMgfOHOYHeGdU/vskjGlgbLbJxMYysRKDzn9s7MGME3g/4mCGkY5CnoRudXV8xkEXPAswZRLeeVhs3dgbkzxnsAXkDIVEg7f9QwX48gov5T+NgpA6X1WjPsSErhA6sTsLM17vrGWtPRgAg+YLJSCcpd3gjH5BZrMmUPsyVpeN95vFyfO0hZYVaKF3pc83UtxaH7+0bTLYfh0VqNJpGv1n3QcUaMtfP6PJcve++ich+jof7KBTWaSMiDF1obZIj37KIjU+0g7LInd+jarQ+AI5LtZ2mAoxl6S6h3OHDRUUwIRPMbgGxlkqHa2LoEiFKZWX0ateea1EGmaw3+x8/VQ2hUvLcerITxVSPkWbDnTOnQXiD5gU26iszMCTRmtZZVjHmrS8ZzNG9Q76KQHnduW2XQaCWbjaSu5Xp/ltMt53CJNycExr12IQYRw+cq/BZmEQXCNUHcDqSA12xCPP5GRL+CdhyarV6qzVPEkdebjhZbbgE7uyF2dGhesbpwGPbbiDAsmx/OuRRWJEPqlto9SIsNMKyUwj6N9EYaLeVkHZxHg3oham0ktp7n/d7a2xTWBZwT9knzK+QCLX9uAHSNAfcJOqb/qyFwiKPDa2LbwK0Qbt8RPUjmIYGgYsWWvI40go88hSOB4b/qAoThYbuOiDLLd4YGyRSWV/9Z7DQ2wI0QnNq X-Microsoft-Exchange-Diagnostics: 1; BN1PR04MB012; 20:VX08Ds0+Wtg2WJmgT4FHJNct3w3C7FvN3ubTveOwmishE5B3BiDwcRyfVcTzfzqnvl+hANYr+L8jgac333OzChzboFNWuOM9oYHPQi29qTMqJ0lDqlJhKn0EWfBuLJOB3GGNITaBgl4RjLmyczCGfmNwQqB2ypUsF3850/z3KjSrZK+nHBodQluFnfl3796uGtLr9CVltC+5/QHlB8w2KlE2ykm3jzfL7KS9rT/HjPj3xRA1GP/jg3zlycAbupXCbe5b+thKlT1YqOaJkfyVtElmU4bWm0L88V7qv6McX2WKpDxdq0MGHXUAIU8tmzYK/o3MBipm5Shw4UZYQbvOZ3J81uBAIInWuT4dUuq+sQ7+6akBr5K8Cbgiq+CPYcqQjGfmMSwTOWqHTS2gSnq5vgmwQxQMURF7uJzruS+6L1XvxMjBWLJ2Uw8i3fLUgkrNe4qX6mbEjNFpXOvDFvWsQfzVRDc0A1AZdXEoV/Yfn0tOJZsc4t5NKN/u/lnHUriI X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(8121501046)(13018025)(5005006)(13023025)(13024025)(13017025)(3002001)(10201501046)(6055026); SRVR:BN1PR04MB012; BCL:0; PCL:0; RULEID:; SRVR:BN1PR04MB012; X-Microsoft-Exchange-Diagnostics: 1; BN1PR04MB012; 4:poKeZfCDmkkzB7X+1QdH8crKC17G6SQyWr67C3Gi6zwsej/UbOWjatBnI5ZccJru4+V3kSiMi20mxStpm1beuTgqh/iAIi2v/BnY5t28VkI+BZ8neLAQor7TwVqAwOOukzJMpQ5+rRYFfI3L4tZdO6Ejo2KS9LSnhkKTfn1B1Ez3EMeX+M1nyMhIBaF/I3Ath2dwL61n8iTSiRxEKsqMJFgoVqO//BxmxeR4dXTImzax5jyeuODeyBL5xH+r6XsYaRlFtghU0JkXKAKhJlka2gonkLh/Nt5FB9yrn02YjQZP0LC+qVe4ScCbeTMF+rSYD0SuNDMCquv+y91C2je3A/0zZkrLkLLTZKDgQCFh0VkUVjseQQvkmojI5HTbOuihr8UL8lnDRVhSJuRONhshz9/zOrKJxUqwEmtZs0ZJdwdZk71JJTq7b+SDOaA2HFk9CQBgzvkPm/hxVrJtnpz5i9/6qATYDQZgfi636IMURhs= X-Forefront-PRVS: 091949432C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR04MB012; 23:dveSTeIsFi8CWcpj9WUNS/55m2Bhexcuho6orGikxQ?= =?us-ascii?Q?i36b0c56zW9L+hMDOcbdKiKrYzYzVg9Kt4mZLlLKfKbzL4uKHlgChtbCZFt4?= =?us-ascii?Q?QjFzKJlims80hJSM3g5OfLQqUTLk7yu2chMvr6u15aL3AxSqe3hDjF1HuhSt?= =?us-ascii?Q?Ta0psgSvK0VIymK6C2C46nuMK/j8szikBoQ3AK9Z7JhaBlpyvgsU+haVAF9x?= =?us-ascii?Q?U/gS41TiA4ZDC8nj5NAdbAZ0lYQS2fe9Hwpb7+vLQr+gQLhjRDvZ9HoYPs44?= =?us-ascii?Q?U3Q51RGJZmF8q7eDM5U/FdI+lqXrftky3NjDUtag6BKX5IlHZa3KDeMbbo8q?= =?us-ascii?Q?4rHUWEtO6M1PGiyd2aDYeVW9igpTw3j+PjqtjPi9IzyTynKBJbX3fDGpp7/R?= =?us-ascii?Q?rBZPbLod0hPO97YKRQRHFeNrLAALq+UBqkQgbaK56jCwK5eDPW9f5z1v+pvN?= =?us-ascii?Q?XDONu/CqzD7whbjqJ2kdpXBrQiv8g6KvKwCxH0nHVt112vHeobTaOeyUrQwo?= =?us-ascii?Q?jBPhJeNCC/U+P6FAobswYhfg2DwW+Km84NI0r/oR09lNvm1QA2jh/hOvToE2?= =?us-ascii?Q?XtnLdR3y0D36je16VbmbgbWOJ/By53lyj8yddJlf7xGDvx+YA1QHGHNNIzyc?= =?us-ascii?Q?hDunftLo2AEaLAsR36Z8yDiCKQtAuJODs8jd95X1f7+6KZnYFK1axAEI9Uso?= =?us-ascii?Q?WvzpNgYt4jqgfTU39a50Nt61Iwc1h29FPaKh75/RWDNuubASH1C9+KnHpCS+?= =?us-ascii?Q?m8yYrUU7kIIsRAqZft81+9BGNZ8s8JGSs4kP5yKr+XD8FGgCeBRUNQ+9kFEM?= =?us-ascii?Q?hd+sJhlt2eGyWZT0TcPHbFh3a2MlQaleQ2mJCJnNvU65SJPRF6FydCPe4aSK?= =?us-ascii?Q?AR3L87U7NBWHJFEfh/xkiuEjDbw6QeadNmrR9hlCPQpDCIDR8Qhuhe7fhPvo?= =?us-ascii?Q?YXEZen0QvYRhdaV1ytN90PvLpcdgkKp0riTsoqfWp5lp/7naXvcqPX7tgJKv?= =?us-ascii?Q?47uwWQdNI74LVJvVth93NZw7sXY3d+LjwKAeCHCWEw6w=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR04MB012; 5:M5Yst+mPEA7RYpC0ExVZdY3RHsmRr/2hB0gUTyocixmXUL3MR1NAAWDZr50jnKivibg4Lt0nZgQUbDOnFULTpDBiI/+WbQdg4XLxyR7NWCLbwJqPQzNUZ7DDFXyU3JEzDyD8dMKM97MMeSU/scjGZJ0UlIXOo0jK81F6aYiLhACpAsZXh63NFlloMIFUzhr6; 24:vL1PYS27zWrT0J0EjGw+i7BeW8sZUcRXtVpqut0PhJpkRDc2isgSKNxikkHnmNmlRr65Y9ZGRTMR9XiOHPYYm1Ug7vgglG/Y7+gc75JMDp0=; 7:VCiFED9oVKyIDy3x6QETeRkKoj7c3TENvnopIjIwcF9b5t2bkBR9os0a2thFxQysSLM9PrCiK5g+yfvXkCazBt5ThnFk12WrCwNkiIC/87ucg66uRJtIq2jBdvUVD2lTtLh2T9oEnwAXDuqlHG77zdNEdpzHG+NFbom2YA0EKPoTU1VMSrSoGlViRTNw8HixngRK5b/pFfdxVPemBOP4bWV5dwQ89sgjzTTRnNkff10= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: garmin.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2016 17:49:46.7822 (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: BN1PR04MB012 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: Jim Lodes 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: Jim Lodes 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;