From patchwork Thu Nov 28 15:35:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 3254971 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1825D9F54F for ; Thu, 28 Nov 2013 15:35:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0FC3720653 for ; Thu, 28 Nov 2013 15:35:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0F99620638 for ; Thu, 28 Nov 2013 15:35:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F3C9FB6B6; Thu, 28 Nov 2013 07:35:11 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f172.google.com (mail-ea0-f172.google.com [209.85.215.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 18C6AFB635 for ; Thu, 28 Nov 2013 07:35:06 -0800 (PST) Received: by mail-ea0-f172.google.com with SMTP id q10so5913317ead.31 for ; Thu, 28 Nov 2013 07:35:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=UjrJybpkUy4TaaPKD1Q3ipKVHos2BB4hSGWaiMEGHMY=; b=TcEnQuXdP93W3Iq+43x0fXE8raDV3mE9CnkkfwvOKovbt2OIwHBtSS03hqXfikAYHQ xKNhGgvryoinEaUeoCDDkUjk7CWelfK+68JTakh+kksCmTX7p3wp+VTDNzNVoO5LoZ3R YBiL+630FPtTgnWEmxRUCdMPr5XJy+eGShNLePRzC2X/V0xHsKs6peUQonK7LJP0TQRE AIXiC56FRUqxxm9X1OGRAgB8xG2lMPlHubI3fj4YUU0e6H37Wl11BK2u/DZYotr9BXVs effGuzQCTAGq0uEAi8JIhwqhBS676wW3OnY6uAoJ9xWH4fkHw7GM909vWsKRB5neEvU3 bu9w== X-Gm-Message-State: ALoCoQmmAizz4oGFqXgYzVxc4IAE4mSKo+i11rttZl/xLJiT/nyZ3vb0yhwHsBH0tBgfK0h+91E1 X-Received: by 10.14.29.66 with SMTP id h42mr103728eea.4.1385652906190; Thu, 28 Nov 2013 07:35:06 -0800 (PST) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id j46sm31052551eew.18.2013.11.28.07.35.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2013 07:35:05 -0800 (PST) From: Thomas Wood To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH] drm: fix the addition of the side-by-side (half) flag for extra 3D modes Date: Thu, 28 Nov 2013 15:35:04 +0000 Message-Id: <1385652904-9495-1-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 1.8.4.2 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@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Ensure the side-by-side (half) flag is added to any existing flags when adding modes from 3D_Structure_ALL. Signed-off-by: Thomas Wood Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/drm_edid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index fb7cf0e..52e060e 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2701,7 +2701,7 @@ static int add_3d_struct_modes(struct drm_connector *connector, u16 structure, if (structure & (1 << 8)) { newmode = drm_mode_duplicate(dev, &edid_cea_modes[cea_mode]); if (newmode) { - newmode->flags = DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF; + newmode->flags |= DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF; drm_mode_probed_add(connector, newmode); modes++; }