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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52216C04E53 for ; Wed, 15 May 2019 11:56:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 239E32084A for ; Wed, 15 May 2019 11:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557921398; bh=UjomiwKQ7V06zr0Xy9Uqky2wKgB5pF8Eyx6JImB/WFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H2e7ICJQKpkS640ebLakKjc9KMvAnvcl/uXMIWpCSc0OwrosiQg5aKBfEPVNNa+Kc P5zOf2JnRJ/4DlvGmCSkGR/trQwt6nYyFOpWrDmsFr5xpDS9d7JYfjum6brtZgHAmb Xf1Dp0O5JP5YfipmTIq3WXWHTrDts6zy74+GbTwI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730855AbfEOL4g (ORCPT ); Wed, 15 May 2019 07:56:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:55196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729870AbfEOLRt (ORCPT ); Wed, 15 May 2019 07:17:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D279920644; Wed, 15 May 2019 11:17:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919069; bh=UjomiwKQ7V06zr0Xy9Uqky2wKgB5pF8Eyx6JImB/WFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PJ1MVWkWJFY0n3qQfxNFAtGjeDEHpqH8HWxDqp9o5fF0Q6ixB0yhid1iXRY4gLkDt wV3feUfjCMpdL7lMfna1El6LxVDwXwKYoPBYJZMOCZmzTylDSG1xlkiwTEtvPkMSo4 uFTQJ9Gm0wQuCK2r1gh61gZCh0CEhGliIgCnAc6M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Torokhov , Sasha Levin Subject: [PATCH 4.14 011/115] HID: input: add mapping for "Toggle Display" key Date: Wed, 15 May 2019 12:54:51 +0200 Message-Id: <20190515090700.094498395@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090659.123121100@linuxfoundation.org> References: <20190515090659.123121100@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit c01908a14bf735b871170092807c618bb9dae654 ] According to HUT 1.12 usage 0xb5 from the generic desktop page is reserved for switching between external and internal display, so let's add the mapping. Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/hid/hid-input.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index f736bdf774dd8..d723185de3ba2 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -677,6 +677,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel break; } + if ((usage->hid & 0xf0) == 0xb0) { /* SC - Display */ + switch (usage->hid & 0xf) { + case 0x05: map_key_clear(KEY_SWITCHVIDEOMODE); break; + default: goto ignore; + } + break; + } + /* * Some lazy vendors declare 255 usages for System Control, * leading to the creation of ABS_X|Y axis and too many others. -- 2.20.1