aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_fbdev.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-05-26 12:54:33 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2018-06-28 06:41:05 -0400
commit3cbd0c587b129beaefb1405bbe43831e6bc9461e (patch)
treed31a45987312997a69db3959a37b09ac06f0952c /drivers/gpu/drm/omapdrm/omap_fbdev.c
parentdc8c9aeee5098688c1085691213fb9a703bf20ad (diff)
drm/omap: gem: Replace struct_mutex usage with omap_obj private lock
The DRM device struct_mutex is used to protect against concurrent GEM object operations that deal with memory allocation and pinning. All those operations are local to a GEM object and don't need to be serialized across different GEM objects. Replace the struct_mutex with a local omap_obj.lock or drop it altogether where not needed. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fbdev.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_fbdev.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 0f66c74a54b0..d958cc813a94 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -170,13 +170,11 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
170 goto fail; 170 goto fail;
171 } 171 }
172 172
173 mutex_lock(&dev->struct_mutex);
174
175 fbi = drm_fb_helper_alloc_fbi(helper); 173 fbi = drm_fb_helper_alloc_fbi(helper);
176 if (IS_ERR(fbi)) { 174 if (IS_ERR(fbi)) {
177 dev_err(dev->dev, "failed to allocate fb info\n"); 175 dev_err(dev->dev, "failed to allocate fb info\n");
178 ret = PTR_ERR(fbi); 176 ret = PTR_ERR(fbi);
179 goto fail_unlock; 177 goto fail;
180 } 178 }
181 179
182 DBG("fbi=%p, dev=%p", fbi, dev); 180 DBG("fbi=%p, dev=%p", fbi, dev);
@@ -212,12 +210,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
212 DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres); 210 DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
213 DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height); 211 DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height);
214 212
215 mutex_unlock(&dev->struct_mutex);
216
217 return 0; 213 return 0;
218 214
219fail_unlock:
220 mutex_unlock(&dev->struct_mutex);
221fail: 215fail:
222 216
223 if (ret) { 217 if (ret) {