2016-03-10 02:53:22

by Dave Airlie

[permalink] [raw]
Subject: [git pull] drm fixes


Hi Linus,

A few imx fixes I missed from a couple of weeks ago, they still aren't
that big and fix some regression and a fail to boot problem.

Other than that, a couple of regression fixes for radeon/amdgpu, one
regression fix for vmwgfx and one regression fix for tda998x.

Dave.

The following changes since commit f6cede5b49e822ebc41a099fe41ab4989f64e2cb:

Linux 4.5-rc7 (2016-03-06 14:48:03 -0800)

are available in the git repository at:

git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 848819c5447eb318a787467e8435a07c733e16c9:

Merge tag 'imx-drm-fixes-2016-02-19' of git://git.pengutronix.de/git/pza/linux into drm-fixes (2016-03-09 14:21:12 +1000)

----------------------------------------------------------------
Alex Deucher (3):
drm/radeon/dp: add back special handling for NUTMEG
drm/amdgpu/dp: add back special handling for NUTMEG
Revert "drm/radeon/pm: adjust display configuration after powerstate"

Dave Airlie (2):
Merge branch 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'imx-drm-fixes-2016-02-19' of git://git.pengutronix.de/git/pza/linux into drm-fixes

David Jander (1):
gpu: ipu-v3: Reset IPU before activating IRQ

Enrico Jorns (1):
drm/imx: Add missing DRM_FORMAT_RGB565 to ipu_plane_formats

Jyri Sarha (1):
drm/i2c: tda998x: Choose between atomic or non atomic dpms helper

Lucas Stach (1):
drm/imx: notify DRM core about CRTC vblank state

Mario Kleiner (2):
drm/amdgpu: Fix error handling in amdgpu_flip_work_func.
drm/radeon: Fix error handling in radeon_flip_work_func.

Philipp Zabel (1):
gpu: ipu-v3: Do not bail out on missing optional port nodes

Thierry Reding (1):
drm/vmwgfx: Add back ->detect() and ->fill_modes()

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 20 +++++++++++++++----
drivers/gpu/drm/i2c/tda998x_drv.c | 10 +++++++++-
drivers/gpu/drm/imx/ipuv3-crtc.c | 2 ++
drivers/gpu/drm/imx/ipuv3-plane.c | 1 +
drivers/gpu/drm/radeon/atombios_dp.c | 20 +++++++++++++++----
drivers/gpu/drm/radeon/radeon_display.c | 4 ++--
drivers/gpu/drm/radeon/radeon_pm.c | 5 ++---
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 ++
drivers/gpu/ipu-v3/ipu-common.c | 31 ++++++++++++++++-------------
10 files changed, 69 insertions(+), 30 deletions(-)


2016-03-10 12:54:42

by Daniel Vetter

[permalink] [raw]
Subject: Re: [git pull] drm fixes

On Thu, Mar 10, 2016 at 02:53:06AM +0000, Dave Airlie wrote:
>
> Hi Linus,
>
> A few imx fixes I missed from a couple of weeks ago, they still aren't
> that big and fix some regression and a fail to boot problem.
>
> Other than that, a couple of regression fixes for radeon/amdgpu, one
> regression fix for vmwgfx and one regression fix for tda998x.
>
> Dave.

Updated pull request with a fixup patch from Lionel applied for the issue
Dan reported. Btw I need to make a backmerge because conflict galore in
drm-intel, so maybe backmerge Linus into drm-next while at it?
-Daniel

The following changes since commit 44ab4042178bd596275927ea050980aa4257581b:

Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next (2016-02-26 13:02:57 +1000)

are available in the git repository at:

git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-03-10

for you to fetch changes up to 562c5b4d898613bec97f482098e7507f52c914cb:

drm: fix blob pointer check (2016-03-10 13:47:30 +0100)

----------------------------------------------------------------
Carlos Palminha (15):
drm/cirrus: removed optional dummy crtc mode_fixup function.
drm/mgag200: removed optional dummy crtc mode_fixup function.
drm/udl: removed optional dummy crtc mode_fixup function.
drm/gma: removed optional dummy crtc mode_fixup function.
drm/rcar-du: removed optional dummy crtc mode_fixup function.
drm/omapdrm: removed optional dummy crtc mode_fixup function.
drm/msm/mdp: removed optional dummy crtc mode_fixup function.
drm/shmobile: removed optional dummy crtc mode_fixup function.
drm/sti: removed optional dummy crtc mode_fixup function.
drm/atmel-hlcdc: remove optional dummy crtc mode_fixup function.
drm/nouveau/dispnv04: removed optional dummy crtc mode_fixup function.
drm/virtio: removed optional dummy crtc mode_fixup function.
drm/fsl-dcu: removed optional dummy crtc mode_fixup function.
drm/bochs: removed optional dummy crtc mode_fixup function.
drm/ast: removed optional dummy crtc mode_fixup function.

Lionel Landwerlin (2):
drm: introduce pipe color correction properties
drm: fix blob pointer check

Liu Ying (1):
drm/crtc: Use drm_mode_object_put() in __drm_framebuffer_unregister()

Maarten Lankhorst (7):
drm/atomic: Clean up update_output_state.
drm/atomic: Pass connector and state to update_connector_routing.
drm/atomic: Always call steal_encoder, v2.
drm/atomic: Handle encoder stealing from set_config better.
drm/atomic: Handle encoder assignment conflicts in a separate check, v3.
drm/atomic: Clean up steal_encoder, v2.
drm/atomic: Clean up update_connector_routing.

Documentation/DocBook/gpu.tmpl | 59 +++-
drivers/gpu/drm/ast/ast_mode.c | 8 -
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 9 -
drivers/gpu/drm/bochs/bochs_kms.c | 8 -
drivers/gpu/drm/cirrus/cirrus_mode.c | 13 -
drivers/gpu/drm/drm_atomic.c | 88 +++++-
drivers/gpu/drm/drm_atomic_helper.c | 361 ++++++++++++++++---------
drivers/gpu/drm/drm_crtc.c | 39 ++-
drivers/gpu/drm/drm_crtc_helper.c | 33 +++
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 8 -
drivers/gpu/drm/gma500/cdv_intel_display.c | 13 +-
drivers/gpu/drm/gma500/gma_display.c | 7 -
drivers/gpu/drm/gma500/gma_display.h | 3 -
drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 -
drivers/gpu/drm/gma500/oaktrail_crtc.c | 1 -
drivers/gpu/drm/gma500/psb_intel_display.c | 1 -
drivers/gpu/drm/mgag200/mgag200_mode.c | 13 -
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 8 -
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 8 -
drivers/gpu/drm/nouveau/dispnv04/crtc.c | 8 -
drivers/gpu/drm/omapdrm/omap_crtc.c | 8 -
drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 9 -
drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 8 -
drivers/gpu/drm/sti/sti_crtc.c | 9 -
drivers/gpu/drm/udl/udl_modeset.c | 9 -
drivers/gpu/drm/virtio/virtgpu_display.c | 8 -
include/drm/drm_atomic_helper.h | 3 +
include/drm/drm_crtc.h | 48 +++-
include/drm/drm_crtc_helper.h | 3 +
include/uapi/drm/drm_mode.h | 15 +
30 files changed, 524 insertions(+), 286 deletions(-)

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch