From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B1571C5781; Tue, 27 Aug 2024 14:57:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724770673; cv=none; b=u1PqfUso1ZILe/tuRAq2vKztYYE6leRLXQpUK+fK4vCmEOkGbuirswtRc39gJqVMaNI+hmn8GNx+ZIfvuZRCPCufAoiXSvz/OctDXbdpEfrJidLT3kNPAUuZ7L4BNvvah3eqTZSQGWf61j/9MgjiSsl0BwqoPhdY8VTYmjcDhxQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724770673; c=relaxed/simple; bh=N5OQqige8QxLn9jADV4a6XG9jaHwfq05yq8LiA/NHfY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vv1MzIgNeIQhx95ACHgYIMbqDQV38Dl8kFDhccHceh+zH3ANkUom8+XGxMEofQc9TVdLh9pb7wpCAScznFxR5YKfX4SUYbUCOBUGkB23Ry4lFvb9Pmmj/PHrNb1+s4e3qikl1tIoqWhDr+kLEXEQbOgnc4LH4Yxwh8fSNy4yI/4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NB7T5TBc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NB7T5TBc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF549C61044; Tue, 27 Aug 2024 14:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724770673; bh=N5OQqige8QxLn9jADV4a6XG9jaHwfq05yq8LiA/NHfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NB7T5TBcgV3WSWgSj4LchHR7PqwJwQeVTcyAMTodI8gdenq7wlKAjdsF11VWH9d8R LJXJQSQ4SObDyk4IhB5nRvuKuh39t2NBvqDabfZsuPkms59V2M6VM1mvfOyDe1AmpP FVNGjDbAStkvajvAlLnMg/pLWNVlSBvTwC4hIM4k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jason Gerecke , Jiri Kosina Subject: [PATCH 6.6 300/341] HID: wacom: Defer calculation of resolution until resolution_code is known Date: Tue, 27 Aug 2024 16:38:51 +0200 Message-ID: <20240827143854.808924592@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827143843.399359062@linuxfoundation.org> References: <20240827143843.399359062@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Gerecke commit 1b8f9c1fb464968a5b18d3acc1da8c00bad24fad upstream. The Wacom driver maps the HID_DG_TWIST usage to ABS_Z (rather than ABS_RZ) for historic reasons. When the code to support twist was introduced in commit 50066a042da5 ("HID: wacom: generic: Add support for height, tilt, and twist usages"), we were careful to write it in such a way that it had HID calculate the resolution of the twist axis assuming ABS_RZ instead (so that we would get correct angular behavior). This was broken with the introduction of commit 08a46b4190d3 ("HID: wacom: Set a default resolution for older tablets"), which moved the resolution calculation to occur *before* the adjustment from ABS_Z to ABS_RZ occurred. This commit moves the calculation of resolution after the point that we are finished setting things up for its proper use. Signed-off-by: Jason Gerecke Fixes: 08a46b4190d3 ("HID: wacom: Set a default resolution for older tablets") Cc: stable@vger.kernel.org Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/wacom_wac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1924,12 +1924,14 @@ static void wacom_map_usage(struct input int fmax = field->logical_maximum; unsigned int equivalent_usage = wacom_equivalent_usage(usage->hid); int resolution_code = code; - int resolution = hidinput_calc_abs_res(field, resolution_code); + int resolution; if (equivalent_usage == HID_DG_TWIST) { resolution_code = ABS_RZ; } + resolution = hidinput_calc_abs_res(field, resolution_code); + if (equivalent_usage == HID_GD_X) { fmin += features->offset_left; fmax -= features->offset_right;