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 209FB376EC; Sun, 1 Sep 2024 17:05:48 +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=1725210348; cv=none; b=HhgqsOAchXHEUi+hlT+e2unwFO3Y9lwYjNKX5nnny7bvQ76ieLZYqEge8ZaJj4qlLE3qqIt9KrXVvP6ZhmuFE7jG8B39hthMnlffGOMAWKRJ7TF0uU7yAsrrwY0kLnX8iAtsHVHEsMJBO9R3WEkr76NiQZpX2LJJ7iAWgTXdYhE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725210348; c=relaxed/simple; bh=12cekVmXKJp+HTsp75JrFRnrkVoqR+wF4F07LVsh/pM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Miqv5PNNiDM45iGA1JqniS5kVHO91XauA5W8iKg9wCtmFQ2TMFPgU4MXnNWaYKIiq89VDAuIZaG5/vfKNErUhtTrDOnZGSmcTppzpoGxDM6R2terFMrgyCteZfI5spaBdgsQVIzmY9M0IAqycXiqsJehPgXFk1iNLf/HMktRRdM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=l6d/6crL; 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="l6d/6crL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98E2BC4CEC3; Sun, 1 Sep 2024 17:05:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725210348; bh=12cekVmXKJp+HTsp75JrFRnrkVoqR+wF4F07LVsh/pM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l6d/6crLJFoTP7323JBL6jGt3yIu96apbl0IKxRFM3T9hghntx/CHuIgRQ0eAeby5 xm1vnVl7JlZSIS09lxT19A647AQGm2JCZEPDOPQFncrv86neko9blbYlvw+9HDfGdt Ezni+WmPBRjJKT4vYIoFuyGTYUS1C7yE9ynBqnKs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jason Gerecke , Jiri Kosina Subject: [PATCH 5.15 162/215] HID: wacom: Defer calculation of resolution until resolution_code is known Date: Sun, 1 Sep 2024 18:17:54 +0200 Message-ID: <20240901160829.484131454@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160823.230213148@linuxfoundation.org> References: <20240901160823.230213148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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;