Changes in NOTES

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/drivers/gpu/drm/msm/NOTES

ecd740c6f2f092b90b95fa35f757973589eaaca2 - Merge commit 'v3.14' into next

Mon, 14 Apr 2014 03:23:14 +0200

Merge commit 'v3.14' into next List of files: /linux/drivers/gpu/drm/msm/NOTES

692d96552c9a86a919fe6b5b82288a6c77c015a5 - Merge branch 'next' into for-linus

Thu, 03 Apr 2014 18:26:49 +0200

Merge branch 'next' into for-linusFirst round of input updates for 3.15. List of files: /linux/drivers/gpu/drm/msm/NOTES

6d32c850621b0be75777b9102b14f6268bbd9f0f - Merge tag 'v3.14' into next

Mon, 31 Mar 2014 15:49:07 +0200

Merge tag 'v3.14' into nextLinux 3.14 List of files: /linux/drivers/gpu/drm/msm/NOTES

d083f580e5b940834a93ab741cdf064f0324dc0f - Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-core

Thu, 06 Mar 2014 10:44:28 +0100

Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-coreregmap: Add parse_val() APIThis is useful for generic code built on top of regmap dealing withblocks of data. List of files: /linux/drivers/gpu/drm/msm/NOTES

04421fe2671c1790ab6529fad87ce8c73af0e1eb - Merge tag 'v3.14-rc4' into next

Sat, 01 Mar 2014 19:31:53 +0100

Merge tag 'v3.14-rc4' into nextMerge with Linux 3.14-rc4 to bring devm_request_any_context_irq(). List of files: /linux/drivers/gpu/drm/msm/NOTES

d4263348f796f29546f90802177865dd4379dd0a - Merge branch 'master' into for-next

Thu, 20 Feb 2014 14:54:28 +0100

Merge branch 'master' into for-next List of files: /linux/drivers/gpu/drm/msm/NOTES

3c3d7cb1db4af176dab843f22ea092a4ef1eb989 - Merge branch 'linus' into perf/core

Sun, 09 Feb 2014 13:13:45 +0100

Merge branch 'linus' into perf/coreRefresh the branch to a v3.14-rc base before queueing up new devel patches.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/msm/NOTES

eaa4e4fcf1b5c60e656d93242f7fe422173f25b2 - Merge branch 'linus' into sched/core, to resolve conflicts

Sun, 02 Feb 2014 09:45:39 +0100

Merge branch 'linus' into sched/core, to resolve conflictsConflicts: kernel/sysctl.cSigned-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/msm/NOTES

65370bdf881e20907e7a53abab9b8c0bc5f60a6b - Merge branch 'linus' into core/locking

Sun, 02 Feb 2014 09:43:20 +0100

Merge branch 'linus' into core/lockingRefresh the topic.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/msm/NOTES

b3fdfc1b4b641d372e35ced98814289bc60bc5d1 - Merge tag 'xtensa-for-next-20140221-1' into for_next

Mon, 24 Feb 2014 09:34:36 +0100

Merge tag 'xtensa-for-next-20140221-1' into for_nextXtensa fixes for 3.14:- allow booting xtfpga on boards with new uBoot and >128MBytes memory;- drop nonexistent GPIO32 support from fsf variant;- don't select USE_GENERIC_SMP_HELPERS;- enable common clock framework support, set up ethoc clock on xtfpga;- wire up sched_setattr and sched_getattr syscalls.Signed-off-by: Chris Zankel List of files: /linux/drivers/gpu/drm/msm/NOTES

bf5f48339a019c9b4b42284c3f45d58942cbda27 - Merge remote-tracking branch 'wireless-next/master' into mac80211-next

Thu, 20 Feb 2014 11:55:12 +0100

Merge remote-tracking branch 'wireless-next/master' into mac80211-next List of files: /linux/drivers/gpu/drm/msm/NOTES

a3b072cd180c12e8fe0ece9487b9065808327640 - Merge tag 'efi-urgent' into x86/urgent

Fri, 07 Feb 2014 20:27:30 +0100

Merge tag 'efi-urgent' into x86/urgent * Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).Signed-off-by: H. Peter Anvin List of files: /linux/drivers/gpu/drm/msm/NOTES

6ceb339109adf88a27b6f596c9f99a095f762659 - Merge remote-tracking branch 'wireless-next/master' into ath-next

Tue, 04 Feb 2014 17:29:45 +0100

Merge remote-tracking branch 'wireless-next/master' into ath-next List of files: /linux/drivers/gpu/drm/msm/NOTES

c29b8f3149f2916e98fc3b8d6c1df2137d003979 - Merge tag 'v3.14-rc1' into patchwork

Mon, 03 Feb 2014 18:32:45 +0100

Merge tag 'v3.14-rc1' into patchworkLinus 3.14-rc1* tag 'v3.14-rc1': (11781 commits) Linus 3.14-rc1 hpfs: optimize quad buffer loading hpfs: remember free space parisc: add flexible mmap memory layout support parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc parisc: convert uapi/asm/stat.h to use native types only parisc: wire up sched_setattr and sched_getattr parisc: fix cache-flushing parisc/sti_console: prefer Linux fonts over built-in ROM fonts hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors tools/power turbostat: introduce -s to dump counters tools/power turbostat: remove unused command line option afs: proc cells and rootcell are writeable tile: remove compat_sys_lookup_dcookie declaration to fix compile error Revert "PCI: Remove from bus_list and release resources in pci_release_dev()" ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA ARM: multi_v7_defconfig: add mvebu drivers clocksource: kona: Add basic use of external clock drivers: bus: fix CCI driver kcalloc call parameters swap ... List of files: /linux/drivers/gpu/drm/msm/NOTES

9b0cd304f26b9fca140de15deeac2bf357d1f388 - Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Thu, 30 Jan 2014 05:49:12 +0100

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxPull drm updates from Dave Airlie: "Been a bit busy, first week of kids school, and waiting on other trees to go in before I could send this, so its a bit later than I'd normally like. Highlights: - core: timestamp fixes, lots of misc cleanups - new drivers: bochs virtual vga - vmwgfx: major overhaul for their nextgen virt gpu. - i915: runtime D3 on HSW, watermark fixes, power well work, fbc fixes, bdw is no longer prelim. - nouveau: gk110/208 acceleration, more pm groundwork, old overlay support - radeon: dpm rework and clockgating for CIK, pci config reset, big endian fixes - tegra: panel support and DSI support, build as module, prime. - armada, omap, gma500, rcar, exynos, mgag200, cirrus, ast: fixes - msm: hdmi support for mdp5"* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (595 commits) drm/nouveau: resume display if any later suspend bits fail drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip drm/nouveau: implement hooks for needed for drm vblank timestamping support drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping drm/nv50: fill in crtc mode struct members from crtc_mode_fixup drm/radeon/dce8: workaround for atom BlankCrtc table drm/radeon/DCE4+: clear bios scratch dpms bit (v2) drm/radeon: set si_notify_smc_display_change properly drm/radeon: fix DAC interrupt handling on DCE5+ drm/radeon: clean up active vram sizing drm/radeon: skip async dma init on r6xx drm/radeon/runpm: don't runtime suspend non-PX cards drm/radeon: add ring to fence trace functions drm/radeon: add missing trace point drm/radeon: fix VMID use tracking drm: ast,cirrus,mgag200: use drm_can_sleep drm/gma500: Lock struct_mutex around cursor updates drm/i915: Fix the offset issue for the stolen GEM objects DRM: armada: fix missing DRM_KMS_FB_HELPER select drm/i915: Decouple GPU error reporting from ring initialisation ... List of files: /linux/drivers/gpu/drm/msm/NOTES

feb5cde61df96aa28193bd72813e2c930f3f5706 - Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next

Mon, 13 Jan 2014 04:53:56 +0100

Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-nextMSM tree from Rob.* 'msm-next' of git://people.freedesktop.org/~robclark/linux: drm/msm: add a330/apq8x74 drm/msm: add mdp5/apq8x74 drm/msm: add hdmi support for apq8x74/mdp5 drm/msm: move irq utils to mdp_kms drm/msm: split out msm_kms.h drm/msm: mdp4_format -> mdp_format drm/msm: resync generated headers drm/msm: move mdp4 -> mdp/mdp4 drm/msm: add support for msm8060ab/bstem drm/msm: add support for non-IOMMU systems drm/msm: fix bus scaling drm/msm: add missing MODULE_FIRMWARE()s drm/msm: COMPILE_TEST support List of files: /linux/drivers/gpu/drm/msm/NOTES

06c0dd96bfbba8a9368ffd7c4b12d3bfed37001d - drm/msm: add mdp5/apq8x74

Sat, 30 Nov 2013 23:51:47 +0100

drm/msm: add mdp5/apq8x74Add support for the new MDP5 display controller block. The mappingbetween parts of the display controller and KMS is: plane -> PIPE{RGBn,VIGn} \ crtc -> LM (layer mixer) |-> MDP "device" encoder -> INTF / connector -> HDMI/DSI/eDP/etc --> other device(s)Unlike MDP4, it appears we can get by with a single encoder, ratherthan needing a different implementation for DTV, DSI, etc. (Ie. theregister interface is same, just different bases.)Also unlike MDP4, all the IRQs for other blocks (HDMI, DSI, etc) arerouted through MDP.And finally, MDP5 has this "Shared Memory Pool" (called "SMP"), fromwhich blocks need to be allocated to the active pipes based on fetchstride.Signed-off-by: Rob Clark List of files: /linux/drivers/gpu/drm/msm/NOTES

dd0a11815a339d6deeea8357574f8126a8404c92 - Merge tag 'v3.12'

Tue, 26 Nov 2013 23:32:55 +0100

Merge tag 'v3.12'Linux 3.12 List of files: /linux/drivers/gpu/drm/msm/NOTES

fc582aef7dcc27a7120cf232c1e76c569c7b6eab - Merge tag 'v3.12'

Sat, 23 Nov 2013 00:57:08 +0100

Merge tag 'v3.12'Linux 3.12Conflicts: fs/exec.c List of files: /linux/drivers/gpu/drm/msm/NOTES