diff --git a/src/hidpp10.c b/src/hidpp10.c
index 3e500481..75be3318 100644
--- a/src/hidpp10.c
+++ b/src/hidpp10.c
@@ -373,28 +373,25 @@ hidpp10_get_optical_sensor_settings(struct ratbag_device *device, struct hidpp10
 	} \
 }
 
-static int
-hidpp10_get_current_resolution(struct ratbag_device *device, struct hidpp10_device *dev)
+int
+hidpp10_get_current_resolution(struct ratbag_device *device, struct hidpp10_device *dev,
+			       uint16_t *xres, uint16_t *yres)
 {
 	unsigned idx = dev->index;
 	union hidpp10_message resolution = CMD_CURRENT_RESOLUTION(idx, GET_LONG_REGISTER_REQ);
 	int res;
-	int xres, yres;
 
 	res = hidpp10_request_command(device, &resolution);
 	if (res)
 		return res;
 
 	/* resolution is in 50dpi multiples */
-	xres = hidpp10_get_unaligned_u16le(&resolution.data[4]) * 50;
-	yres = hidpp10_get_unaligned_u16le(&resolution.data[6]) * 50;
+	*xres = hidpp10_get_unaligned_u16le(&resolution.data[4]) * 50;
+	*yres = hidpp10_get_unaligned_u16le(&resolution.data[6]) * 50;
 
 	log_debug(device->ratbag,
 		  "Resolution is %dx%ddpi\n", xres, yres);
 
-	dev->xres = xres;
-	dev->yres = yres;
-
 	return 0;
 }
 
@@ -613,7 +610,7 @@ hidpp10_get_device_info(struct ratbag_device *device, struct hidpp10_device *dev
 	hidpp10_get_individual_features(device, dev);
 	hidpp10_get_hidpp_notifications(device, dev);
 
-	hidpp10_get_current_resolution(device, dev);
+	hidpp10_get_current_resolution(device, dev, &dev->xres, &dev->yres);
 	hidpp10_get_led_status(device, dev);
 	hidpp10_get_optical_sensor_settings(device, dev);
 	hidpp10_get_usb_refresh_rate(device, dev);
diff --git a/src/hidpp10.h b/src/hidpp10.h
index 3910dc8d..14e7aece 100644
--- a/src/hidpp10.h
+++ b/src/hidpp10.h
@@ -72,6 +72,13 @@ void hidpp10_list_devices(struct ratbag_device *device);
 int hidpp10_get_device_from_wpid(struct ratbag_device *device, uint16_t wpid, struct hidpp10_device *dev);
 int hidpp10_get_device_from_idx(struct ratbag_device *device, int idx, struct hidpp10_device *dev);
 
+/* -------------------------------------------------------------------------- */
+/* 0x63: Current Resolution                                                   */
+/* -------------------------------------------------------------------------- */
+int
+hidpp10_get_current_resolution(struct ratbag_device *device,
+			       struct hidpp10_device *dev,
+			       uint16_t *xres, uint16_t *yres);
 /* -------------------------------------------------------------------------- */
 /* 0xF1: Device Firmware Information                                          */
 /* -------------------------------------------------------------------------- */