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

Commit 98b98d31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (169 commits)
  drivers/gpu/drm/radeon/atom.c: fix warning
  drm/radeon/kms: bump kms version number
  drm/radeon/kms: properly set num banks for fusion asics
  drm/radeon/kms/atom: move dig phy init out of modesetting
  drm/radeon/kms/cayman: fix typo in register mask
  drm/radeon/kms: fix typo in spread spectrum code
  drm/radeon/kms: fix tile_config value reported to userspace on cayman.
  drm/radeon/kms: fix incorrect comparison in cayman setup code.
  drm/radeon/kms: add wait idle ioctl for eg->cayman
  drm/radeon/cayman: setup hdp to invalidate and flush when asked
  drm/radeon/evergreen/btc/fusion: setup hdp to invalidate and flush when asked
  agp/uninorth: Fix lockups with radeon KMS and >1x.
  drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only
  drm/radeon/kms: properly set the CLK_REF bit for DCE3 devices
  drm/radeon/kms: fixup eDP connector handling
  drm/radeon/kms: bail early for eDP in hotplug callback
  drm/radeon/kms: simplify hotplug handler logic
  drm/radeon/kms: rewrite DP handling
  drm/radeon/kms/atom: add support for setting DP panel mode
  drm/radeon/kms: atombios.h updates for DP panel mode
  ...
parents 0d66cba1 931474c4

MAINTAINERS

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



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

M:	Chris Wilson <chris@chris-wilson.co.uk>

M:	Keith Packard <keithp@keithp.com>

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/ickle/drm-intel.git

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

S:	Supported

F:	drivers/gpu/drm/i915

F:	include/drm/i915*

drivers/char/agp/intel-agp.c

+3 −0
Original line number Diff line number Diff line
@@ -903,6 +903,9 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),

	ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),

	ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB),

	ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_HB),

	ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB),

	ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB),

	{ }

};

drivers/char/agp/intel-agp.h

+8 −0
Original line number Diff line number Diff line
@@ -225,6 +225,14 @@ 
#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_PLUS_IG	0x0126

#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB		0x0108  /* Server */

#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG		0x010A

#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_HB		0x0150  /* Desktop */

#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT1_IG		0x0152

#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT2_IG		0x0162

#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB		0x0154  /* Mobile */

#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT1_IG		0x0156

#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT2_IG		0x0166

#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB		0x0158  /* Server */

#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG		0x015A



int intel_gmch_probe(struct pci_dev *pdev,

			       struct agp_bridge_data *bridge);

drivers/char/agp/intel-gtt.c

+10 −0
Original line number Diff line number Diff line
@@ -1420,6 +1420,16 @@ static const struct intel_gtt_driver_description { 
	    "Sandybridge", &sandybridge_gtt_driver },

	{ PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG,

	    "Sandybridge", &sandybridge_gtt_driver },

	{ PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT1_IG,

	    "Ivybridge", &sandybridge_gtt_driver },

	{ PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT2_IG,

	    "Ivybridge", &sandybridge_gtt_driver },

	{ PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT1_IG,

	    "Ivybridge", &sandybridge_gtt_driver },

	{ PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT2_IG,

	    "Ivybridge", &sandybridge_gtt_driver },

	{ PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG,

	    "Ivybridge", &sandybridge_gtt_driver },

	{ 0, NULL, NULL }

};

drivers/char/agp/uninorth-agp.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void uninorth_tlbflush(struct agp_memory *mem) 
			       ctrl | UNI_N_CFG_GART_INVAL);

	pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL, ctrl);



	if (uninorth_rev <= 0x30) {

	if (!mem && uninorth_rev <= 0x30) {

		pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL,

				       ctrl | UNI_N_CFG_GART_2xRESET);

		pci_write_config_dword(agp_bridge->dev, UNI_N_CFG_GART_CTRL,