dri-devel July 2018

dri-devel@lists.freedesktop.org

277 participants
1883 discussions

Shared atomic state causing Weston repaint failure
by Daniel Stone 06 Jul '18

06 Jul '18

Hi, The atomic API being super-explicit about how userspace sequences its calls is great and all, but having shared global state implicitly dragged in is kind of ruining my day. Currently on Intel, Weston sometimes fails on hotplug, because a commit which only enables CRTC B (not touching CRTC A or any other CRTC!), causes all commits to CRTC A to fail until CRTC B's modeset commit has fully retired: https://gitlab.freedesktop.org/wayland/weston/issues/24 The reason is that committing CRTC B resizes the DDB allocation for CRTC A as well, pulling CRTC A's CRTC state into the commit. This makes sense, but on the other hand it's totally opaque to userspace, and impossible for us to reason about when making commits. I suggested some options in that GitLab commit, none of which I like: * if any other CRTCs are pulled into a commit state, always execute a blocking commit in the kernel * if we're passing ALLOW_MODESET in userspace, only ever do blocking commits * whenever we get -EBUSY in userspace, assume we've been screwed by the kernel and defer until other outputs have completed * whenever we want to reconfigure any output in userspace, wait until all outputs are completely quiescent and do a single atomic commit covering all outputs The first one seems completely non-obvious from the kernel, but on the other hand the current -EBUSY failing behaviour is also non-obvious. The second is maybe the most reasonable, but on the other hand just working around a painful leaky abstraction: we also can't know upfront from userspace if this is actually going to be required, or if we're just killing responsiveness blocking for no reason. The third is the thing I least want to do, because it might well paper over legitimate bugs in userspace, and complicates our state tracking for no reason. The fourth is probably the most legitimate, but, well ... someone has to type up all the code to make our output-configuration API completely asynchronous. I suspect we're the first ones to be hitting this, because Weston has a truly independent per-CRTC repaint loop, we're one of the few atomic users, and also because Pekka did some seriously brutal hotplug testing whilst reworking Weston's output configuration API. Also because our approach to failed output repaints is to just freeze the output until it next cycles off and on, which is much more apparent than just silently dropping a frame here and there. ;) Any bright ideas on what could practically be done here? Cheers, Daniel

3 4

[PATCH 4.17 22/46] drm/sti: Depend on OF rather than selecting it
by Greg Kroah-Hartman 06 Jul '18

06 Jul '18

4.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver O'Halloran <oohall(a)gmail.com> commit c9fea6f4379c72b7c59e1efceab09a35bc7eac43 upstream. Commit cc6b741c6f63 ("drm: sti: remove useless fields from vtg structure") reworked some code inside of this driver and made it select CONFIG_OF. This results in the entire OF layer being enabled when building an allmodconfig on ia64. OF on ia64 is completely unsupported so this isn't a great state of affairs. The 0day robot noticed a link-time failure on ia64 caused by using of_node_to_nid() in an otherwise unrelated driver. The generic fallback for of_node_to_nid() only exists when: defined(CONFIG_OF) && defined(CONFIG_NUMA) == false Since CONFIG_NUMA is usually selected for IA64 we get the link failure. Fix this by making the driver depend on OF rather than selecting it, odds are that was the original intent. Link: https://lists.01.org/pipermail/kbuild-all/2018-March/045172.html Fixes: cc6b741c6f63 ("drm: sti: remove useless fields from vtg structure") Cc: Benjamin Gaignard <benjamin.gaignard(a)linaro.org> Cc: Vincent Abriou <vincent.abriou(a)st.com> Cc: David Airlie <airlied(a)linux.ie> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-ia64(a)vger.kernel.org Cc: stable(a)vger.kernel.org Signed-off-by: Oliver O'Halloran <oohall(a)gmail.com> Reviewed-by: Benjamin Gaignard <benjamin.gaignard(a)linaro.org> Signed-off-by: Philippe Cornu <philippe.cornu(a)st.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180403053401.30045-1-oohall… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/gpu/drm/sti/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/gpu/drm/sti/Kconfig +++ b/drivers/gpu/drm/sti/Kconfig @@ -1,6 +1,6 @@ config DRM_STI tristate "DRM Support for STMicroelectronics SoC stiH4xx Series" - depends on DRM && (ARCH_STI || ARCH_MULTIPLATFORM) + depends on OF && DRM && (ARCH_STI || ARCH_MULTIPLATFORM) select RESET_CONTROLLER select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER @@ -8,6 +8,5 @@ config DRM_STI select DRM_PANEL select FW_LOADER select SND_SOC_HDMI_CODEC if SND_SOC - select OF help Choose this option to enable DRM on STM stiH4xx chipset

1 0

[PATCH] drm/bridge/synopsys: remove commented-out flag in Makefile
by Masahiro Yamada 06 Jul '18

06 Jul '18

Please do not comment out unneeded code, but remove it. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/gpu/drm/bridge/synopsys/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile index 5dad97d..3e1b1e3 100644 --- a/drivers/gpu/drm/bridge/synopsys/Makefile +++ b/drivers/gpu/drm/bridge/synopsys/Makefile @@ -1,5 +1,3 @@ -#ccflags-y := -Iinclude/drm - obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o -- 2.7.4

1 0

[git pull] drm-fixes for 4.18-rc4
by Dave Airlie 06 Jul '18

06 Jul '18

Oh wow not my day, this one ended up with no subject. On 6 July 2018 at 11:26, Dave Airlie <airlied(a)gmail.com> wrote: > Hi Linus, (apologies for blank body pull earlier) > > This is the drm fixes for rc4. It's a bit larger than I'd like but the > exynos cleanups are pretty mechanical, and I'd rather have them in > sooner rather than later so we can avoid too much conflicts around > them. The non-mechanincal exynos changes are mostly fixes for new > feature recently introduced. > > i915: > GVT and GGTT mapping fixes > > amdgpu: > HDMI2.0 4K@60 Hz regression > Hotplug fixes for dual-GPU laptops to make power management better > Misc vega12 bios fixes, a race fix and some typos. > > sii8620 bridge: small fixes around mode setting > > core: use kvzalloc to allocate blob property memory. > > If the exynos changes are too much, I'm happy to push back, and the > blank pull was thanks to baby induced sleep deprivation, fat fingers > and gmail. > > Thanks, > Dave. > > drm-fixes-2018-07-06: > amdgpu, i915, exynos, udl, sii8620 and core fixes > The following changes since commit 021c91791a5e7e85c567452f1be3e4c2c6cb6063: > > Linux 4.18-rc3 (2018-07-01 16:04:53 -0700) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2018-07-06 > > for you to fetch changes up to c78d1f9d95a9f2cd5546c64f5315f54681dd6055: > > Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of > git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into > drm-fixes (2018-07-06 10:47:02 +1000) > > ---------------------------------------------------------------- > amdgpu, i915, exynos, udl, sii8620 and core fixes > > ---------------------------------------------------------------- > Alex Deucher (2): > drm/amdgpu: fix swapped emit_ib_size in vce3 > drm/amdgpu/pm: fix display count in non-DC path > > Andrzej Pietrasiewicz (1): > drm/exynos: scaler: Reset hardware before starting the operation > > Chris Wilson (1): > drm/i915: Try GGTT mmapping whole object as partial > > Dave Airlie (4): > Merge tag 'drm-misc-fixes-2018-07-05' of > git://anongit.freedesktop.org/drm/drm-misc into drm-fixes > Merge tag 'drm-intel-fixes-2018-07-05' of > git://anongit.freedesktop.org/drm/drm-intel into drm-fixes > Merge branch 'drm-fixes-4.18' of > git://people.freedesktop.org/~agd5f/linux into drm-fixes > Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of > git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes > > Evan Quan (3): > drm/amd/powerplay: correct vega12 thermal support as true > drm/amd/powerplay: correct vega12 bootup values settings > drm/amd/powerplay: smc_dpm_info structure change > > Jani Nikula (1): > Merge tag 'gvt-fixes-2018-07-03' of > https://github.com/intel/gvt-linux into drm-intel-fixes > > Lyude Paul (3): > drm/amdgpu: Make struct amdgpu_atif private to amdgpu_acpi.c > drm/amdgpu: Add amdgpu_atpx_get_dhandle() > drm/amdgpu: Dynamically probe for ATIF handle (v2) > > Maciej Purski (3): > drm/bridge/sii8620: Send AVI infoframe in all MHL versions > drm/bridge/sii8620: Fix display of packed pixel modes > drm/bridge/sii8620: Fix link mode selection > > Marek Szyprowski (10): > drm/exynos: ipp: Rework checking for the correct buffer formats > drm/exynos: rotator: Fix DRM_MODE_REFLECT_{X,Y} interpretation > drm/exynos: scaler: Fix support for YUV420, YUV422 and YUV444 modes > drm/exynos: gsc: Use real buffer width for configuring the hardware > drm/exynos: gsc: Increase Exynos5433 buffer width alignment to 16 pixels > drm/exynos: gsc: Fix DRM_MODE_REFLECT_{X,Y} interpretation > drm/exynos: gsc: Fix support for NV16/61, YUV420/YVU420 and YUV422 modes > drm/exynos: fimc: Use real buffer width for configuring the hardware > drm/exynos: decon5433: Fix per-plane global alpha for XRGB modes > drm/exynos: decon5433: Fix WINCONx reset value > > Michel Dänzer (1): > drm: Use kvzalloc for allocating blob property memory > > Mikita Lipski (2): > drm/amd/display: adding ycbcr420 pixel encoding for hdmi > drm/amd/display: add a check for display depth validity > > Mikulas Patocka (1): > drm/udl: fix display corruption of the last line > > Nicolai Hähnle (1): > drm/amdgpu: fix user fence write race condition > > Stefan Agner (1): > drm/exynos: ipp: use correct enum type > > Thomas Zimmermann (3): > drm/exynos: Replace drm_framebuffer_{un/reference} with put,get functions > drm/exynos: Replace drm_gem_object_unreference_unlocked with put function > drm/exynos: Replace drm_dev_unref with drm_dev_put > > Xiaolin Zhang (1): > drm/i915/gvt: changed DDI mode emulation type > > Zhao Yan (1): > drm/i915/gvt: fix a bug of partially write ggtt enties > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 46 ++------ > drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 131 +++++++++++++++++---- > drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 6 + > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 12 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +- > drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 49 +++++++- > drivers/gpu/drm/amd/include/atomfirmware.h | 5 +- > drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 96 +++++++++++++-- > drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 5 + > drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 + > drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + > .../amd/powerplay/hwmgr/vega12_processpptables.c | 2 + > .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h | 5 +- > drivers/gpu/drm/bridge/sil-sii8620.c | 86 +++++++++----- > drivers/gpu/drm/drm_property.c | 6 +- > drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 6 +- > drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +- > drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +- > drivers/gpu/drm/exynos/exynos_drm_fimc.c | 17 +-- > drivers/gpu/drm/exynos/exynos_drm_gem.c | 10 +- > drivers/gpu/drm/exynos/exynos_drm_gsc.c | 51 ++++---- > drivers/gpu/drm/exynos/exynos_drm_ipp.c | 110 +++++++++-------- > drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- > drivers/gpu/drm/exynos/exynos_drm_rotator.c | 4 +- > drivers/gpu/drm/exynos/exynos_drm_scaler.c | 44 +++++-- > drivers/gpu/drm/exynos/regs-gsc.h | 1 + > drivers/gpu/drm/i915/gvt/display.c | 6 +- > drivers/gpu/drm/i915/gvt/gtt.c | 58 +++++++++ > drivers/gpu/drm/i915/gvt/gtt.h | 2 + > drivers/gpu/drm/i915/i915_gem.c | 28 +++-- > drivers/gpu/drm/i915/i915_vma.c | 2 +- > drivers/gpu/drm/udl/udl_fb.c | 5 +- > drivers/gpu/drm/udl/udl_transfer.c | 11 +- > 34 files changed, 583 insertions(+), 242 deletions(-)

1 0

(no subject)
by Dave Airlie 06 Jul '18

06 Jul '18

Hi Linus, (apologies for blank body pull earlier) This is the drm fixes for rc4. It's a bit larger than I'd like but the exynos cleanups are pretty mechanical, and I'd rather have them in sooner rather than later so we can avoid too much conflicts around them. The non-mechanincal exynos changes are mostly fixes for new feature recently introduced. i915: GVT and GGTT mapping fixes amdgpu: HDMI2.0 4K@60 Hz regression Hotplug fixes for dual-GPU laptops to make power management better Misc vega12 bios fixes, a race fix and some typos. sii8620 bridge: small fixes around mode setting core: use kvzalloc to allocate blob property memory. If the exynos changes are too much, I'm happy to push back, and the blank pull was thanks to baby induced sleep deprivation, fat fingers and gmail. Thanks, Dave. drm-fixes-2018-07-06: amdgpu, i915, exynos, udl, sii8620 and core fixes The following changes since commit 021c91791a5e7e85c567452f1be3e4c2c6cb6063: Linux 4.18-rc3 (2018-07-01 16:04:53 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2018-07-06 for you to fetch changes up to c78d1f9d95a9f2cd5546c64f5315f54681dd6055: Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes (2018-07-06 10:47:02 +1000) ---------------------------------------------------------------- amdgpu, i915, exynos, udl, sii8620 and core fixes ---------------------------------------------------------------- Alex Deucher (2): drm/amdgpu: fix swapped emit_ib_size in vce3 drm/amdgpu/pm: fix display count in non-DC path Andrzej Pietrasiewicz (1): drm/exynos: scaler: Reset hardware before starting the operation Chris Wilson (1): drm/i915: Try GGTT mmapping whole object as partial Dave Airlie (4): Merge tag 'drm-misc-fixes-2018-07-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2018-07-05' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge branch 'drm-fixes-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Evan Quan (3): drm/amd/powerplay: correct vega12 thermal support as true drm/amd/powerplay: correct vega12 bootup values settings drm/amd/powerplay: smc_dpm_info structure change Jani Nikula (1): Merge tag 'gvt-fixes-2018-07-03' of https://github.com/intel/gvt-linux into drm-intel-fixes Lyude Paul (3): drm/amdgpu: Make struct amdgpu_atif private to amdgpu_acpi.c drm/amdgpu: Add amdgpu_atpx_get_dhandle() drm/amdgpu: Dynamically probe for ATIF handle (v2) Maciej Purski (3): drm/bridge/sii8620: Send AVI infoframe in all MHL versions drm/bridge/sii8620: Fix display of packed pixel modes drm/bridge/sii8620: Fix link mode selection Marek Szyprowski (10): drm/exynos: ipp: Rework checking for the correct buffer formats drm/exynos: rotator: Fix DRM_MODE_REFLECT_{X,Y} interpretation drm/exynos: scaler: Fix support for YUV420, YUV422 and YUV444 modes drm/exynos: gsc: Use real buffer width for configuring the hardware drm/exynos: gsc: Increase Exynos5433 buffer width alignment to 16 pixels drm/exynos: gsc: Fix DRM_MODE_REFLECT_{X,Y} interpretation drm/exynos: gsc: Fix support for NV16/61, YUV420/YVU420 and YUV422 modes drm/exynos: fimc: Use real buffer width for configuring the hardware drm/exynos: decon5433: Fix per-plane global alpha for XRGB modes drm/exynos: decon5433: Fix WINCONx reset value Michel Dänzer (1): drm: Use kvzalloc for allocating blob property memory Mikita Lipski (2): drm/amd/display: adding ycbcr420 pixel encoding for hdmi drm/amd/display: add a check for display depth validity Mikulas Patocka (1): drm/udl: fix display corruption of the last line Nicolai Hähnle (1): drm/amdgpu: fix user fence write race condition Stefan Agner (1): drm/exynos: ipp: use correct enum type Thomas Zimmermann (3): drm/exynos: Replace drm_framebuffer_{un/reference} with put,get functions drm/exynos: Replace drm_gem_object_unreference_unlocked with put function drm/exynos: Replace drm_dev_unref with drm_dev_put Xiaolin Zhang (1): drm/i915/gvt: changed DDI mode emulation type Zhao Yan (1): drm/i915/gvt: fix a bug of partially write ggtt enties drivers/gpu/drm/amd/amdgpu/amdgpu.h | 46 ++------ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 131 +++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 49 +++++++- drivers/gpu/drm/amd/include/atomfirmware.h | 5 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 96 +++++++++++++-- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 5 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + .../amd/powerplay/hwmgr/vega12_processpptables.c | 2 + .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h | 5 +- drivers/gpu/drm/bridge/sil-sii8620.c | 86 +++++++++----- drivers/gpu/drm/drm_property.c | 6 +- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_fimc.c | 17 +-- drivers/gpu/drm/exynos/exynos_drm_gem.c | 10 +- drivers/gpu/drm/exynos/exynos_drm_gsc.c | 51 ++++---- drivers/gpu/drm/exynos/exynos_drm_ipp.c | 110 +++++++++-------- drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_rotator.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_scaler.c | 44 +++++-- drivers/gpu/drm/exynos/regs-gsc.h | 1 + drivers/gpu/drm/i915/gvt/display.c | 6 +- drivers/gpu/drm/i915/gvt/gtt.c | 58 +++++++++ drivers/gpu/drm/i915/gvt/gtt.h | 2 + drivers/gpu/drm/i915/i915_gem.c | 28 +++-- drivers/gpu/drm/i915/i915_vma.c | 2 +- drivers/gpu/drm/udl/udl_fb.c | 5 +- drivers/gpu/drm/udl/udl_transfer.c | 11 +- 34 files changed, 583 insertions(+), 242 deletions(-)

1 0

[git pull] drm fixes for 4.18-rc4
by Dave Airlie 06 Jul '18

06 Jul '18

Hi Linus, drm-fixes-2018-07-06: amdgpu, i915, exynos, udl, sii8620 and core fixes The following changes since commit 021c91791a5e7e85c567452f1be3e4c2c6cb6063: Linux 4.18-rc3 (2018-07-01 16:04:53 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2018-07-06 for you to fetch changes up to c78d1f9d95a9f2cd5546c64f5315f54681dd6055: Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes (2018-07-06 10:47:02 +1000) ---------------------------------------------------------------- amdgpu, i915, exynos, udl, sii8620 and core fixes ---------------------------------------------------------------- Alex Deucher (2): drm/amdgpu: fix swapped emit_ib_size in vce3 drm/amdgpu/pm: fix display count in non-DC path Andrzej Pietrasiewicz (1): drm/exynos: scaler: Reset hardware before starting the operation Chris Wilson (1): drm/i915: Try GGTT mmapping whole object as partial Dave Airlie (4): Merge tag 'drm-misc-fixes-2018-07-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2018-07-05' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge branch 'drm-fixes-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'exynos-drm-fixes-for-v4.18-rc4' of git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes Evan Quan (3): drm/amd/powerplay: correct vega12 thermal support as true drm/amd/powerplay: correct vega12 bootup values settings drm/amd/powerplay: smc_dpm_info structure change Jani Nikula (1): Merge tag 'gvt-fixes-2018-07-03' of https://github.com/intel/gvt-linux into drm-intel-fixes Lyude Paul (3): drm/amdgpu: Make struct amdgpu_atif private to amdgpu_acpi.c drm/amdgpu: Add amdgpu_atpx_get_dhandle() drm/amdgpu: Dynamically probe for ATIF handle (v2) Maciej Purski (3): drm/bridge/sii8620: Send AVI infoframe in all MHL versions drm/bridge/sii8620: Fix display of packed pixel modes drm/bridge/sii8620: Fix link mode selection Marek Szyprowski (10): drm/exynos: ipp: Rework checking for the correct buffer formats drm/exynos: rotator: Fix DRM_MODE_REFLECT_{X,Y} interpretation drm/exynos: scaler: Fix support for YUV420, YUV422 and YUV444 modes drm/exynos: gsc: Use real buffer width for configuring the hardware drm/exynos: gsc: Increase Exynos5433 buffer width alignment to 16 pixels drm/exynos: gsc: Fix DRM_MODE_REFLECT_{X,Y} interpretation drm/exynos: gsc: Fix support for NV16/61, YUV420/YVU420 and YUV422 modes drm/exynos: fimc: Use real buffer width for configuring the hardware drm/exynos: decon5433: Fix per-plane global alpha for XRGB modes drm/exynos: decon5433: Fix WINCONx reset value Michel Dänzer (1): drm: Use kvzalloc for allocating blob property memory Mikita Lipski (2): drm/amd/display: adding ycbcr420 pixel encoding for hdmi drm/amd/display: add a check for display depth validity Mikulas Patocka (1): drm/udl: fix display corruption of the last line Nicolai Hähnle (1): drm/amdgpu: fix user fence write race condition Stefan Agner (1): drm/exynos: ipp: use correct enum type Thomas Zimmermann (3): drm/exynos: Replace drm_framebuffer_{un/reference} with put,get functions drm/exynos: Replace drm_gem_object_unreference_unlocked with put function drm/exynos: Replace drm_dev_unref with drm_dev_put Xiaolin Zhang (1): drm/i915/gvt: changed DDI mode emulation type Zhao Yan (1): drm/i915/gvt: fix a bug of partially write ggtt enties drivers/gpu/drm/amd/amdgpu/amdgpu.h | 46 ++------ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 131 +++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 49 +++++++- drivers/gpu/drm/amd/include/atomfirmware.h | 5 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 96 +++++++++++++-- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 5 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 4 + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + .../amd/powerplay/hwmgr/vega12_processpptables.c | 2 + .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h | 5 +- drivers/gpu/drm/bridge/sil-sii8620.c | 86 +++++++++----- drivers/gpu/drm/drm_property.c | 6 +- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_fimc.c | 17 +-- drivers/gpu/drm/exynos/exynos_drm_gem.c | 10 +- drivers/gpu/drm/exynos/exynos_drm_gsc.c | 51 ++++---- drivers/gpu/drm/exynos/exynos_drm_ipp.c | 110 +++++++++-------- drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_rotator.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_scaler.c | 44 +++++-- drivers/gpu/drm/exynos/regs-gsc.h | 1 + drivers/gpu/drm/i915/gvt/display.c | 6 +- drivers/gpu/drm/i915/gvt/gtt.c | 58 +++++++++ drivers/gpu/drm/i915/gvt/gtt.h | 2 + drivers/gpu/drm/i915/i915_gem.c | 28 +++-- drivers/gpu/drm/i915/i915_vma.c | 2 +- drivers/gpu/drm/udl/udl_fb.c | 5 +- drivers/gpu/drm/udl/udl_transfer.c | 11 +- 34 files changed, 583 insertions(+), 242 deletions(-)

1 0

[pull] amdgpu, radeon, scheduler drm-next-4.19
by Alex Deucher 05 Jul '18

05 Jul '18

Hi Dave, More features for 4.19: - Use core pcie functionality rather than duplicating our own for pcie gens and lanes - Scheduler function naming cleanups - More documentation - Reworked DC/Powerplay interfaces to improve power savings - Initial stutter mode support for RV (power feature) - Vega12 powerplay updates - GFXOFF fixes - Misc fixes The following changes since commit f29135ee4e0d4e01911ed569f731bfdb841cea6d: Merge v4.18-rc3 into drm-next (2018-07-04 10:27:12 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.19 for you to fetch changes up to 43911fb68b19f7c37ab69eff8e6a3c1370bc0cb5: drm/amd: Add sphinx documentation for amd_ip_funcs (2018-07-05 16:57:54 -0500) ---------------------------------------------------------------- Alex Deucher (17): Revert "drm/amdgpu: avoid sleep while executing atombios table (V2)" drm/amdgpu: fix swapped emit_ib_size in vce3 drm/amdgpu/pm: fix display count in non-DC path drm/amdgpu/pp: add missing byte swapping in process_pptables_v1_0.c drm/amdgpu/pp: fix endian swapping in atomctrl_get_voltage_range drm/amdgpu/pp: fix copy paste typo in smu7_init_dpm_defaults drm/amdgpu/pp: fix copy paste typo in smu7_get_pp_table_entry_callback_func_v1 drm/amdgpu/sdma: simplify sdma instance setup drm/amdgpu/vce: simplify vce instance setup drm/amdgpu: update uvd_v6_0_ring_vm_funcs to use new nop packet drm/amdgpu: switch firmware path for CIK parts (v2) drm/amdgpu: switch firmware path for SI parts PCI: Export pcie_get_speed_cap and pcie_get_width_cap drm/amdgpu: update amd_pcie.h to include gen4 speeds drm/amdgpu: use pcie functions for link width and speed drm/radeon: use pcie functions for link width drm: drop drm_pcie_get_speed_cap_mask and drm_pcie_get_max_link_width Andrey Grodzovsky (4): drm/amdgpu: Polish SQ IH. drm/amdgpu: Add parsing SQ_EDC_INFO to SQ IH v3. drm/scheduler: Rename cleanup functions v2. drm/amdgpu: Rename entity cleanup finctions. Charlene Liu (2): drm/amd/display: Define dp_alt_mode drm/amd/display: add valid regoffset and NULL pointer check Christian König (1): drm/amdgpu: band aid validating VM PTs Dan Carpenter (1): drm/amd/display: off by one in find_irq_source_info() Darren Powell (2): drm/amd: Remove errors from sphinx documentation drm/amd: Add sphinx documentation for amd_ip_funcs David Francis (1): drm/amd/display: Add front end for dp debugfs files Dirk Hohndel (VMware) (2): drm/amd: add SPDX identifier and clarify license drm/radeon: add SPDX identifier and clarify license Dmytro Laktyushkin (23): drm/amd/display: replace clocks_value struct with dc_clocks drm/amd/display: redesign dce/dcn clock voltage update request drm/amd/display: rename display clock block to dccg drm/amd/display: move clock programming from set_bandwidth to dccg drm/amd/display: remove invalid assert when no max_pixel_clk is found drm/amd/display: get rid of cur_clks from dcn_bw_output drm/amd/display: move dcn1 dispclk programming to dccg drm/amd/display: clean up dccg divider calc and dcn constructor drm/amd/display: rename dce_disp_clk to dccg drm/amd/display: clean up set_bandwidth usage drm/amd/display: remove unnecessary pplib volage requests that are asserting drm/amd/display: fix dccg dcn1 ifdef drm/amd/display: fix pplib voltage request drm/amd/display: add CHG_DONE mash/sh defines for dentist drm/amd/display: change dentist DID enum values to uppercase drm/amd/display: add safe_to_lower support to dcn wm programming drm/amd/display: clean rq/dlg/ttu reg structs before calculations drm/amd/display: move dml defaults to respective dcn resource files drm/amd/display: fix dcn1 watermark range reporting drm/amd/display: remove dcn1 watermark sets b, c and d drm/amd/display: separate out wm change request dcn workaround drm/amd/display: move dcn watermark programming to set_bandwidth drm/amd/display: remove soc_bounding_box.c Evan Quan (14): drm/amd/powerplay: correct vega12 bootup values settings drm/amd/powerplay: smc_dpm_info structure change drm/amd/powerplay: drop the acg fix drm/amd/powerplay: revise default dpm tables setup drm/amd/powerplay: retrieve all clock ranges on startup drm/amd/powerplay: revise clock level setup drm/amd/powerplay: initialize uvd/vce powergate status v4 drm/amd/powerplay: correct smc display config for multi monitor drm/amd/powerplay: drop unnecessary uclk hard min setting drm/amd/powerplay: correct vega12 max num of dpm level drm/amd/powerplay: apply clocks adjust rules on power state change drm/amd/powerplay: set vega12 pre display configurations drm/amd/powerplay: correct vega12 thermal support as true drm/amd/powerplay: cosmetic fix Flora Cui (1): drm/amdgpu: remove duplicated codes Gustavo A. R. Silva (1): drm/amd/display/dc/dce: Fix multiple potential integer overflows Harry Wentland (1): Revert "drm/amd/display: Fix indentation in dcn10 resource constructor" Huang Rui (1): drm/amdgpu: fix the wrong type of gem object creation Kees Cook (1): drm/amd/display: Use 2-factor allocator calls Lyude Paul (4): drm/amdgpu: Make struct amdgpu_atif private to amdgpu_acpi.c drm/amdgpu: s/disp_detetion_ports/disp_detection_ports/ drm/amdgpu: Add amdgpu_atpx_get_dhandle() drm/amdgpu: Dynamically probe for ATIF handle (v2) Michel Dänzer (3): drm/amdgpu: Use gmc_vram_full_visible in vram_mgr_bo_invisible_size drm/amdgpu: Add AMDGPU_GPU_PAGES_IN_CPU_PAGE define drm/amdgpu: Remove amdgpu_gem_map_attach target_dev documentation Mikita Lipski (12): drm/amd/display: Adding dm-pp clocks getting by voltage drm/amd/display: Apply clock for voltage request drm/amd/display: Adding Get static clocks for dm_pp interface drm/amd/display: Introduce pp-smu raven functions drm/amd/display: Use local structs instead of struct pointers drm/amd/display: Add clock types to applying clk for voltage drm/amd/display: Enable PPLib calls from DC on linux drm/amd/display: Add dmpp clks types for conversion drm/amd/display: Convert 10kHz clks from PPLib into kHz drm/amd/display: Moving powerplay functions to a separate class drm/amd/display: adding ycbcr420 pixel encoding for hdmi drm/amd/display: add a check for display depth validity Nicolai Hähnle (1): drm/amdgpu: fix user fence write race condition Rex Zhu (17): drm/amdgpu: Rename set_mmhub_powergating_by_smu to powergate_mmhub drm/amd/pp: Rename enable_per_cu_power_gating to powergate_gfx drm/amd/pp: Unify powergate_uvd/vce/mmhub to set_powergating_by_smu drm/amd/pp: Add gfx pg support in smu through set_powergating_by_smu drm/amd/pp: Add powergate_gfx backend function on Raven drm/amdgpu: Add gfx_off support in smu through pp_set_powergating_by_smu drm/amdgpu: Split set_pg_state into separate function drm/amdgpu: Move CG/PG setting out of delay worker thread drm/amd/display: Fix a typo in wm_min_memg_clk_in_khz drm/amd/pp: Convert clock unit to KHz as defined drm/amd/pp: Memory Latency is always 25us on Vega10 drm/amd/pp: Refine the interface exported to display drm/amd/pp: Remove duplicate code in vega12_hwmgr.c drm/amd/pp: Export notify_smu_enable_pwe to display drm/amd/display: Refine the implementation of dm_pp_get_funcs_rv drm/amd/display: Fix copy error when set memory clocks drm/amd/pp: Remove the same struct define in powerplay Roman Li (1): drm/amd/display: fix potential infinite loop in fbc path Samson Tam (1): drm/amd/display: get board layout for edid emulation Sonny Jiang (1): drm/amdgpu: update documentation for amdgpu_drv.c Stefan Agner (1): drm/amd/display: don't initialize result Thomas Zimmermann (1): drm/amd: Replace drm_dev_unref with drm_dev_put Tom St Denis (1): drm/amd/amdgpu: Add a GPU_LOAD entry to sysfs (v3) Tony Cheng (6): drm/amd/display: dal 3.1.48 drm/amd/display: dal 3.1.49 drm/amd/display: dal 3.1.50 drm/amd/display: dal 3.1.51 drm/amd/display: dal 3.1.52 drm/amd/display: Allow option to use worst-case watermark Wesley Chalmers (2): drm/amd/display: Temporarily remove Chroma logs drm/amd/display: fix use of uninitialized memory Yongqiang Sun (2): drm/amd/display: Use tg count for opp init. drm/amd/display: Check scaling ration not viewports params. Zheng, XueLai(Eric) (1): drm/amd/display: support ACrYCb2101010 rex zhu (7): drm/amd/display: Drop unnecessary header file drm/amd/display: Fix dm-pp clks type convert error drm/amdgpu: Add stutter mode ctrl in module parameter drm/amd/display: Ctrl stutter mode through module parameter drm/amd/pp: Switch the tolerable latency for display drm/amd/display: Notify powerplay the min_dcef clock drm/amd/display: Notify powerplay the display controller id Documentation/gpu/amdgpu.rst | 12 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 55 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 131 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 165 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 241 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 5 - drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 50 +- drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 28 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 36 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 56 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 72 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 120 ++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 14 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 15 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 12 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 14 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 23 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 25 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 24 +- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 16 +- drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 61 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 170 ++++ .../amdgpu_dm_debugfs.h} | 13 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 535 ++++++++++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 324 +----- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 196 ++++ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 218 +++- .../gpu/drm/amd/display/dc/bios/command_table2.c | 46 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 194 ++-- drivers/gpu/drm/amd/display/dc/core/dc.c | 5 - drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 24 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 40 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 8 +- drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 4 + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 10 +- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 718 ++++++------- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h | 93 +- drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 3 - .../amd/display/dc/dce100/dce100_hw_sequencer.c | 49 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 16 +- .../drm/amd/display/dc/dce110/dce110_compressor.c | 4 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 175 +--- .../amd/display/dc/dce110/dce110_hw_sequencer.h | 4 + .../drm/amd/display/dc/dce110/dce110_resource.c | 16 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 24 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 20 +- .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 28 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 6 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 362 ++++--- .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 6 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 2 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 315 ++---- .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 76 +- drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 6 +- drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +- .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 63 +- .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 - .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +- .../gpu/drm/amd/display/dc/dml/soc_bounding_box.c | 79 -- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 +- drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- .../gpu/drm/amd/display/dc/inc/hw/display_clock.h | 43 +- drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- .../gpu/drm/amd/display/include/grph_object_defs.h | 46 + .../gpu/drm/amd/display/include/grph_object_id.h | 16 + .../drm/amd/display/modules/color/color_gamma.c | 8 +- drivers/gpu/drm/amd/include/amd_pcie.h | 2 + drivers/gpu/drm/amd/include/amd_shared.h | 46 +- drivers/gpu/drm/amd/include/atomfirmware.h | 5 +- drivers/gpu/drm/amd/include/dm_pp_interface.h | 37 +- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 15 +- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 100 +- .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 96 +- drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 5 + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 12 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 2 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 42 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 56 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 1055 ++++++++++++-------- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 13 + .../amd/powerplay/hwmgr/vega12_processpptables.c | 6 +- .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 7 +- .../drm/amd/powerplay/inc/vega12/smu9_driver_if.h | 23 +- drivers/gpu/drm/drm_pci.c | 58 -- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +- drivers/gpu/drm/radeon/ci_dpm.c | 20 +- drivers/gpu/drm/radeon/cik.c | 22 +- drivers/gpu/drm/radeon/r600_dpm.c | 4 +- drivers/gpu/drm/radeon/radeon.h | 4 + drivers/gpu/drm/radeon/radeon_test.c | 1 + drivers/gpu/drm/radeon/si.c | 22 +- drivers/gpu/drm/radeon/si_dpm.c | 20 +- drivers/gpu/drm/scheduler/gpu_scheduler.c | 18 +- drivers/gpu/drm/v3d/v3d_drv.c | 2 +- drivers/pci/pci.c | 2 + include/drm/drm_pci.h | 7 - include/drm/gpu_scheduler.h | 6 +- include/linux/pci.h | 3 + 137 files changed, 4229 insertions(+), 2873 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c rename drivers/gpu/drm/amd/display/{dc/dml/soc_bounding_box.h => amdgpu_dm/amdgpu_dm_debugfs.h} (72%) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/soc_bounding_box.c

1 0

[PATCH 1/3] drm: Extract __setplane_check()
by Ville Syrjala 05 Jul '18

05 Jul '18

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Pull all the error checking out from __set_plane_internal() to a helper function. We'll have another user of this soon. Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- drivers/gpu/drm/drm_plane.c | 80 +++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index df0b4ebbedbf..5c97a0131484 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -583,6 +583,52 @@ int drm_plane_check_pixel_format(struct drm_plane *plane, return 0; } +static int __setplane_check(struct drm_plane *plane, + struct drm_crtc *crtc, + struct drm_framebuffer *fb, + int32_t crtc_x, int32_t crtc_y, + uint32_t crtc_w, uint32_t crtc_h, + uint32_t src_x, uint32_t src_y, + uint32_t src_w, uint32_t src_h) +{ + int ret; + + /* Check whether this plane is usable on this CRTC */ + if (!(plane->possible_crtcs & drm_crtc_mask(crtc))) { + DRM_DEBUG_KMS("Invalid crtc for plane\n"); + return -EINVAL; + } + + /* Check whether this plane supports the fb pixel format. */ + ret = drm_plane_check_pixel_format(plane, fb->format->format, + fb->modifier); + if (ret) { + struct drm_format_name_buf format_name; + + DRM_DEBUG_KMS("Invalid pixel format %s, modifier 0x%llx\n", + drm_get_format_name(fb->format->format, + &format_name), + fb->modifier); + return ret; + } + + /* Give drivers some help against integer overflows */ + if (crtc_w > INT_MAX || + crtc_x > INT_MAX - (int32_t) crtc_w || + crtc_h > INT_MAX || + crtc_y > INT_MAX - (int32_t) crtc_h) { + DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n", + crtc_w, crtc_h, crtc_x, crtc_y); + return -ERANGE; + } + + ret = drm_framebuffer_check_src_coords(src_x, src_y, src_w, src_h, fb); + if (ret) + return ret; + + return 0; +} + /* * __setplane_internal - setplane handler for internal callers * @@ -616,37 +662,9 @@ static int __setplane_internal(struct drm_plane *plane, goto out; } - /* Check whether this plane is usable on this CRTC */ - if (!(plane->possible_crtcs & drm_crtc_mask(crtc))) { - DRM_DEBUG_KMS("Invalid crtc for plane\n"); - ret = -EINVAL; - goto out; - } - - /* Check whether this plane supports the fb pixel format. */ - ret = drm_plane_check_pixel_format(plane, fb->format->format, - fb->modifier); - if (ret) { - struct drm_format_name_buf format_name; - DRM_DEBUG_KMS("Invalid pixel format %s, modifier 0x%llx\n", - drm_get_format_name(fb->format->format, - &format_name), - fb->modifier); - goto out; - } - - /* Give drivers some help against integer overflows */ - if (crtc_w > INT_MAX || - crtc_x > INT_MAX - (int32_t) crtc_w || - crtc_h > INT_MAX || - crtc_y > INT_MAX - (int32_t) crtc_h) { - DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n", - crtc_w, crtc_h, crtc_x, crtc_y); - ret = -ERANGE; - goto out; - } - - ret = drm_framebuffer_check_src_coords(src_x, src_y, src_w, src_h, fb); + ret = __setplane_check(plane, crtc, fb, + crtc_x, crtc_y, crtc_w, crtc_h, + src_x, src_y, src_w, src_h); if (ret) goto out; -- 2.16.4

4 8

[PATCH v2] gpu: drm: v3d: use new return type vm_fault_t
by Souptick Joarder 05 Jul '18

05 Jul '18

Convert v3d_gem_fault to return vm_fault_t Instead of converting an errno into a vm_fault_t ourselves, use vmf_insert_mixed() which returns a vm_fault_t directly. Signed-off-by: Souptick Joarder <jrdr.linux(a)gmail.com> --- v2: Address Matthew's comment. Updated the changelog drivers/gpu/drm/v3d/v3d_bo.c | 28 +++++----------------------- drivers/gpu/drm/v3d/v3d_drv.h | 3 ++- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c index 7b1e2a5..54d9651 100644 --- a/drivers/gpu/drm/v3d/v3d_bo.c +++ b/drivers/gpu/drm/v3d/v3d_bo.c @@ -227,37 +227,19 @@ struct reservation_object *v3d_prime_res_obj(struct drm_gem_object *obj) vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); } -int v3d_gem_fault(struct vm_fault *vmf) +vm_fault_t v3d_gem_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *obj = vma->vm_private_data; struct v3d_bo *bo = to_v3d_bo(obj); - unsigned long pfn; + pfn_t pfn; pgoff_t pgoff; - int ret; /* We don't use vmf->pgoff since that has the fake offset: */ pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT; - pfn = page_to_pfn(bo->pages[pgoff]); - - ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV)); - - switch (ret) { - case -EAGAIN: - case 0: - case -ERESTARTSYS: - case -EINTR: - case -EBUSY: - /* - * EBUSY is ok: this just means that another thread - * already did the job. - */ - return VM_FAULT_NOPAGE; - case -ENOMEM: - return VM_FAULT_OOM; - default: - return VM_FAULT_SIGBUS; - } + pfn = __pfn_to_pfn_t(page_to_pfn(bo->pages[pgoff]), PFN_DEV); + + return vmf_insert_mixed(vma, vmf->address, pfn); } int v3d_mmap(struct file *filp, struct vm_area_struct *vma) diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index a043ac3..09aa634 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -2,6 +2,7 @@ /* Copyright (C) 2015-2018 Broadcom */ #include <linux/reservation.h> +#include <linux/mm_types.h> #include <drm/drmP.h> #include <drm/drm_encoder.h> #include <drm/drm_gem.h> @@ -248,7 +249,7 @@ int v3d_mmap_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); int v3d_get_bo_offset_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); -int v3d_gem_fault(struct vm_fault *vmf); +vm_fault_t v3d_gem_fault(struct vm_fault *vmf); int v3d_mmap(struct file *filp, struct vm_area_struct *vma); struct reservation_object *v3d_prime_res_obj(struct drm_gem_object *obj); int v3d_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); -- 1.9.1

3 2

[PATCH V2] drm/vkms: Add vblank events simulated by hrtimers
by Rodrigo Siqueira 05 Jul '18

05 Jul '18

This commit adds regular vblank events simulated through hrtimers, which is a feature required by VKMS to mimic real hardware. Notice that keeping the periodicity as close as possible to the one specified in user space represents a vital constraint. In this sense, the callback function implements an algorithm based on module operations that avoids the accumulation of errors. Assuming we begin operating at timestamp 0, every event should happen at timestamps that are multiples of the requested period, i.e., current_timestamp % period == 0. Since we do *not* generally start at timestamp 0, we calculate the modulus of this initial timestamp and try to make all following events happen when current_timestamp % period == initial_timestamp % period (variables “current_offset” and “base_offset”). We do this by measuring the difference between them at each iteration and adjusting the next waiting period accordingly. Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo(a)gmail.com> --- drivers/gpu/drm/vkms/vkms_crtc.c | 99 +++++++++++++++++++++++++++++++- drivers/gpu/drm/vkms/vkms_drv.c | 9 +++ drivers/gpu/drm/vkms/vkms_drv.h | 20 +++++++ 3 files changed, 126 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index 84cc05506b09..35d39d25df34 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -10,6 +10,83 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) +{ + struct vkms_output *output = container_of(timer, struct vkms_output, + vblank_hrtimer); + struct drm_crtc *crtc = &output->crtc; + ktime_t new_period, current_timestamp, diff_times, current_offset, + candidate_expires; + unsigned long flags; + int ret_overrun; + bool ret; + + current_timestamp = ktime_get(); + current_offset = current_timestamp % output->period_ns; + diff_times = ktime_sub(current_offset, output->base_offset); + candidate_expires = ktime_sub(current_timestamp, diff_times); + if (candidate_expires > output->expires) + output->expires = candidate_expires; + + ret = drm_crtc_handle_vblank(crtc); + if (!ret) + DRM_ERROR("vkms failure on handling vblank"); + + if (output->event) { + spin_lock_irqsave(&crtc->dev->event_lock, flags); + drm_crtc_send_vblank_event(crtc, output->event); + output->event = NULL; + spin_unlock_irqrestore(&crtc->dev->event_lock, flags); + drm_crtc_vblank_put(crtc); + } + + current_timestamp = ktime_get(); + current_offset = current_timestamp % output->period_ns; + diff_times = ktime_sub(output->base_offset, current_offset); + new_period = ktime_add(output->period_ns, diff_times); + output->expires = ktime_add(current_timestamp, new_period); + ret_overrun = hrtimer_forward_now(&output->vblank_hrtimer, new_period); + + return HRTIMER_RESTART; +} + +static int vkms_enable_vblank(struct drm_crtc *crtc) +{ + struct vkms_output *out = drm_crtc_to_vkms_output(crtc); + unsigned long period = 1000 * crtc->mode.htotal * crtc->mode.vtotal / + crtc->mode.clock; + ktime_t current_timestamp; + + hrtimer_init(&out->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + out->vblank_hrtimer.function = &vkms_vblank_simulate; + out->period_ns = ktime_set(0, period * US_TO_NS); + current_timestamp = ktime_get(); + out->base_offset = current_timestamp % out->period_ns; + out->expires = ktime_add(current_timestamp, out->period_ns); + hrtimer_start(&out->vblank_hrtimer, out->period_ns, HRTIMER_MODE_REL); + + return 0; +} + +static void vkms_disable_vblank(struct drm_crtc *crtc) +{ + struct vkms_output *out = drm_crtc_to_vkms_output(crtc); + + hrtimer_cancel(&out->vblank_hrtimer); +} + +bool vkms_get_vblank_timestamp(struct drm_device *dev, unsigned int pipe, + int *max_error, ktime_t *vblank_time, + bool in_vblank_irq) +{ + struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev); + struct vkms_output *output = &vkmsdev->output; + + *vblank_time = output->expires; + + return true; +} + static const struct drm_crtc_funcs vkms_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = drm_crtc_cleanup, @@ -17,6 +94,8 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = { .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = vkms_enable_vblank, + .disable_vblank = vkms_disable_vblank, }; static int vkms_crtc_atomic_check(struct drm_crtc *crtc, @@ -28,11 +107,27 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc, static void vkms_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { + drm_crtc_vblank_on(crtc); +} + +static void vkms_crtc_atomic_begin(struct drm_crtc *crtc, + struct drm_crtc_state *old_s) +{ + struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc); + + if (crtc->state->event) { + crtc->state->event->pipe = drm_crtc_index(crtc); + WARN_ON(drm_crtc_vblank_get(crtc) != 0); + + vkms_output->event = crtc->state->event; + crtc->state->event = NULL; + } } static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = { - .atomic_check = vkms_crtc_atomic_check, - .atomic_enable = vkms_crtc_atomic_enable, + .atomic_check = vkms_crtc_atomic_check, + .atomic_enable = vkms_crtc_atomic_enable, + .atomic_begin = vkms_crtc_atomic_begin, }; int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index fe93f8c17997..6368048c6e54 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -55,6 +55,7 @@ static struct drm_driver vkms_driver = { .dumb_create = vkms_dumb_create, .dumb_map_offset = vkms_dumb_map, .gem_vm_ops = &vkms_gem_vm_ops, + .get_vblank_timestamp = vkms_get_vblank_timestamp, .name = DRIVER_NAME, .desc = DRIVER_DESC, @@ -102,6 +103,14 @@ static int __init vkms_init(void) goto out_fini; } + vkms_device->drm.irq_enabled = true; + + ret = drm_vblank_init(&vkms_device->drm, 1); + if (ret) { + DRM_ERROR("Failed to vblank\n"); + goto out_fini; + } + ret = vkms_modeset_init(vkms_device); if (ret) goto out_unregister; diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 76f1720f81a5..b69a223bdfe6 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -5,6 +5,7 @@ #include <drm/drm.h> #include <drm/drm_gem.h> #include <drm/drm_encoder.h> +#include <linux/hrtimer.h> #define XRES_MIN 32 #define YRES_MIN 32 @@ -15,6 +16,9 @@ #define XRES_MAX 8192 #define YRES_MAX 8192 +#define DEFAULT_VBLANK_NS 16666666 +#define US_TO_NS 1000 + static const u32 vkms_formats[] = { DRM_FORMAT_XRGB8888, }; @@ -23,6 +27,11 @@ struct vkms_output { struct drm_crtc crtc; struct drm_encoder encoder; struct drm_connector connector; + struct hrtimer vblank_hrtimer; + ktime_t period_ns; + ktime_t base_offset; + ktime_t expires; + struct drm_pending_vblank_event *event; }; struct vkms_device { @@ -37,9 +46,20 @@ struct vkms_gem_object { struct page **pages; }; +#define drm_crtc_to_vkms_output(target) \ + container_of(target, struct vkms_output, crtc) + +#define drm_device_to_vkms_device(target) \ + container_of(target, struct vkms_device, drm) + +/* CRTC */ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, struct drm_plane *primary, struct drm_plane *cursor); +bool vkms_get_vblank_timestamp(struct drm_device *dev, unsigned int pipe, + int *max_error, ktime_t *vblank_time, + bool in_vblank_irq); + int vkms_output_init(struct vkms_device *vkmsdev); struct drm_plane *vkms_plane_init(struct vkms_device *vkmsdev); -- 2.18.0

3 6

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2018