Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d67f2e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Just noticed I hadn't send these out, nothing majorly urgent, I know
  AMD guys have some regression fixes coming soon.

  This contains:
   2 nouveau fixes so it loads on the retina MBP systems properly,
   2 vmwgfx fixes to load the driver earlier, and allow distros config it
   1 error->debug fix in ast
  and Keith was playing with 32-on-64 and decided we may as well stick
  the compat ioctl in all the drivers.  It fixes udl for him."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at boot
  drm/vmwgfx: allow a kconfig option to choose if fbcon is enabled
  drm: use drm_compat_ioctl for 32-bit apps
  drm/ast: drop debug level on error printk
  drm/nv50-/gpio: initialise to vbios defaults during init
  drm/nvd0/disp: hopefully fix selection of 6/8bpc mode on DP outputs
parents 55d512e2 c4903429

drivers/gpu/drm/ast/ast_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -193,6 +193,9 @@ static const struct file_operations ast_fops = { 
	.mmap = ast_mmap,

	.poll = drm_poll,

	.fasync = drm_fasync,

#ifdef CONFIG_COMPAT

	.compat_ioctl = drm_compat_ioctl,

#endif

	.read = drm_read,

};

drivers/gpu/drm/ast/ast_mode.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ int ast_cursor_init(struct drm_device *dev) 


	ast->cursor_cache = obj;

	ast->cursor_cache_gpu_addr = gpu_addr;

	DRM_ERROR("pinned cursor cache at %llx\n", ast->cursor_cache_gpu_addr);

	DRM_DEBUG_KMS("pinned cursor cache at %llx\n", ast->cursor_cache_gpu_addr);

	return 0;

fail:

	return ret;

drivers/gpu/drm/cirrus/cirrus_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ static const struct file_operations cirrus_driver_fops = { 
	.unlocked_ioctl = drm_ioctl,

	.mmap = cirrus_mmap,

	.poll = drm_poll,

#ifdef CONFIG_COMPAT

	.compat_ioctl = drm_compat_ioctl,

#endif

	.fasync = drm_fasync,

};

static struct drm_driver driver = {

drivers/gpu/drm/exynos/exynos_drm_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ static const struct file_operations exynos_drm_driver_fops = { 
	.poll		= drm_poll,

	.read		= drm_read,

	.unlocked_ioctl	= drm_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = drm_compat_ioctl,

#endif

	.release	= drm_release,

};

drivers/gpu/drm/i810/i810_dma.c

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ static const struct file_operations i810_buffer_fops = { 
	.unlocked_ioctl = drm_ioctl,

	.mmap = i810_mmap_buffers,

	.fasync = drm_fasync,

#ifdef CONFIG_COMPAT

	.compat_ioctl = drm_compat_ioctl,

#endif

	.llseek = noop_llseek,

};