libretro/Lakka-LibreELEC
0
0
Fork 1
mirror of https://github.com/libretro/Lakka-LibreELEC.git synced 2025-03-01 06:51:22 +00:00
Code Issues
Lakka-LibreELEC/packages/linux/patches/.backup_patches/Lakka-default/v6-09-13-HID-playstation-add-DualSense-lightbar-support.patch
Tomáš Kelemen (vudiq) 18afade349 linux: rename backed up patches (remove space from path)
2023-01-13 23:03:38 +01:00

292 lines
11 KiB
Diff
Raw Permalink Blame History

From patchwork Sun Feb 7 21:49:04 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Roderick Colenbrander <roderick@gaikai.com>
X-Patchwork-Id: 12073413
X-Patchwork-Delegate: jikos@jikos.cz
Return-Path: <linux-input-owner@kernel.org>
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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH,
MAILING_LIST_MULTI,SPF_HELO_NONE,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 A2432C433DB
for <linux-input@archiver.kernel.org>; Sun, 7 Feb 2021 21:50:52 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
by mail.kernel.org (Postfix) with ESMTP id 8519E64E3F
for <linux-input@archiver.kernel.org>; Sun, 7 Feb 2021 21:50:52 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229609AbhBGVuh (ORCPT <rfc822;linux-input@archiver.kernel.org>);
Sun, 7 Feb 2021 16:50:37 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54918 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229564AbhBGVug (ORCPT
<rfc822;linux-input@vger.kernel.org>); Sun, 7 Feb 2021 16:50:36 -0500
Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com
[IPv6:2607:f8b0:4864:20::531])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B05C0C061797
for <linux-input@vger.kernel.org>;
Sun, 7 Feb 2021 13:49:24 -0800 (PST)
Received: by mail-pg1-x531.google.com with SMTP id j5so175213pgb.11
for <linux-input@vger.kernel.org>;
Sun, 07 Feb 2021 13:49:24 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gaikai-com.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=uzBte6r7kxC0wtPH+qtBYHjK6eZ3c0NP6i9Dj0b96+Q=;
b=uun6CtsAlDmemDPwUbFuT37gppSFdrZSq3hNKQPhrCyXzVLGdatekwlJrvIl5bTdaZ
NbPV3HNej1NhYTxdB5GHTAafe5kGzpkFZrX1pzwTVh68zT39zVA6YFESJof6ksK5Zupg
PMiAnBruTpgQmQfYGheU/FB89zBg4b3ko3J8CzjcvS/GJJDDUd1f21eRvPP/eu0IG/a6
sCvl5QQeI8o096KfUdvLAsBGRGReHRsi6A81NGZmg5GXSynD5C/mvPFDqLbV1fmMEC2h
oBbpMubr/XpNU0xU8ud5lg5LUuIyzkb8z8kghOjLx2dxww4jxW+2bpjLGJYCJ6UWkm4N
46VQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=uzBte6r7kxC0wtPH+qtBYHjK6eZ3c0NP6i9Dj0b96+Q=;
b=X/2DoMPONnMjrikG1YuORe4JXOjW2bmXmyzH2LpAL/Ghm+SkhYOt/N0Od5fK0GwwSD
4uJVZ9+LY4X2o3HOTT6rcFOi5HG8rxWrahUoEcA4UuEkdp3ziX8v00grrR5qC+g7iVe7
wYcHxOFela1PvVkERl1u1My6ahL0r2uVaxcls40GfCGa+B4/121sCyWCugZiT5NFYtrZ
ceclNUhMfw0fVeF2iQlxsHkq8GGWvmQN/Pvxj2D4ycrg9QusGu1P7ZBKauJ8IBkdlXiy
nQyzpMWuTQJquyvHEKpHJWjOGPaPNWwiHju5fOuB046Xd1Yot1IR24Um5V8dP2hh1GoC
1whA==
X-Gm-Message-State: AOAM531DPqlIjRnvVwXXuPrnv5YE/bi0IDSz6GjG3uWtZxCbN+XVqkqY
aS8KVJu7wA/7Y4LVrjh5QMddCg==
X-Google-Smtp-Source:
ABdhPJyf0t6kiFv0YMhYpssTZLjH5N8XD81WAHjcXK5UfZcDVy6hhLn4TAmqmFKQMmWqQDyvXuRZCQ==
X-Received: by 2002:a05:6a00:2385:b029:1b6:1603:4ea3 with SMTP id
f5-20020a056a002385b02901b616034ea3mr14968051pfc.40.1612734564200;
Sun, 07 Feb 2021 13:49:24 -0800 (PST)
Received: from us8c16456344dc.lan (cpe-76-87-77-78.socal.res.rr.com.
[76.87.77.78])
by smtp.gmail.com with ESMTPSA id
a141sm16578991pfa.189.2021.02.07.13.49.23
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 07 Feb 2021 13:49:23 -0800 (PST)
From: Roderick Colenbrander <roderick@gaikai.com>
To: Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: linux-input@vger.kernel.org, Chris Ye <lzye@google.com>, =?utf-8?q?Barna?=
=?utf-8?q?b=C3=A1s_P=C5=91cze?= <pobrn@protonmail.com>, =?utf-8?q?Samuel_?=
=?utf-8?q?=C4=8Cavoj?= <sammko@sammserver.com>, =?utf-8?q?Florian_M=C3=A4rk?=
=?utf-8?q?l?= <linux@florianmaerkl.de>,
Roderick Colenbrander <roderick.colenbrander@sony.com>
Subject: [PATCH v6 09/13] HID: playstation: add DualSense lightbar support
Date: Sun, 7 Feb 2021 13:49:04 -0800
Message-Id: <20210207214908.79573-10-roderick@gaikai.com>
X-Mailer: git-send-email 2.26.2
In-Reply-To: <20210207214908.79573-1-roderick@gaikai.com>
References: <20210207214908.79573-1-roderick@gaikai.com>
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
X-Mailing-List: linux-input@vger.kernel.org
From: Roderick Colenbrander <roderick.colenbrander@sony.com>
Expose the DualSense its RGB lightbar using the new multicolor LED
framework.
Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
---
drivers/hid/Kconfig | 1 +
drivers/hid/hid-playstation.c | 118 ++++++++++++++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 54b4eee222f9..cfa29dc17064 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -857,6 +857,7 @@ config HID_PLAYSTATION
tristate "PlayStation HID Driver"
depends on HID
select CRC32
+ select LEDS_CLASS_MULTICOLOR
select POWER_SUPPLY
help
Provides support for Sony PS5 controllers including support for
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index 64193fdeaa0d..97c1118ba78f 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -10,6 +10,7 @@
#include <linux/device.h>
#include <linux/hid.h>
#include <linux/input/mt.h>
+#include <linux/led-class-multicolor.h>
#include <linux/module.h>
#include <asm/unaligned.h>
@@ -99,6 +100,10 @@ struct ps_calibration_data {
/* Flags for DualSense output report. */
#define DS_OUTPUT_VALID_FLAG0_COMPATIBLE_VIBRATION BIT(0)
#define DS_OUTPUT_VALID_FLAG0_HAPTICS_SELECT BIT(1)
+#define DS_OUTPUT_VALID_FLAG1_LIGHTBAR_CONTROL_ENABLE BIT(2)
+#define DS_OUTPUT_VALID_FLAG1_RELEASE_LEDS BIT(3)
+#define DS_OUTPUT_VALID_FLAG2_LIGHTBAR_SETUP_CONTROL_ENABLE BIT(1)
+#define DS_OUTPUT_LIGHTBAR_SETUP_LIGHT_OUT BIT(1)
/* DualSense hardware limits */
#define DS_ACC_RES_PER_G 8192
@@ -128,6 +133,13 @@ struct dualsense {
uint8_t motor_left;
uint8_t motor_right;
+ /* RGB lightbar */
+ struct led_classdev_mc lightbar;
+ bool update_lightbar;
+ uint8_t lightbar_red;
+ uint8_t lightbar_green;
+ uint8_t lightbar_blue;
+
struct work_struct output_worker;
void *output_report_dmabuf;
uint8_t output_seq; /* Sequence number for output report. */
@@ -473,6 +485,45 @@ static int ps_get_report(struct hid_device *hdev, uint8_t report_id, uint8_t *bu
return 0;
}
+/* Register a DualSense/DualShock4 RGB lightbar represented by a multicolor LED. */
+static int ps_lightbar_register(struct ps_device *ps_dev, struct led_classdev_mc *lightbar_mc_dev,
+ int (*brightness_set)(struct led_classdev *, enum led_brightness))
+{
+ struct hid_device *hdev = ps_dev->hdev;
+ struct mc_subled *mc_led_info;
+ struct led_classdev *led_cdev;
+ int ret;
+
+ mc_led_info = devm_kmalloc_array(&hdev->dev, 3, sizeof(*mc_led_info),
+ GFP_KERNEL | __GFP_ZERO);
+ if (!mc_led_info)
+ return -ENOMEM;
+
+ mc_led_info[0].color_index = LED_COLOR_ID_RED;
+ mc_led_info[1].color_index = LED_COLOR_ID_GREEN;
+ mc_led_info[2].color_index = LED_COLOR_ID_BLUE;
+
+ lightbar_mc_dev->subled_info = mc_led_info;
+ lightbar_mc_dev->num_colors = 3;
+
+ led_cdev = &lightbar_mc_dev->led_cdev;
+ led_cdev->name = devm_kasprintf(&hdev->dev, GFP_KERNEL, "playstation::%pMR::rgb",
+ ps_dev->mac_address);
+ if (!led_cdev->name)
+ return -ENOMEM;
+ led_cdev->brightness = 255;
+ led_cdev->max_brightness = 255;
+ led_cdev->brightness_set_blocking = brightness_set;
+
+ ret = devm_led_classdev_multicolor_register(&hdev->dev, lightbar_mc_dev);
+ if (ret < 0) {
+ hid_err(hdev, "Cannot register multicolor LED device\n");
+ return ret;
+ }
+
+ return 0;
+}
+
static struct input_dev *ps_sensors_create(struct hid_device *hdev, int accel_range, int accel_res,
int gyro_range, int gyro_res)
{
@@ -651,6 +702,26 @@ static int dualsense_get_mac_address(struct dualsense *ds)
return ret;
}
+static int dualsense_lightbar_set_brightness(struct led_classdev *cdev,
+ enum led_brightness brightness)
+{
+ struct led_classdev_mc *mc_cdev = lcdev_to_mccdev(cdev);
+ struct dualsense *ds = container_of(mc_cdev, struct dualsense, lightbar);
+ unsigned long flags;
+
+ led_mc_calc_color_components(mc_cdev, brightness);
+
+ spin_lock_irqsave(&ds->base.lock, flags);
+ ds->update_lightbar = true;
+ ds->lightbar_red = mc_cdev->subled_info[0].brightness;
+ ds->lightbar_green = mc_cdev->subled_info[1].brightness;
+ ds->lightbar_blue = mc_cdev->subled_info[2].brightness;
+ spin_unlock_irqrestore(&ds->base.lock, flags);
+
+ schedule_work(&ds->output_worker);
+ return 0;
+}
+
static void dualsense_init_output_report(struct dualsense *ds, struct dualsense_output_report *rp,
void *buf)
{
@@ -734,6 +805,15 @@ static void dualsense_output_worker(struct work_struct *work)
ds->update_rumble = false;
}
+ if (ds->update_lightbar) {
+ common->valid_flag1 |= DS_OUTPUT_VALID_FLAG1_LIGHTBAR_CONTROL_ENABLE;
+ common->lightbar_red = ds->lightbar_red;
+ common->lightbar_green = ds->lightbar_green;
+ common->lightbar_blue = ds->lightbar_blue;
+
+ ds->update_lightbar = false;
+ }
+
spin_unlock_irqrestore(&ds->base.lock, flags);
dualsense_send_output_report(ds, &report);
@@ -918,6 +998,31 @@ static int dualsense_play_effect(struct input_dev *dev, void *data, struct ff_ef
return 0;
}
+static int dualsense_reset_leds(struct dualsense *ds)
+{
+ struct dualsense_output_report report;
+ uint8_t *buf;
+
+ buf = kzalloc(sizeof(struct dualsense_output_report_bt), GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ dualsense_init_output_report(ds, &report, buf);
+ /*
+ * On Bluetooth the DualSense outputs an animation on the lightbar
+ * during startup and maintains a color afterwards. We need to explicitly
+ * reconfigure the lightbar before we can do any programming later on.
+ * In USB the lightbar is not on by default, but redoing the setup there
+ * doesn't hurt.
+ */
+ report.common->valid_flag2 = DS_OUTPUT_VALID_FLAG2_LIGHTBAR_SETUP_CONTROL_ENABLE;
+ report.common->lightbar_setup = DS_OUTPUT_LIGHTBAR_SETUP_LIGHT_OUT; /* Fade light out. */
+ dualsense_send_output_report(ds, &report);
+
+ kfree(buf);
+ return 0;
+}
+
static struct ps_device *dualsense_create(struct hid_device *hdev)
{
struct dualsense *ds;
@@ -989,6 +1094,19 @@ static struct ps_device *dualsense_create(struct hid_device *hdev)
if (ret)
goto err;
+ /*
+ * The hardware may have control over the LEDs (e.g. in Bluetooth on startup).
+ * Reset the LEDs (lightbar, mute, player leds), so we can control them
+ * from software.
+ */
+ ret = dualsense_reset_leds(ds);
+ if (ret)
+ goto err;
+
+ ret = ps_lightbar_register(ps_dev, &ds->lightbar, dualsense_lightbar_set_brightness);
+ if (ret)
+ goto err;
+
return &ds->base;
err:
View Git Blame Copy Permalink