Commit d1346a6c authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'drm-fixes' of git://

Pull drm fixes from Dave Airlie:
 "Just two changes: one udl endian fix, one nouveau memory corruption on
  some GPUs."

* 'drm-fixes' of git://
  drm/nouveau/fbcon: using nv_two_heads is not a good idea
  drm/udl: Make sure to get correct endian keys from vendor descriptor
parents 60d2c252 9bd0c15f
......@@ -467,7 +467,7 @@ int nouveau_fbcon_init(struct drm_device *dev)
nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs;
ret = drm_fb_helper_init(dev, &nfbdev->helper,
nv_two_heads(dev) ? 2 : 1, 4);
dev->mode_config.num_crtc, 4);
if (ret) {
return ret;
......@@ -61,7 +61,7 @@ static int udl_parse_vendor_descriptor(struct drm_device *dev,
u8 length;
u16 key;
key = *((u16 *) desc);
key = le16_to_cpu(*((u16 *) desc));
desc += sizeof(u16);
length = *desc;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment