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

Commit 9e87e48f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2015-03-27-merge' of... 

Merge tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel into drm-next

This backmerges 4.0-rc6 due to the recent fixes in rc5/6

- DP link rate refactoring from Ville
- byt/bsw rps tuning from Chris
- kerneldoc for the shrinker code
- more dynamic ppgtt pte work (Michel, Ben, ...)
- vlv dpll code refactoring to prep fro bxt (Imre)
- refactoring the sprite colorkey code (Ville)
- rotated ggtt view support from Tvrtko
- roll out struct drm_atomic_state to prep for atomic update (Ander)

* tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel: (473 commits)
  Linux 4.0-rc6
  arm64: juno: Fix misleading name of UART reference clock
  drm/i915: Update DRIVER_DATE to 20150327
  drm/i915: Skip allocating shadow batch for 0-length batches
  drm/i915: Handle error to get connector state when staging config
  drm/i915: Compare GGTT view structs instead of types
  drm/i915: fix simple_return.cocci warnings
  drm/i915: Add module param to test the load detect code
  drm/i915: Remove usage of encoder->new_crtc from clock computations
  drm/i915: Don't look at staged config crtc when changing DRRS state
  drm/i915: Convert intel_pipe_will_have_type() to using atomic state
  drm/i915: Pass an atomic state to modeset_global_resources() functions
  drm/i915: Add dynamic page trace events
  drm/i915: Finish gen6/7 dynamic page table allocation
  drm/i915: Remove unnecessary gen6_ppgtt_unmap_pages
  drm/i915: Fix i915_dma_map_single positive error code
  drm/i915: Prevent out of range pt in gen6_for_each_pde
  drm/i915: fix definition of the DRM_IOCTL_I915_GET_SPRITE_COLORKEY ioctl
  drm/i915: Rip out GET_SPRITE_COLORKEY ioctl
  watchdog: imgpdc: Fix default heartbeat
  ...
parents d7de390b 6e0aa801

Documentation/DocBook/drm.tmpl

+12 −1
Original line number Diff line number Diff line
@@ -4184,7 +4184,7 @@ int num_ioctls;</synopsis> 
      <sect2>

        <title>Buffer Object Eviction</title>

	<para>

	  This section documents the interface function for evicting buffer

	  This section documents the interface functions for evicting buffer

	  objects to make space available in the virtual gpu address spaces.

	  Note that this is mostly orthogonal to shrinking buffer objects

	  caches, which has the goal to make main memory (shared with the gpu
@@ -4192,6 +4192,17 @@ int num_ioctls;</synopsis> 
	</para>

!Idrivers/gpu/drm/i915/i915_gem_evict.c

      </sect2>

      <sect2>

        <title>Buffer Object Memory Shrinking</title>

	<para>

	  This section documents the interface function for shrinking memory

	  usage of buffer object caches. Shrinking is used to make main memory

	  available.  Note that this is mostly orthogonal to evicting buffer

	  objects, which has the goal to make space in gpu virtual address

	  spaces.

	</para>

!Idrivers/gpu/drm/i915/i915_gem_shrinker.c

      </sect2>

    </sect1>



    <sect1>

MAINTAINERS

+19 −4
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-mvebu/

F:	drivers/rtc/armada38x-rtc

F:	drivers/rtc/rtc-armada38x.c



ARM/Marvell Berlin SoC support

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@ -1362,6 +1362,7 @@ F: drivers/i2c/busses/i2c-rk3x.c 
F:	drivers/*/*rockchip*

F:	drivers/*/*/*rockchip*

F:	sound/soc/rockchip/

N:	rockchip



ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>
@@ -1675,8 +1676,8 @@ F: drivers/misc/eeprom/at24.c 
F:	include/linux/platform_data/at24.h



ATA OVER ETHERNET (AOE) DRIVER

M:	"Ed L. Cashin" <ecashin@coraid.com>

W:	http://support.coraid.com/support/linux

M:	"Ed L. Cashin" <ed.cashin@acm.org>

W:	http://www.openaoe.org/

S:	Supported

F:	Documentation/aoe/

F:	drivers/block/aoe/
@@ -1741,7 +1742,7 @@ S: Maintained 
F:	drivers/net/ethernet/atheros/



ATM

M:	Chas Williams <chas@cmf.nrl.navy.mil>

M:	Chas Williams <3chas3@gmail.com>

L:	linux-atm-general@lists.sourceforge.net (moderated for non-subscribers)

L:	netdev@vger.kernel.org

W:	http://linux-atm.sourceforge.net
@@ -3252,6 +3253,13 @@ S: Maintained 
F:	Documentation/hwmon/dme1737

F:	drivers/hwmon/dme1737.c



DMI/SMBIOS SUPPORT

M:	Jean Delvare <jdelvare@suse.de>

S:	Maintained

F:	drivers/firmware/dmi-id.c

F:	drivers/firmware/dmi_scan.c

F:	include/linux/dmi.h



DOCKING STATION DRIVER

M:	Shaohua Li <shaohua.li@intel.com>

L:	linux-acpi@vger.kernel.org
@@ -10206,6 +10214,13 @@ S: Maintained 
F:	Documentation/usb/ohci.txt

F:	drivers/usb/host/ohci*



USB OTG FSM (Finite State Machine)

M:	Peter Chen <Peter.Chen@freescale.com>

T:	git git://github.com/hzpeterchen/linux-usb.git

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/common/usb-otg-fsm.c



USB OVER IP DRIVER

M:	Valentina Manea <valentina.manea.m@gmail.com>

M:	Shuah Khan <shuah.kh@samsung.com>

Makefile

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

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc6

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/arc/kernel/signal.c

+18 −6
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs, 
	       sigset_t *set)

{

	int err;

	err = __copy_to_user(&(sf->uc.uc_mcontext.regs), regs,

	err = __copy_to_user(&(sf->uc.uc_mcontext.regs.scratch), regs,

			     sizeof(sf->uc.uc_mcontext.regs.scratch));

	err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));
@@ -83,7 +83,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) 
	if (!err)

		set_current_blocked(&set);



	err |= __copy_from_user(regs, &(sf->uc.uc_mcontext.regs),

	err |= __copy_from_user(regs, &(sf->uc.uc_mcontext.regs.scratch),

				sizeof(sf->uc.uc_mcontext.regs.scratch));



	return err;
@@ -131,6 +131,15 @@ SYSCALL_DEFINE0(rt_sigreturn) 
	/* Don't restart from sigreturn */

	syscall_wont_restart(regs);



	/*

	 * Ensure that sigreturn always returns to user mode (in case the

	 * regs saved on user stack got fudged between save and sigreturn)

	 * Otherwise it is easy to panic the kernel with a custom

	 * signal handler and/or restorer which clobberes the status32/ret

	 * to return to a bogus location in kernel mode.

	 */

	regs->status32 |= STATUS_U_MASK;



	return regs->r0;



badframe:
@@ -229,8 +238,11 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs) 


	/*

	 * handler returns using sigreturn stub provided already by userpsace

	 * If not, nuke the process right away

	 */

	BUG_ON(!(ksig->ka.sa.sa_flags & SA_RESTORER));

	if(!(ksig->ka.sa.sa_flags & SA_RESTORER))

		return 1;



	regs->blink = (unsigned long)ksig->ka.sa.sa_restorer;



	/* User Stack for signal handler will be above the frame just carved */
@@ -296,12 +308,12 @@ static void 
handle_signal(struct ksignal *ksig, struct pt_regs *regs)

{

	sigset_t *oldset = sigmask_to_save();

	int ret;

	int failed;



	/* Set up the stack frame */

	ret = setup_rt_frame(ksig, oldset, regs);

	failed = setup_rt_frame(ksig, oldset, regs);



	signal_setup_done(ret, ksig, 0);

	signal_setup_done(failed, ksig, 0);

}



void do_signal(struct pt_regs *regs)

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ config ARCH_PXA 
	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_IDE

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select PLAT_PXA

	select SPARSE_IRQ