diff options
author | Dave Airlie <airlied@redhat.com> | 2014-03-07 09:04:32 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-03-07 09:04:32 +1000 |
commit | ae693400bd2dd438f2bbacbb925233ba1dee9236 (patch) | |
tree | 115f56a6a5214b18b68ecad489393452ea70fd85 /drivers/gpu/drm/armada/armada_drv.c | |
parent | 7a4ee320cd33468e251f84631ff3b79fa6b6eb14 (diff) | |
parent | d13c46c67e546bb1dc1c4dc7c43e388d0119276b (diff) | |
download | op-kernel-dev-ae693400bd2dd438f2bbacbb925233ba1dee9236.zip op-kernel-dev-ae693400bd2dd438f2bbacbb925233ba1dee9236.tar.gz |
Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-fixes
fix for kfifo api change.
* 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
DRM: armada: fix use of kfifo_put()
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drv.c')
-rw-r--r-- | drivers/gpu/drm/armada/armada_drv.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index acf3a36..32982da 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -68,15 +68,7 @@ void __armada_drm_queue_unref_work(struct drm_device *dev, { struct armada_private *priv = dev->dev_private; - /* - * Yes, we really must jump through these hoops just to store a - * _pointer_ to something into the kfifo. This is utterly insane - * and idiotic, because it kfifo requires the _data_ pointed to by - * the pointer const, not the pointer itself. Not only that, but - * you have to pass a pointer _to_ the pointer you want stored. - */ - const struct drm_framebuffer *silly_api_alert = fb; - WARN_ON(!kfifo_put(&priv->fb_unref, &silly_api_alert)); + WARN_ON(!kfifo_put(&priv->fb_unref, fb)); schedule_work(&priv->fb_unref_work); } |