diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-05-02 16:25:14 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-05-05 09:18:54 +0200 |
| commit | 931e3f3a0e997c41eafbc88e4fc07ba9fef28f29 (patch) | |
| tree | 435c7eafdc66bc24e65a3f5bb84ca5a9cc07de59 /drivers/gpu/drm/mgag200/mgag200_drv.c | |
| parent | f870231fdd6ce2c6c040a3584a2eac97ae473780 (diff) | |
| download | linux-stable-931e3f3a0e997c41eafbc88e4fc07ba9fef28f29.tar.gz linux-stable-931e3f3a0e997c41eafbc88e4fc07ba9fef28f29.tar.bz2 linux-stable-931e3f3a0e997c41eafbc88e4fc07ba9fef28f29.zip | |
drm/mgag200: Protect concurrent access to I/O registers with lock
Add a mutex lock to protect concurrent access to I/O registers
against each other. This happens between invocation of commit-
tail functions and get-mode operations. Both with use the CRTC
index registers MGA1064_GEN_IO_DATA and MGA1064_GEN_IO_CTL.
Concurrent access can lead to failed mode-setting operations.
v2:
* fix typo in commit description (Jocelyn)
* add comment to explain rmmio_lock
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220502142514.2174-4-tzimmermann@suse.de
Diffstat (limited to 'drivers/gpu/drm/mgag200/mgag200_drv.c')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 217844d71ab5..08839460606f 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -14,6 +14,7 @@ #include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_ioctl.h> +#include <drm/drm_managed.h> #include <drm/drm_module.h> #include <drm/drm_pciids.h> @@ -65,6 +66,11 @@ static int mgag200_regs_init(struct mga_device *mdev) struct pci_dev *pdev = to_pci_dev(dev->dev); u32 option, option2; u8 crtcext3; + int ret; + + ret = drmm_mutex_init(dev, &mdev->rmmio_lock); + if (ret) + return ret; switch (mdev->type) { case G200_PCI: |