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

Commit 08b022a9 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:
 "Xmas fixes pull:

  core:
      one atomic fix, revert the WARN_ON dumb buffers patch.

  agp:
      fixup Dave J.

  nouveau:
      fix 3.18 regression for old userspace

  tegra fixes:
      vblank and iommu fixes

  amdkfd:
      fix bugs shown by testing with userspace, init apertures once

  msm:
      hdmi fixes and cleanup

  i915:
      misc fixes

  There is also a link ordering fix that I've asked to be cc'ed to you,
  putting iommu before gpu, it fixes an issue with amdkfd when things
  are all in the kernel, but I didn't like sending it via my tree
  without discussion.

  I'll probably be a bit on/off for a few weeks with pulls now, due to
  holidays and LCA, so don't be surprised if stuff gets a bit backed up,
  and things end up a bit large due to lag"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (28 commits)
  Revert "drm/gem: Warn on illegal use of the dumb buffer interface v2"
  agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags
  nouveau: bring back legacy mmap handler
  drm/msm/hdmi: rework HDMI IRQ handler
  drm/msm/hdmi: enable regulators before clocks to avoid warnings
  drm/msm/mdp5: update irqs on crtc<->encoder link change
  drm/msm: block incoming update on pending updates
  drm/atomic: fix potential null ptr on plane enable
  drm/msm: Deletion of unnecessary checks before the function call "release_firmware"
  drm/msm: Deletion of unnecessary checks before two function calls
  drm/tegra: dc: Select root window for event dispatch
  drm/tegra: gem: Use the proper size for GEM objects
  drm/tegra: gem: Flush buffer objects upon allocation
  drm/tegra: dc: Fix a potential race on page-flip completion
  drm/tegra: dc: Consistently use the same pipe
  drm/irq: Add drm_crtc_vblank_count()
  drm/irq: Add drm_crtc_handle_vblank()
  drm/irq: Add drm_crtc_send_vblank_event()
  drm/i915: Disable PSMI sleep messages on all rings around context switches
  drm/i915: Force the CS stall for invalidate flushes
  ...
parents ebda37c9 da6b51d0

drivers/char/agp/ali-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -417,6 +417,6 @@ static void __exit agp_ali_cleanup(void) 
module_init(agp_ali_init);

module_exit(agp_ali_cleanup);



MODULE_AUTHOR("Dave Jones <davej@redhat.com>");

MODULE_AUTHOR("Dave Jones");

MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/amd64-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -813,6 +813,6 @@ static void __exit agp_amd64_cleanup(void) 
module_init(agp_amd64_mod_init);

module_exit(agp_amd64_cleanup);



MODULE_AUTHOR("Dave Jones <davej@redhat.com>, Andi Kleen");

MODULE_AUTHOR("Dave Jones, Andi Kleen");

module_param(agp_try_unsupported, bool, 0);

MODULE_LICENSE("GPL");

drivers/char/agp/ati-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -579,6 +579,6 @@ static void __exit agp_ati_cleanup(void) 
module_init(agp_ati_init);

module_exit(agp_ati_cleanup);



MODULE_AUTHOR("Dave Jones <davej@redhat.com>");

MODULE_AUTHOR("Dave Jones");

MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/backend.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static __init int agp_setup(char *s) 
__setup("agp=", agp_setup);

#endif



MODULE_AUTHOR("Dave Jones <davej@redhat.com>");

MODULE_AUTHOR("Dave Jones, Jeff Hartmann");

MODULE_DESCRIPTION("AGP GART driver");

MODULE_LICENSE("GPL and additional rights");

MODULE_ALIAS_MISCDEV(AGPGART_MINOR);

drivers/char/agp/intel-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -920,5 +920,5 @@ static void __exit agp_intel_cleanup(void) 
module_init(agp_intel_init);

module_exit(agp_intel_cleanup);



MODULE_AUTHOR("Dave Jones <davej@redhat.com>");

MODULE_AUTHOR("Dave Jones, Various @Intel");

MODULE_LICENSE("GPL and additional rights");