From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62567EEB569 for ; Fri, 8 Sep 2023 19:44:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232817AbjIHToF (ORCPT ); Fri, 8 Sep 2023 15:44:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230022AbjIHToD (ORCPT ); Fri, 8 Sep 2023 15:44:03 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08778269A; Fri, 8 Sep 2023 12:43:28 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87F32C433AB; Fri, 8 Sep 2023 19:32:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694201527; bh=kZ+TCZCEVPZJ3fQjxLRlsufPXX3kxYU9r0aaJQ+jHnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q7bn3mt0tVrbIyzXz3gTSBFlgLwZu50jmC8GhH7nCRhnPY0C+95qxHXpd0ZANkWBg /qqlNuPDnKRWyeL3qBkk+V5YP5497+T9uKSTbNFdvN/EXs9JKbeDh8cYjEWdc7JNez hLd2fvXo1CmZp6B6ZY4pP4RX2e7y/pJtS6CpELtPgSBqBxu/zkMK4WofJyklnHjekf sgN5nup8i705KYRspkzZ9z2gLVy6ak6JSJvD9A8I613rp45o0AejFU1p6GnNz2dmeb RXgw1uYecNaSLVdzHsmA17K6myA95VF9VlgdSZzwElfJ92rdKJ93krNkWd0OiGfNf+ 3HsFKUNUJbfIg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ralph Campbell , Jani Nikula , Sasha Levin , maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.4 02/31] drm/edid: Add quirk for OSVR HDK 2.0 Date: Fri, 8 Sep 2023 15:31:31 -0400 Message-Id: <20230908193201.3462957-2-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908193201.3462957-1-sashal@kernel.org> References: <20230908193201.3462957-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.15 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ralph Campbell [ Upstream commit 98d4cb705bc00afd4a9a71cc1e84f7111682639a ] The OSVR virtual reality headset HDK 2.0 uses a different EDID vendor and device identifier than the HDK 1.1 - 1.4 headsets. Add the HDK 2.0 vendor and device identifier to the quirks table so that window managers do not try to display the desktop screen on the headset display. Closes: https://gitlab.freedesktop.org/drm/misc/-/issues/30 Signed-off-by: Ralph Campbell Tested-by: Ralph Campbell Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20230621061903.3422648-1-rcampbell@nvidia.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_edid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index e1a04461ba884..dd88c9c821ae8 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -230,6 +230,7 @@ static const struct edid_quirk { /* OSVR HDK and HDK2 VR Headsets */ EDID_QUIRK('S', 'V', 'R', 0x1019, EDID_QUIRK_NON_DESKTOP), + EDID_QUIRK('A', 'U', 'O', 0x1111, EDID_QUIRK_NON_DESKTOP), }; /* -- 2.40.1