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

Commit f2fde3a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull main drm updates from Dave Airlie:
 "This is the main merge window request for the drm.

  It's big, but jam packed will lots of features and of course 0
  regressions.  (okay maybe there'll be one).

  Highlights:

   - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus
     (qemu only).  These drivers use the generic modesetting drivers.

   - initial prime/dma-buf support for i915, nouveau, radeon, udl and
     exynos

   - switcheroo audio support: so GPUs with HDMI can turn off the sound
     driver without crashing stuff.

   - There are some patches drifting outside drivers/gpu into x86 and
     EFI for better handling of multiple video adapters in Apple Macs,
     they've got correct acks except one trivial fixup.

   - Core:
	edid parser has better DMT and reduced blanking support,
	crtc properties,
	plane properties,

   - Drivers:
	exynos: add 2D core accel support, prime support, hdmi features
	intel: more Haswell support, initial Valleyview support, more
	    hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of
	    cleanups and fixes
	radeon: more HDMI audio support, improved GPU lockup recovery
	    support, remove nested mutexes, less memory copying on PCIE, fix
	    bus master enable race (kexec), improved fence handling
	gma500: cleanups, 1080p support, acpi fixes
	nouveau: better nva3 memory reclocking, kepler accel (needs
	    external firmware rip), async buffer moves on nv84+ hw.

  I've some more dma-buf patches that rely on the dma-buf merge for vmap
  stuff, and I've a few fixes building up, but I'd decided I'd better
  get rid of the main pull sooner rather than later, so the audio guys
  are also unblocked."

Fix up trivial conflict due to some duplicated changes in
drivers/gpu/drm/i915/intel_ringbuffer.c

* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (605 commits)
  drm/nouveau/nvd9: Fix GPIO initialisation sequence.
  drm/nouveau: Unregister switcheroo client on exit
  drm/nouveau: Check dsm on switcheroo unregister
  drm/nouveau: fix a minor annoyance in an output string
  drm/nouveau: turn a BUG into a WARN
  drm/nv50: decode PGRAPH DATA_ERROR = 0x24
  drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
  drm/nvd9/copy: initialise copy engine, seems to work like nvc0
  drm/nvc0/ttm: use copy engines for async buffer moves
  drm/nva3/ttm: use copy engine for async buffer moves
  drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method
  drm/nv84/ttm: use crypto engine for async buffer copies
  drm/nouveau/ttm: untangle code to support accelerated buffer moves
  drm/nouveau/fbcon: use fence for sync, rather than notifier
  drm/nv98/crypt: non-stub implementation of the engine hooks
  drm/nouveau/fifo: turn all fifo modules into engine modules
  drm/nv50/graph: remove ability to do interrupt-driven context switching
  drm/nv50: remove manual context unload on context destruction
  drm/nv50: remove execution engine context saves on suspend
  drm/nv50/fifo: use hardware channel kickoff functionality
  ...
parents 28f3d717 8c914028

Documentation/kernel-parameters.txt

+14 −0
Original line number Diff line number Diff line
@@ -987,6 +987,20 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	i8k.restricted	[HW] Allow controlling fans only if SYS_ADMIN

			capability is set.



	i915.invert_brightness=

			[DRM] Invert the sense of the variable that is used to

			set the brightness of the panel backlight. Normally a

			brightness value of 0 indicates backlight switched off,

			and the maximum of the brightness value sets the backlight

			to maximum brightness. If this parameter is set to 0

			(default) and the machine requires it, or this parameter

			is set to 1, a brightness value of 0 sets the backlight

			to maximum brightness, and the maximum of the brightness

			value switches the backlight off.

			-1 -- never invert brightness

			 0 -- machine default

			 1 -- force brightness inversion



	icn=		[HW,ISDN]

			Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2398,10 +2398,10 @@ F: drivers/gpu/drm/ 
F:	include/drm/



INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Keith Packard <keithp@keithp.com>

M:	Daniel Vetter <daniel.vetter@ffwll.ch>

L:	intel-gfx@lists.freedesktop.org (subscribers-only)

L:	dri-devel@lists.freedesktop.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git

T:	git git://people.freedesktop.org/~danvet/drm-intel

S:	Supported

F:	drivers/gpu/drm/i915

F:	include/drm/i915*

arch/x86/include/asm/vga.h

+6 −0
Original line number Diff line number Diff line
@@ -17,4 +17,10 @@ 
#define vga_readb(x) (*(x))

#define vga_writeb(x, y) (*(y) = (x))



#ifdef CONFIG_FB_EFI

#define __ARCH_HAS_VGA_DEFAULT_DEVICE

extern struct pci_dev *vga_default_device(void);

extern void vga_set_default_device(struct pci_dev *pdev);

#endif



#endif /* _ASM_X86_VGA_H */

arch/x86/pci/fixup.c

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/dmi.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/vgaarb.h>

#include <asm/pci_x86.h>



static void __devinit pci_fixup_i450nx(struct pci_dev *d)
@@ -348,6 +349,8 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev) 
	if (config & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) {

		pdev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_SHADOW;

		dev_printk(KERN_DEBUG, &pdev->dev, "Boot video device\n");

		if (!vga_default_device())

			vga_set_default_device(pdev);

	}

}

DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,

arch/x86/video/fbdev.c

+15 −5
Original line number Diff line number Diff line
@@ -9,24 +9,34 @@ 
#include <linux/fb.h>

#include <linux/pci.h>

#include <linux/module.h>

#include <linux/vgaarb.h>



int fb_is_primary_device(struct fb_info *info)

{

	struct device *device = info->device;

	struct pci_dev *pci_dev = NULL;

	struct pci_dev *default_device = vga_default_device();

	struct resource *res = NULL;

	int retval = 0;



	if (device)

		pci_dev = to_pci_dev(device);



	if (pci_dev)

	if (!pci_dev)

		return 0;



	if (default_device) {

		if (pci_dev == default_device)

			return 1;

		else

			return 0;

	}



	res = &pci_dev->resource[PCI_ROM_RESOURCE];



	if (res && res->flags & IORESOURCE_ROM_SHADOW)

		retval = 1;

		return 1;



	return retval;

	return 0;

}

EXPORT_SYMBOL(fb_is_primary_device);

MODULE_LICENSE("GPL");