From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751837AbbCTVtq (ORCPT ); Fri, 20 Mar 2015 17:49:46 -0400 Received: from gir.skynet.ie ([193.1.99.77]:50592 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751037AbbCTVto (ORCPT ); Fri, 20 Mar 2015 17:49:44 -0400 Date: Fri, 20 Mar 2015 21:49:37 +0000 (GMT) From: Dave Airlie X-X-Sender: airlied@skynet.skynet.ie To: torvalds@linux-foundation.org cc: DRI mailing list , linux-kernel@vger.kernel.org Subject: [git pull] drm fixes Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, a bunch of fixes across drivers, radeon: disable two ended allocation for now, it breaks some stuff amdkfd: misc fixes nouveau: fix irq loop problem, add basic support for GM206 (new hw) i915: fix some WARNs people were seeing exynos: fix some iommu interactions causing boot failures In other news I've some problem with my git tree and git request-pull [airlied@dreadlord-bne-redhat-com linux]$ git request-pull linus/master origin warn: No match for commit 8265d4486d5c2448a1c645fdc20d4e62873d9c3d found at origin warn: Are you sure you pushed 'HEAD' there? is happening when I just had my branch on drm-fixes, I've made it master to generate this pull request so the branch name isn't missing, this might be due to my attempt to remove my own master branch, using git symbolic-ref HEAD refs/heads/drm-next, so I'll have to regen it next week I suppose. Dave. The following changes since commit 06e5801b8cb3fc057d88cb4dc03c0b64b2744cda: Linux 4.0-rc4 (2015-03-15 17:38:20 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux for you to fetch changes up to 8265d4486d5c2448a1c645fdc20d4e62873d9c3d: Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes (2015-03-20 17:32:21 +1000) ---------------------------------------------------------------- Alex Deucher (1): drm/radeon: drop ttm two ended allocation Andrzej Hajda (1): drm/exynos: remove unused files Ben Goz (3): drm/amdkfd: destroy mqd when destroying kernel queue drm/amdkfd: Fix SDMA queue init. in non-HWS mode drm/radeon: Changing number of compute pipe lines Ben Skeggs (3): drm/nouveau/fifo/nv04: remove the loop from the interrupt handler drm/nouveau/gr/gf100: fix some accidental or'ing of buffer addresses drm/nouveau/device: post write to NV_PMC_BOOT_1 when flipping endian switch Charles Keepax (1): drm/exynos: Check for NULL dereference of crtc Damien Lespiau (1): drm/i915: Make sure the primary plane is enabled before reading out the fb state Dan Carpenter (1): drm/exynos: IS_ERR() vs NULL bug Dave Airlie (5): Merge branch 'linux-4.0' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Merge branch 'exynos-drm-fixes' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-amdkfd-fixes-2015-03-19' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes Hyungwon Hwang (1): drm/exynos: fix the initialization order in FIMD Inki Dae (1): drm/exynos: fix typo config name correctly. Stefan Huehner (2): drm/nouveau/device/gm100: Basic GM206 bring up (as copy of GM204) drm/nouveau/bios: fix i2c table parsing for dcb 4.1 Xi Ruoyao (1): drm/i915: Ensure plane->state->fb stays in sync with plane->fb .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 22 +- drivers/gpu/drm/exynos/Kconfig | 2 +- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_connector.c | 245 --------------------- drivers/gpu/drm/exynos/exynos_drm_connector.h | 20 -- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 29 +-- drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 32 ++- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 6 +- drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c | 43 ++++ drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 85 +++---- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/bios/i2c.c | 6 +- drivers/gpu/drm/radeon/radeon_kfd.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 11 - 18 files changed, 159 insertions(+), 372 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_connector.c delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_connector.h