~proton1980/ubuntu/+source/linux/+git/mirror-drm-intel:ci/daniels/tmp

Last commit made on 2016-02-13
Get this branch:
git clone -b ci/daniels/tmp https://git.launchpad.net/~proton1980/ubuntu/+source/linux/+git/mirror-drm-intel
Only Ghz can upload to this branch. If you are Ghz please log in for upload directions.

Branch merges

Branch information

Recent commits

f0f690a... by Daniel Stone <email address hidden>

WIP: VC4/RPI2 DRM

85944f0... by Daniel Stone <email address hidden>

component: remove device from master match list on failed add

Calling component_add() may result in the completion of a set of
devices, which will try to bring up a master. In bringing the master
up, we populate its match array with the current set of children.

If binding any of the devices fails, component_add() itself will fail,
free the struct component entry, and return to the caller. The
now-freed entry is never removed from the master's match array, and
will later be used in a futile attempt to bind to freed memory.

Bring component_add's behaviour on failure to bring up a master into
line with component_del by removing the (to-be-freed) component from
the master's match array.

The specific case which broke was:
  - rockchip_drm_drv adds a component master
  - dwhdmi_rockchip adds a child component in probe (master incomplete)
  - rockchip_drm_vop adds two children in probe, which completes the
    set
  - inside component_add, we try to bring up the master, having
    populated the master's match array, and fail with EPROBE_DEFER from
    dwhdmi_rockchip; we delete the putative component
  - rockchip_drm_vop's probe fails and returns EPROBE_DEFER
  - we later re-probe rockchip_drm_vop and add the component; the
    master is complete, so we attempt to bring it up again
  - walking the match array, we find the previous child, whose master
    pointer doesn't match (as it has been freed in the meantime)
  - rockchip_drm_vop probe fails, and will never be attempted again

Fixes: ffc30b74fd6d01588bd3fdebc3b1acc0857e6fc8
Signed-off-by: Daniel Stone <email address hidden>
Cc: Russell King <email address hidden>
Cc: Thierry Reding <email address hidden>
Cc: Laurent Pinchart <email address hidden>

b5c1507... by Eric Anholt

ARM: bcm2835: Add VC4 to the device tree.

VC4 is the GPU (display and 3D) present on the 2835.

v2: Sort by register address, mark HDMI as disabled by default in the
    SoC file and enable it from -rpi.
v3: Add references to the pixel/HSM clocks for HDMI. Rename
    compatibility strings and clean up node names.
v4: Fix comment marking pv0's interrupt as pwa2 instead of pwa0.
    Rename hpd-gpio to hpd-gpios.
v5: Rebase on bcm283x.dtsi change, add v3d.

Signed-off-by: Eric Anholt <email address hidden>

ce2db75... by John Youn <email address hidden>

Revert "usb: dwc2: Move reset into dwc2_get_hwparams()"

This reverts commit 263b7fb557f7 ("usb: dwc2: Move reset into
dwc2_get_hwparams()") due to regression found on bcm2835 platform. USB
ethernet fails, due to being unable to pick up proper parameters when
performing a plain reset before reading hw params.

Below shows the results of the gnptxfsiz and hptxfsiz with and before
and after reverting this (from Stefan Wahren):

So here is the probe result before Patch 1 is applied:

[ 1.283148] dwc2 20980000.usb: Configuration mismatch. dr_mode forced to host
[ 1.313894] dwc2 20980000.usb: gnptxfsiz=00201000
[ 1.314104] dwc2 20980000.usb: hptxfsiz=00000000
[ 1.353908] dwc2 20980000.usb: 256 invalid for host_nperio_tx_fifo_size. Check HW configuration.
[ 1.354262] dwc2 20980000.usb: 512 invalid for host_perio_tx_fifo_size. Check HW configuration.
[ 1.394249] dwc2 20980000.usb: DWC OTG Controller
[ 1.394561] dwc2 20980000.usb: new USB bus registered, assigned bus number 1
[ 1.394917] dwc2 20980000.usb: irq 33, io mem 0x00000000

And here is the probe result after Patch 1 is applied:

[ 1.280107] dwc2 20980000.usb: Configuration mismatch. dr_mode forced to host
[ 1.353949] dwc2 20980000.usb: gnptxfsiz=01001000
[ 1.354166] dwc2 20980000.usb: hptxfsiz=02002000
[ 1.434301] dwc2 20980000.usb: DWC OTG Controller
[ 1.434616] dwc2 20980000.usb: new USB bus registered, assigned bus number 1
[ 1.434973] dwc2 20980000.usb: irq 33, io mem 0x00000000

Signed-off-by: John Youn <email address hidden>
Reported-by: Stefan Wahren <email address hidden>
Reported-by: Remi Pommarel <email address hidden>
Tested-by: Stefan Wahren <email address hidden>
Tested-by: Remi Pommarel <email address hidden>
Signed-off-by: Eric Anholt <email address hidden>

b4908a0... by John Youn <email address hidden>

usb: dwc2: Fix probe problem on bcm2835

Fixes an issue found on Raspberry PI platform that prevents probe. Don't
skip setting the force mode if it's already set.

Fixes: 09c96980dc72 ("usb: dwc2: Add functions to set and clear force mode")
Signed-off-by: John Youn <email address hidden>
Reported-by: Stefan Wahren <email address hidden>
Reported-by: Remi Pommarel <email address hidden>
Tested-by: Stefan Wahren <email address hidden>
Tested-by: Remi Pommarel <email address hidden>
Signed-off-by: Eric Anholt <email address hidden>

a05d16c... by Alexander Aring <email address hidden>

ARM: bcm2835: Add the Raspberry Pi power domain driver to the DT.

This connects the USB driver to the USB power domain, so that USB can
actually be turned on at boot if the bootloader didn't do it for us.

Signed-off-by: Alexander Aring <email address hidden>
Signed-off-by: Eric Anholt <email address hidden>
Reviewed-by: Kevin Hilman <email address hidden>

45b069a... by Daniel Stone <email address hidden>

ARM: multi_v7_defconfig: Enable BCM2836

Enable the BCM283x options required to boot the Raspberry Pi 2. These
options are common with BCM2835 in the original Raspberry Pi and
Raspberry Pi Zero, but those do not support ARMv7.

v2: Enable the watchdog and ALSA drivers. (Stephen Warren)

Signed-off-by: Daniel Stone <email address hidden>
Cc: Eric Anholt <email address hidden>
Cc: Stephen Warren <email address hidden>
Cc: Lee Jones <email address hidden>
Cc: Olof Johansson <email address hidden>

65df5e9... by Stephen Rothwell <email address hidden>

Add linux-next specific files for 20160202

Signed-off-by: Stephen Rothwell <email address hidden>

4124cc1... by Stephen Rothwell <email address hidden>

Merge branch 'akpm/master'

77f94f8... by Andy Shevchenko <email address hidden>

x86/efi: use proper units in efi_find_mirror()

Like in efi_print_mmap() use the proper units when printing sizes.

Currently it's hardcoded to 'MiB', though it might be changed to adaptive
efi_size_format() in the future.

Signed-off-by: Andy Shevchenko <email address hidden>
Cc: Matt Fleming <email address hidden>
Cc: Thomas Gleixner <email address hidden>
Cc: Ingo Molnar <email address hidden>
Cc: "H. Peter Anvin" <email address hidden>
Cc: Rasmus Villemoes <email address hidden>
Cc: Robert Elliott <email address hidden>
Signed-off-by: Andrew Morton <email address hidden>