Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755745AbbEVDjI (ORCPT ); Thu, 21 May 2015 23:39:08 -0400 Received: from gir.skynet.ie ([193.1.99.77]:56132 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755640AbbEVDjF (ORCPT ); Thu, 21 May 2015 23:39:05 -0400 Date: Fri, 22 May 2015 04:39:02 +0100 (IST) 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 Content-Length: 5055 Lines: 116 Hi Linus, radeon has two displayport fixes, one for a regressions, i915 regression flicker fix needed to 4.0 can get fixed. a bunch of msm fixes and a bunch of exynos fixes, these two are probably a bit larger than I'd like, but most of them seems pretty good. Dave. The following changes since commit e26081808edadfd257c6c9d81014e3b25e9a6118: Linux 4.1-rc4 (2015-05-18 10:13:47 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to a8106b147f9b90ff84c458ec1f6d3b3a9d27a5f1: Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2015-05-22 13:31:54 +1000) ---------------------------------------------------------------- Alex Deucher (2): drm/radeon: retry dcpd fetch drm/radeon: fix error flag checking in native aux path Archit Taneja (1): drm: msm: Fix build when legacy fbdev support isn't set Dave Airlie (4): Merge branch 'msm-fixes-4.1' of git://people.freedesktop.org/~robclark/linux into drm-fixes Merge branch 'exynos-drm-fixes' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Merge tag 'drm-intel-fixes-2015-05-21' of git://anongit.freedesktop.org/drm-intel into drm-fixes Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Hai Li (3): drm/msm/dsi: Fixup missing *break* statement during cmd rx drm/msm: Attach assigned encoder to eDP and DSI connectors drm/msm/dsi: Simplify the code to get the number of read byte Julia Lawall (1): drm/msm/dp: fix error return code Krzysztof Kozlowski (5): drm/exynos: mixer: Constify platform_device_id drm/exynos: Fix build breakage on !DRM_EXYNOS_FIMD drm/exynos: Constify exynos_drm_crtc_ops drm/exynos: Consolidate return statements in fimd_bind() drm/exynos: dp: Lower level of EDID read success message Rob Clark (3): drm/msm/dsi: use pr_err_ratelimited drm/msm: setup vram after component_bind_all() drm/msm: fix locking inconsistencies in gpu->destroy() Stephane Viau (4): drm/msm/dsi: Fix a couple more 64-bit build warnings drm/msm/mdp5: Fix iteration on INTF config array drm/msm: fix unbalanced DRM framebuffer init/destroy drm/msm/mdp5: fix incorrect parameter for msm_framebuffer_iova() Thierry Reding (1): drm/msm: Fix a couple of 64-bit build warnings Thomas Gummerer (1): drm/i915: fix screen flickering Tobias Jakobi (8): drm/exynos: fb: use drm_format_num_planes to get buffer count drm/exynos: plane: honor buffer offset for dma_addr drm/exynos: mixer: remove buffer count handling in vp_video_buffer() drm/exynos: mixer: also allow NV21 for the video processor drm/exynos: mixer: cleanup pixelformat handling drm/exynos: mixer: don't dump registers under spinlock drm/exynos: 'win' is always unsigned drm/exynos: cleanup exynos_drm_plane drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 +- drivers/gpu/drm/exynos/exynos_dp_core.c | 13 ++++-- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ++--- drivers/gpu/drm/exynos/exynos_drm_crtc.h | 10 ++--- drivers/gpu/drm/exynos/exynos_drm_drv.h | 20 +++------ drivers/gpu/drm/exynos/exynos_drm_fb.c | 39 +--------------- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 53 ++++++++++------------ drivers/gpu/drm/exynos/exynos_drm_fimd.h | 15 ------- drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +- drivers/gpu/drm/exynos/exynos_mixer.c | 72 ++++++++++++++++-------------- drivers/gpu/drm/i915/intel_pm.c | 24 +++++----- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/msm/dsi/dsi.c | 10 ++--- drivers/gpu/drm/msm/dsi/dsi_host.c | 21 ++++----- drivers/gpu/drm/msm/dsi/dsi_manager.c | 6 ++- drivers/gpu/drm/msm/edp/edp_aux.c | 4 +- drivers/gpu/drm/msm/edp/edp_connector.c | 2 + drivers/gpu/drm/msm/edp/edp_ctrl.c | 3 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 34 +++++++------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 9 ++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 12 ++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 24 +++++----- drivers/gpu/drm/msm/msm_fb.c | 7 ++- drivers/gpu/drm/msm/msm_gem.c | 2 +- drivers/gpu/drm/msm/msm_iommu.c | 4 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- drivers/gpu/drm/radeon/atombios_dp.c | 20 +++++---- drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 - 30 files changed, 190 insertions(+), 240 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_fimd.h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/