From patchwork Fri Sep 28 07:03:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Pilcher X-Patchwork-Id: 1517971 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id CCB98DF283 for ; Fri, 28 Sep 2012 09:34:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BCA10A0A2E for ; Fri, 28 Sep 2012 02:34:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ob0-f177.google.com (mail-ob0-f177.google.com [209.85.214.177]) by gabe.freedesktop.org (Postfix) with ESMTP id EDA289E9BF for ; Fri, 28 Sep 2012 00:03:53 -0700 (PDT) Received: by obbwd20 with SMTP id wd20so1738748obb.36 for ; Fri, 28 Sep 2012 00:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=1RHgxjUVAogxp/E6q04dpdGQEcFamKkGKP2L4TOK1Rw=; b=WSB50HQHCDFvCatiAB1RSEqxlup05QpdmOtXPrPisGr8b5Lv6bThtS6LY+q3z+wVbg xoJno++JxjGI10i/L439VUCYa9JvDhqDGBRam2GnetnZtHVSAGdIBWwIvctr+W5edwls GXszwc4cWCpgv3wZNc5+8yjLidVrUWqRqY8yXGs8x+YkeMC+kUBu1tu2wZhS9dXz5hUd xBVZV02+0DKgjb0K1k2MsLk73O8OE/7NQEz7ZTkb1Owgj5ltiTuw3w/tuMI3JGAwRmNo KDwfgO0Cr+gJf93onhg7aK9wtBAiKZLd05pmdc9mQ1iQK5dlbEcSy2HrPgEhhMvdUfds lcbA== Received: by 10.182.157.45 with SMTP id wj13mr5174427obb.58.1348815833493; Fri, 28 Sep 2012 00:03:53 -0700 (PDT) Received: from ian.icp.selfip.net (pool-71-170-109-80.dllstx.fios.verizon.net. [71.170.109.80]) by mx.google.com with ESMTPS id ql3sm7752521obc.17.2012.09.28.00.03.53 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Sep 2012 00:03:53 -0700 (PDT) From: Ian Pilcher To: ajax@redhat.com Subject: [PATCH v5 2/3] drm: Add EDID quirk to disable HDMI InfoFrames Date: Fri, 28 Sep 2012 02:03:43 -0500 Message-Id: <1348815824-12779-3-git-send-email-arequipeno@gmail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348815824-12779-1-git-send-email-arequipeno@gmail.com> References: <50636DEB.8000704@gmail.com> <1348815824-12779-1-git-send-email-arequipeno@gmail.com> Cc: airlied@redhat.com, Ian Pilcher , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org EDID_QUIRK_DISABLE_INFOFRAMES turns off all HDMI-specific functionality (audio, HDCP, 3D, etc.). Intended for displays that are confused by *any* InfoFrames. Signed-off-by: Ian Pilcher --- drivers/gpu/drm/drm_edid.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index ea535f6..0d788b5 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -70,6 +70,8 @@ #define EDID_QUIRK_DETAILED_SYNC_PP (1 << 6) /* Force reduced-blanking timings for detailed modes */ #define EDID_QUIRK_FORCE_REDUCED_BLANKING (1 << 7) +/* Display is confused by InfoFrames; don't send any */ +#define EDID_QUIRK_DISABLE_INFOFRAMES (1 << 8) struct detailed_mode_closure { struct drm_connector *connector; @@ -2109,6 +2111,14 @@ bool drm_detect_hdmi_monitor(struct edid *edid) int i, hdmi_id; int start_offset, end_offset; bool is_hdmi = false; + char buf[EDID_DISPLAY_ID_BUF_SIZE]; + + if (edid_get_quirks(edid) & EDID_QUIRK_DISABLE_INFOFRAMES) { + DRM_INFO("Disabling HDMI InfoFrames on display %s " + "due to EDID quirk\n", + drm_edid_display_id_format(edid->display_id, buf, 1)); + goto end; + } edid_ext = drm_find_cea_extension(edid); if (!edid_ext)