projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
62cd2fa
677d23b
)
Merge branch 'udl-fixes' into drm-next
author
Dave Airlie
<airlied@redhat.com>
Fri, 8 Feb 2013 02:14:50 +0000
(12:14 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Fri, 8 Feb 2013 02:14:50 +0000
(12:14 +1000)
Fixes for usb/udl devices
* udl-fixes:
drm/udl: disable fb_defio by default
drm/udl: Inline memcmp() for RLE compression of xfer
drm/udl: make usage as a console safer
drm/usb: bind driver to correct device
1
2
drivers/gpu/drm/udl/udl_fb.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/udl/udl_fb.c
index caa84f1de9c1d46b8d35dd218945ad504b084292,1eb060cc71d10dade3d489becdb82032507ce927..b9feec9d08d3dad033b1b5940fd56c815c6f853d
---
1
/
drivers/gpu/drm/udl/udl_fb.c
---
2
/
drivers/gpu/drm/udl/udl_fb.c
+++ b/
drivers/gpu/drm/udl/udl_fb.c
@@@
-433,9
-469,10
+468,10
@@@
udl_framebuffer_init(struct drm_device
{
int ret;
+ spin_lock_init(&ufb->dirty_lock);
ufb->obj = obj;
- ret = drm_framebuffer_init(dev, &ufb->base, &udlfb_funcs);
drm_helper_mode_fill_fb_struct(&ufb->base, mode_cmd);
+ ret = drm_framebuffer_init(dev, &ufb->base, &udlfb_funcs);
return ret;
}