]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/mgag200: Set DDC timeout in milliseconds
authorThomas Zimmermann <tzimmermann@suse.de>
Mon, 13 May 2024 12:51:06 +0000 (14:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Aug 2024 03:45:47 +0000 (05:45 +0200)
commit ecde5db1598aecab54cc392282c15114f526f05f upstream.

Compute the i2c timeout in jiffies from a value in milliseconds. The
original values of 2 jiffies equals 2 milliseconds if HZ has been
configured to a value of 1000. This corresponds to 2.2 milliseconds
used by most other DRM drivers. Update mgag200 accordingly.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Fixes: 414c45310625 ("mgag200: initial g200se driver (v2)")
Cc: Dave Airlie <airlied@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Jocelyn Falempe <jfalempe@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v3.5+
Link: https://patchwork.freedesktop.org/patch/msgid/20240513125620.6337-2-tzimmermann@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/mgag200/mgag200_i2c.c

index ac8e34eef5138b036b5248f48bcad828719d0bad..07f7e43c0dca352eccb8c9e694a006dbf9b0cb87 100644 (file)
@@ -134,7 +134,7 @@ struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev)
        i2c->adapter.algo_data = &i2c->bit;
 
        i2c->bit.udelay = 10;
-       i2c->bit.timeout = 2;
+       i2c->bit.timeout = usecs_to_jiffies(2200);
        i2c->bit.data = i2c;
        i2c->bit.setsda         = mga_gpio_setsda;
        i2c->bit.setscl         = mga_gpio_setscl;