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

Commit e728519e authored by Inki Dae's avatar Inki Dae
Browse files

Merge branch 'drm-next' of ../main_line/linux-drm into dave-drm-next

parents 922f6e99 f15b4ca2

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2373,10 +2373,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/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,

drivers/char/agp/intel-agp.c

+4 −0
Original line number Diff line number Diff line
@@ -908,6 +908,10 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB),

	ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB),

	ID(PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB),

	ID(PCI_DEVICE_ID_INTEL_HASWELL_HB),

	ID(PCI_DEVICE_ID_INTEL_HASWELL_M_HB),

	ID(PCI_DEVICE_ID_INTEL_HASWELL_S_HB),

	ID(PCI_DEVICE_ID_INTEL_HASWELL_E_HB),

	{ }

};

drivers/gpu/drm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -186,3 +186,9 @@ source "drivers/gpu/drm/vmwgfx/Kconfig" 
source "drivers/gpu/drm/gma500/Kconfig"



source "drivers/gpu/drm/udl/Kconfig"



source "drivers/gpu/drm/ast/Kconfig"



source "drivers/gpu/drm/mgag200/Kconfig"



source "drivers/gpu/drm/cirrus/Kconfig"

drivers/gpu/drm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ obj-$(CONFIG_DRM_RADEON)+= radeon/ 
obj-$(CONFIG_DRM_MGA)	+= mga/

obj-$(CONFIG_DRM_I810)	+= i810/

obj-$(CONFIG_DRM_I915)  += i915/

obj-$(CONFIG_DRM_MGAG200) += mgag200/

obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus/

obj-$(CONFIG_DRM_SIS)   += sis/

obj-$(CONFIG_DRM_SAVAGE)+= savage/

obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
@@ -42,4 +44,5 @@ obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ 
obj-$(CONFIG_DRM_EXYNOS) +=exynos/

obj-$(CONFIG_DRM_GMA500) += gma500/

obj-$(CONFIG_DRM_UDL) += udl/

obj-$(CONFIG_DRM_AST) += ast/

obj-y			+= i2c/