Skip to content

Commit

Permalink
drm/omap: avoid aquiring mutex in atomic context (v2)
Browse files Browse the repository at this point in the history
omap_gem_roll() could be called by fbcon in atomic context or when
struct_mutext is held.  Avoid aquiring mutex (deadlock), or calling
tiler_pin() (which itself is not safe for atomic context) in these
cases.

Signed-off-by: Rob Clark <rob@ti.com>
  • Loading branch information
Rob Clark committed Dec 16, 2011
1 parent c9c4448 commit b972bba
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions drivers/staging/omapdrm/omap_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -538,10 +538,22 @@ int omap_gem_roll(struct drm_gem_object *obj, uint32_t roll)
return -EINVAL;
}

mutex_lock(&obj->dev->struct_mutex);

omap_obj->roll = roll;

if (in_atomic() || mutex_is_locked(&obj->dev->struct_mutex)) {
/* this can get called from fbcon in atomic context.. so
* just ignore it and wait for next time called from
* interruptible context to update the PAT.. the result
* may be that user sees wrap-around instead of scrolling
* momentarily on the screen. If we wanted to be fancier
* we could perhaps schedule some workqueue work at this
* point.
*/
return 0;
}

mutex_lock(&obj->dev->struct_mutex);

/* if we aren't mapped yet, we don't need to do anything */
if (omap_obj->block) {
struct page **pages;
Expand Down

0 comments on commit b972bba

Please sign in to comment.