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

Commit 268d2837 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-next' of... 

Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

This is a major rework of the nouveau driver core, to reflect more closely
how the hw is used and to make it easier to implement newer features now
that the GPUs are more clearly understood than when nouveau started.

It also contains a few other bits:
thermal patches
nv41/44 pcie gart fixes
i2c unregistering fixes.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (191 commits)
  drm/nv98/crypt: fix fuc build with latest envyas
  drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
  drm/nv41/vm: fix and enable use of "real" pciegart
  drm/nv44/vm: fix and enable use of "real" pciegart
  drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
  drm/nouveau: store supported dma mask in vmmgr
  drm/nvc0/ibus: initial implementation of subdev
  drm/nouveau/therm: add support for fan-control modes
  drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
  drm/nouveau/therm: calculate the pwm divisor on nv50+
  drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
  drm/nouveau/therm: move thermal-related functions to the therm subdev
  drm/nouveau/bios: parse the pwm divisor from the perf table
  drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
  drm/nouveau/therm: rework thermal table parsing
  drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
  drm/nouveau: fix pm initialization order
  drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
  drm/nouveau: log channel debug/error messages from client object rather than drm client
  drm/nouveau: have drm debugging macros build on top of core macros
  ...

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_dp.c
parents df86b576 b9f10852

Documentation/vfio.txt

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ character devices for this group: 
$ lspci -n -s 0000:06:0d.0

06:0d.0 0401: 1102:0002 (rev 08)

# echo 0000:06:0d.0 > /sys/bus/pci/devices/0000:06:0d.0/driver/unbind

# echo 1102 0002 > /sys/bus/pci/drivers/vfio/new_id

# echo 1102 0002 > /sys/bus/pci/drivers/vfio-pci/new_id



Now we need to look at what other devices are in the group to free

it for use by VFIO:

MAINTAINERS

+6 −3
Original line number Diff line number Diff line
@@ -3552,11 +3552,12 @@ K: \b(ABS|SYN)_MT_ 


INTEL C600 SERIES SAS CONTROLLER DRIVER

M:	Intel SCU Linux support <intel-linux-scu@intel.com>

M:	Lukasz Dorau <lukasz.dorau@intel.com>

M:	Maciej Patelczyk <maciej.patelczyk@intel.com>

M:	Dave Jiang <dave.jiang@intel.com>

M:	Ed Nadolski <edmund.nadolski@intel.com>

L:	linux-scsi@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git

S:	Maintained

T:	git git://git.code.sf.net/p/intel-sas/isci

S:	Supported

F:	drivers/scsi/isci/

F:	firmware/isci/
@@ -5544,6 +5545,8 @@ F: Documentation/devicetree/bindings/pwm/ 
F:	include/linux/pwm.h

F:	include/linux/of_pwm.h

F:	drivers/pwm/

F:	drivers/video/backlight/pwm_bl.c

F:	include/linux/pwm_backlight.h



PXA2xx/PXA3xx SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Terrified Chipmunk



# *DOCUMENTATION*

arch/arm/mach-mxs/mach-mxs.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void __init apx4devkit_init(void) 
	enable_clk_enet_out();



	if (IS_BUILTIN(CONFIG_PHYLIB))

		phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK,

		phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK,

					   apx4devkit_phy_fixup);



	mxsfb_pdata.mode_list = apx4devkit_video_modes;

arch/arm/mach-orion5x/common.c

+7 −0
Original line number Diff line number Diff line
@@ -204,6 +204,13 @@ void __init orion5x_wdt_init(void) 
void __init orion5x_init_early(void)

{

	orion_time_set_base(TIMER_VIRT_BASE);



	/*

	 * Some Orion5x devices allocate their coherent buffers from atomic

	 * context. Increase size of atomic coherent pool to make sure such

	 * the allocations won't fail.

	 */

	init_dma_coherent_pool_size(SZ_1M);

}



int orion5x_tclk;