From: Dave Airlie Date: Thu, 2 Nov 2017 19:32:08 +0000 (+1000) Subject: Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux into... X-Git-Tag: rel_imx_4.19.35_1.1.0~11238^2~2 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=26c860d5579684528114c3875ef88f7796330eb5;p=linux.git Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux into drm-next A few fixes for DC for 4.15. * 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux: drm/amdgpu/display: fix integer arithmetic problem drm/amdgpu/display: remove unused REG_OFFSET macro drm/amdgpu/display: provide ASSERT macros unconditionally drm/amd/display: Read resource_straps from registers for DCE12 drm/amd: Add DCE12 resource strap registers drm/amd/display: Explicitly call ->reset for each object drm/amd/display: Use single fail label in init_drm_dev drm/amd/display: Use plane pointer to avoid line breaks drm/amd/display: fix null pointer dereference amdgpu/dc: Avoid dereferencing NULL pointer drm/amd/display: Don't print error when bo_pin is interrupted drm/amd/display: Use constants from atom.h for HDMI caps read drm/amd/display: check if modeset is required before adding plane drm/amd/display: fix high part address in dm_plane_helper_prepare_fb() drm/amd/display : add high part address calculation for underlay drm/amd/display: Fix no display on Fiji Revert "drm/amd/display: Match actual state during S3 resume." --- 26c860d5579684528114c3875ef88f7796330eb5