Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755225AbcDGF5p (ORCPT ); Thu, 7 Apr 2016 01:57:45 -0400 Received: from gir.skynet.ie ([193.1.99.77]:47984 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750942AbcDGF5o (ORCPT ); Thu, 7 Apr 2016 01:57:44 -0400 Date: Thu, 7 Apr 2016 06:57:33 +0100 (IST) From: Dave Airlie X-X-Sender: airlied@skynet.skynet.ie To: torvalds@linux-foundation.org, DRI mailing list cc: 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: MULTIPART/MIXED; BOUNDARY="29444707-801115149-1460008653=:1164" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6230 Lines: 138 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --29444707-801115149-1460008653=:1164 Content-Type: TEXT/PLAIN; charset=ISO-8859-15 Content-Transfer-Encoding: 8BIT Hi Linus, This is mostly amdgpu/radeon fixes, and imx related fixes. There are also one one TTM fix, one nouveau fix, and one hdlcd fix. The AMD ones are some fixes for power management after suspend/resume one some GPUs, and some vblank fixes. The IMX ones are for more stricter plane checks and some cleanups. I'm off until Monday, so therre might be some fixes early next week if anyone missed me. Dave. The following changes since commit 541d8f4d59d79f5d37c8c726f723d42ff307db57: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2016-04-05 16:16:00 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to fd8c61ebd4265ff1c5fa80ba351e8e1dd710fac0: Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2016-04-07 07:08:46 +1000) ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu/gmc: move vram type fetching into sw_init drm/amdgpu/gmc: use proper register for vram type on Fiji drm/amdgpu: print vram type rather than just DDR drm/ttm: use phys_addr_t for ttm_bus_placement Alexandre Courbot (1): drm/nouveau/tegra: acquire and enable reference clock if needed Alexey Brodkin (1): drm: ARM HDLCD - get rid of devm_clk_put() Christian K?nig (1): drm/amdgpu: fix leaking fence in the pageflip code Chunming Zhou (2): drm/amdgpu: fence wait old rcu slot drm/amdgpu: total vram size also reduces pin size Dan Carpenter (1): drm: ARM HDLCD - fix an error code Daniel Vetter (1): drm/imx: Don't set a gamma table size Dave Airlie (4): Merge tag 'imx-drm-next-2016-04-01' of git://git.pengutronix.de/git/pza/linux into drm-fixes Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-fixes Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Douglas Anderson (2): drm/imx: dw_hdmi: Call drm_encoder_cleanup() in error path drm/imx: dw_hdmi: Don't call platform_set_drvdata() Leo Liu (2): drm/amdgpu: save and restore UVD context with suspend and resume drm/amdgpu: save and restore the firwmware cache part when suspend resume Liu Ying (4): gpu: ipu-v3: ipu-dmfc: Protect function ipu_dmfc_init_channel() with mutex gpu: ipu-v3: ipu-dmfc: Make function ipu_dmfc_init_channel() return void gpu: ipu-v3: ipu-dmfc: Rename ipu_dmfc_init_channel to ipu_dmfc_config_wait4eot drm/imx: ipuv3-plane: Configure DMFC wait4eot bit after slots are determined Michel D?nzer (3): drm/radeon: Set vblank_disable_allowed = true drm/amdgpu: Set vblank_disable_allowed = true drm/radeon: Only call drm_vblank_on/off between drm_vblank_init/cleanup Philipp Zabel (3): gpu: ipu-cpmem: modify ipu_cpmem_set_yuv_planar_full for better control drm/imx: ipuv3-plane: Add more thorough checks for plane parameter limitations drm/imx: ipuv3-plane: fix planar YUV 4:2:0 support Rex Zhu (9): drm/amd/powerplay: fix segment fault issue in multi-display case. drm/amdgpu: add an cgs interface to notify amdgpu the dpm state. drm/amdgpu: Not support disable dpm in powerplay. drm/amd/powerplay: notify amdgpu whether dpm is enabled or not. drm/amdgpu: check dpm state before pm system fs initialized. drm/amd/powerplay: add new Fiji function for not setting same ps. drm/amd/powerplay: Need to change boot to performance state in resume. drm/amd/powerplay: fix issue that resume back, dpm can't work on FIJI. drm/amd/powerplay: add uvd/vce dpm enabling flag default. drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 24 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 15 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 58 +++++----- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 16 +-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 23 ++-- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 7 +- drivers/gpu/drm/amd/include/cgs_common.h | 8 ++ .../drm/amd/powerplay/eventmgr/eventactionchains.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 69 ++++++++++++ .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 16 ++- drivers/gpu/drm/arm/hdlcd_drv.c | 14 +-- drivers/gpu/drm/imx/dw_hdmi-imx.c | 13 ++- drivers/gpu/drm/imx/imx-drm-core.c | 10 -- drivers/gpu/drm/imx/ipuv3-plane.c | 123 ++++++++++++++++++--- drivers/gpu/drm/imx/ipuv3-plane.h | 4 + drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 5 + drivers/gpu/drm/nouveau/nouveau_platform.c | 7 +- drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 17 +++ drivers/gpu/drm/radeon/atombios_crtc.c | 6 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 6 +- drivers/gpu/ipu-v3/ipu-cpmem.c | 79 ++++++------- drivers/gpu/ipu-v3/ipu-dmfc.c | 8 +- include/drm/ttm/ttm_bo_api.h | 2 +- include/video/imx-ipu-v3.h | 7 +- 33 files changed, 405 insertions(+), 170 deletions(-) --29444707-801115149-1460008653=:1164--