Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83ba9ea8 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: synaptics - set dimensions as reported by firmware 



Newer Synaptics firmware allows to query maximim dimensions reported by
device, let's use this data.

Tested-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent a083632e

drivers/input/mouse/synaptics.c

+23 −9
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
 * The x/y limits are taken from the Synaptics TouchPad interfacing Guide,

 * section 2.3.2, which says that they should be valid regardless of the

 * actual size of the sensor.

 * Note that newer firmware allows querying device for maximum useable

 * coordinates.

 */

#define XMIN_NOMINAL 1472

#define XMAX_NOMINAL 5472
@@ -194,24 +196,34 @@ static int synaptics_identify(struct psmouse *psmouse) 
}



/*

 * Read touchpad resolution

 * Read touchpad resolution and maximum reported coordinates

 * Resolution is left zero if touchpad does not support the query

 */

static int synaptics_resolution(struct psmouse *psmouse)

{

	struct synaptics_data *priv = psmouse->private;

	unsigned char res[3];

	unsigned char max[3];



	if (SYN_ID_MAJOR(priv->identity) < 4)

		return 0;



	if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res))

		return 0;



	if ((res[0] != 0) && (res[1] & 0x80) && (res[2] != 0)) {

	if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res) == 0) {

		if (res[0] != 0 && (res[1] & 0x80) && res[2] != 0) {

			priv->x_res = res[0]; /* x resolution in units/mm */

			priv->y_res = res[2]; /* y resolution in units/mm */

		}

	}



	if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 5 &&

	    SYN_CAP_MAX_DIMENSIONS(priv->ext_cap_0c)) {

		if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_DIMENSIONS, max)) {

			printk(KERN_ERR "Synaptics claims to have dimensions query,"

			       " but I'm not able to read it.\n");

		} else {

			priv->x_max = (max[0] << 5) | ((max[1] & 0x0f) << 1);

			priv->y_max = (max[2] << 5) | ((max[1] & 0xf0) >> 3);

		}

	}



	return 0;

}
@@ -578,8 +590,10 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv) 
	int i;



	__set_bit(EV_ABS, dev->evbit);

	input_set_abs_params(dev, ABS_X, XMIN_NOMINAL, XMAX_NOMINAL, 0, 0);

	input_set_abs_params(dev, ABS_Y, YMIN_NOMINAL, YMAX_NOMINAL, 0, 0);

	input_set_abs_params(dev, ABS_X,

			     XMIN_NOMINAL, priv->x_max ?: XMAX_NOMINAL, 0, 0);

	input_set_abs_params(dev, ABS_Y,

			     YMIN_NOMINAL, priv->y_max ?: YMAX_NOMINAL, 0, 0);

	input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0);

	__set_bit(ABS_TOOL_WIDTH, dev->absbit);

drivers/input/mouse/synaptics.h

+4 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define SYN_QUE_RESOLUTION		0x08

#define SYN_QUE_EXT_CAPAB		0x09

#define SYN_QUE_EXT_CAPAB_0C		0x0c

#define SYN_QUE_EXT_DIMENSIONS		0x0d



/* synatics modes */

#define SYN_BIT_ABSOLUTE_MODE		(1 << 7)
@@ -51,6 +52,7 @@ 
#define SYN_CAP_MULTI_BUTTON_NO(ec)	(((ec) & 0x00f000) >> 12)

#define SYN_CAP_PRODUCT_ID(ec)		(((ec) & 0xff0000) >> 16)

#define SYN_CAP_CLICKPAD(ex0c)		((ex0c) & 0x100100)

#define SYN_CAP_MAX_DIMENSIONS(ex0c)	((ex0c) & 0x020000)



/* synaptics modes query bits */

#define SYN_MODE_ABSOLUTE(m)		((m) & (1 << 7))
@@ -101,8 +103,8 @@ struct synaptics_data { 
	unsigned long int ext_cap;		/* Extended Capabilities */

	unsigned long int ext_cap_0c;		/* Ext Caps from 0x0c query */

	unsigned long int identity;		/* Identification */

	int x_res;				/* X resolution in units/mm */

	int y_res;				/* Y resolution in units/mm */

	unsigned int x_res, y_res;		/* X/Y resolution in units/mm */

	unsigned int x_max, y_max;		/* Max dimensions (from FW) */



	unsigned char pkt_type;			/* packet type - old, new, etc */

	unsigned char mode;			/* current mode byte */