dri-devel January 2017

dri-devel@lists.freedesktop.org

240 participants
1484 discussions

[PATCH 1/2] drm: Wrap the check for atomic_commit implementation
by Dhinakaran Pandiyan 03 Jan '17

03 Jan '17

This check is useful for drivers that do not have DRIVER_ATOMIC set but have atomic modesetting internally implemented. Wrap the check into a function since this is used in many places and as a bonus, the function name helps to document what the check is for. Suggested-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Ben Skeggs <bskeggs(a)redhat.com> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan(a)intel.com> --- drivers/gpu/drm/drm_fb_helper.c | 6 +++--- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_display.c | 6 +++--- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- include/drm/drmP.h | 5 +++++ 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 145d55f..730342c 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -405,7 +405,7 @@ static int restore_fbdev_mode(struct drm_fb_helper *fb_helper) drm_warn_on_modeset_not_all_locked(dev); - if (dev->mode_config.funcs->atomic_commit) + if (drm_drv_uses_atomic_modeset(dev)) return restore_fbdev_mode_atomic(fb_helper); drm_for_each_plane(plane, dev) { @@ -1444,7 +1444,7 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var, return -EBUSY; } - if (dev->mode_config.funcs->atomic_commit) { + if (drm_drv_uses_atomic_modeset(dev)) { ret = pan_display_atomic(var, info); goto unlock; } @@ -2060,7 +2060,7 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, * NULL we fallback to the default drm_atomic_helper_best_encoder() * helper. */ - if (fb_helper->dev->mode_config.funcs->atomic_commit && + if (drm_drv_uses_atomic_modeset(fb_helper->dev) && !connector_funcs->best_encoder) encoder = drm_atomic_helper_best_encoder(connector); else diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 947c200..c4cc21a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -769,7 +769,7 @@ nouveau_connector_set_property(struct drm_connector *connector, struct drm_encoder *encoder = to_drm_encoder(nv_encoder); int ret; - if (connector->dev->mode_config.funcs->atomic_commit) + if (drm_drv_uses_atomic_modeset(connector->dev)) return drm_atomic_helper_connector_set_property(connector, property, value); ret = connector->funcs->atomic_set_property(&nv_connector->base, @@ -1074,7 +1074,7 @@ nouveau_connector_helper_funcs = { static int nouveau_connector_dpms(struct drm_connector *connector, int mode) { - if (connector->dev->mode_config.funcs->atomic_commit) + if (drm_drv_uses_atomic_modeset(connector->dev)) return drm_atomic_helper_connector_dpms(connector, mode); return drm_helper_connector_dpms(connector, mode); } diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index c5cf888..add353e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -162,7 +162,7 @@ nouveau_display_vblstamp(struct drm_device *dev, unsigned int pipe, list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { if (nouveau_crtc(crtc)->index == pipe) { struct drm_display_mode *mode; - if (dev->mode_config.funcs->atomic_commit) + if (drm_drv_uses_atomic_modeset(dev)) mode = &crtc->state->adjusted_mode; else mode = &crtc->hwmode; @@ -738,7 +738,7 @@ nouveau_display_suspend(struct drm_device *dev, bool runtime) struct nouveau_display *disp = nouveau_display(dev); struct drm_crtc *crtc; - if (dev->mode_config.funcs->atomic_commit) { + if (drm_drv_uses_atomic_modeset(dev)) { if (!runtime) { disp->suspend = nouveau_atomic_suspend(dev); if (IS_ERR(disp->suspend)) { @@ -784,7 +784,7 @@ nouveau_display_resume(struct drm_device *dev, bool runtime) struct drm_crtc *crtc; int ret; - if (dev->mode_config.funcs->atomic_commit) { + if (drm_drv_uses_atomic_modeset(dev)) { nouveau_display_init(dev); if (disp->suspend) { drm_atomic_helper_resume(dev, disp->suspend); diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 5600f6c..ad722f14 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -524,7 +524,7 @@ nouveau_fbcon_init(struct drm_device *dev) preferred_bpp = 32; /* disable all the possible outputs/crtcs before entering KMS mode */ - if (!dev->mode_config.funcs->atomic_commit) + if (!drm_drv_uses_atomic_modeset(dev)) drm_helper_disable_unused_functions(dev); ret = drm_fb_helper_initial_config(&fbcon->helper, preferred_bpp); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index a9cfd33..247acba 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -647,6 +647,11 @@ static __inline__ int drm_core_check_feature(struct drm_device *dev, return ((dev->driver->driver_features & feature) ? 1 : 0); } +static inline int drm_drv_uses_atomic_modeset(struct drm_device *dev) +{ + return dev->mode_config.funcs->atomic_commit ? 1 : 0; +} + static inline void drm_device_set_unplugged(struct drm_device *dev) { smp_wmb(); -- 2.7.4

7 12

[Bug 98874] Desktop suddenly freezes, login via ssh possible, no error messages, unable to power off
by bugzilla-daemon＠freedesktop.org 03 Jan '17

03 Jan '17

https://bugs.freedesktop.org/show_bug.cgi?id=98874 --- Comment #12 from Matthias Nagel <matthias.h.nagel(a)gmail.com> --- Created attachment 128728 --> https://bugs.freedesktop.org/attachment.cgi?id=128728&action=edit 4th dump 2017-01-03 Anybody working on this? Anything I can help to push this one forward? I still see this error and I can nearly reliably trigger it. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[PATCH v2 0/3] video/sti/cec: add HPD notifier support
by Benjamin Gaignard 03 Jan '17

03 Jan '17

This patch series following what Hans is doing on exynos to support hotplug detect notifier code. It add support of HPD in sti_hdmi drm driver and stih-cec driver which move out of staging. Those patches should be applied on top of Hans branch exynos4-cec. I have tested hdmi notifier by pluging/unpluging HDMI cable and check the value of the physical address with "cec-ctl --tuner". "cec-compliance -A" is also functional. version 2: - use HPD notifier instead of HDMI notifier - move stih-cec out of staging - rebase code on top of git://linuxtv.org/hverkuil/media_tree.git exynos4-cec branch - split DT modifications in a separate patch Regards, Benjamin Benjamin Gaignard (3): sti: hdmi: add HPD notifier support stih-cec: add HPD notifier support arm: sti: update sti-cec for HPD notifier support .../devicetree/bindings/media/stih-cec.txt | 2 + arch/arm/boot/dts/stih407-family.dtsi | 12 - arch/arm/boot/dts/stih410.dtsi | 13 + drivers/gpu/drm/sti/Kconfig | 1 + drivers/gpu/drm/sti/sti_hdmi.c | 14 + drivers/gpu/drm/sti/sti_hdmi.h | 3 + drivers/media/platform/Kconfig | 10 + drivers/media/platform/Makefile | 1 + drivers/media/platform/sti/cec/Makefile | 1 + drivers/media/platform/sti/cec/stih-cec.c | 404 +++++++++++++++++++++ drivers/staging/media/Kconfig | 2 - drivers/staging/media/Makefile | 1 - drivers/staging/media/st-cec/Kconfig | 8 - drivers/staging/media/st-cec/Makefile | 1 - drivers/staging/media/st-cec/TODO | 7 - drivers/staging/media/st-cec/stih-cec.c | 379 ------------------- 16 files changed, 449 insertions(+), 410 deletions(-) create mode 100644 drivers/media/platform/sti/cec/Makefile create mode 100644 drivers/media/platform/sti/cec/stih-cec.c delete mode 100644 drivers/staging/media/st-cec/Kconfig delete mode 100644 drivers/staging/media/st-cec/Makefile delete mode 100644 drivers/staging/media/st-cec/TODO delete mode 100644 drivers/staging/media/st-cec/stih-cec.c -- 1.9.1

1 3

[PATCH 0/5] drm/ttm, amdgpu: fix crashes due to shadow page table evictions
by Nicolai Hähnle 03 Jan '17

03 Jan '17

Fix a bunch of related crashes in amdgpu that occur when shadow page tables are kicked out of the GART. One of the issues was that during command submission, we rely on a device-global evictions counter to skip some of the work of page-table validation. The driver was never informed of evictions from GART, so this series adds an evict parameter to ttm_bo_driver::move_notify. There's still the evict parameter on ttm_bo_driver::move which is used by radeon and nouveau for the call to ttm_bo_move_accel_cleanup. The 'evict' parameter there should probably be more accurately called 'wait', but unless that wait can always be avoided, the evict parameter on ttm_bo_driver::move needs to stay. Please review! Nicolai --- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 20 ++++++++++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 12 +++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ---- drivers/gpu/drm/nouveau/nouveau_bo.c | 3 ++- drivers/gpu/drm/qxl/qxl_ttm.c | 1 + drivers/gpu/drm/radeon/radeon_object.c | 1 + drivers/gpu/drm/radeon/radeon_object.h | 1 + drivers/gpu/drm/ttm/ttm_bo.c | 8 ++++---- drivers/gpu/drm/virtio/virtgpu_ttm.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 1 + include/drm/ttm/ttm_bo_driver.h | 10 ++++++++-- 12 files changed, 49 insertions(+), 18 deletions(-)

3 14

[Bug 98914] mesa-vdpau-drivers: breaks vdpau for mpeg2video
by bugzilla-daemon＠freedesktop.org 03 Jan '17

03 Jan '17

https://bugs.freedesktop.org/show_bug.cgi?id=98914 Bug ID: 98914 Summary: mesa-vdpau-drivers: breaks vdpau for mpeg2video Product: Mesa Version: 13.0 Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r600 Assignee: dri-devel(a)lists.freedesktop.org Reporter: jvpeetz(a)web.de QA Contact: dri-devel(a)lists.freedesktop.org Created attachment 128286 --> https://bugs.freedesktop.org/attachment.cgi?id=128286&action=edit X log file On my AMD CPU/AMD GPU hybrid HP Pavilion notebook under X with radeon video driver the vdpau hardware video output for the mpeg2video codec broke beginning with Mesa 13.0. Such videos are totally scrambled on the screen now. Codec h264 is still working. This is a debian testing/sid system with custom kernel 4.8.11. -- You are receiving this mail because: You are the assignee for the bug.

1 13

[PATCH] ARM: davinci_all_defconfig: enable dumb vga-dac drm bridge
by Bartosz Golaszewski 03 Jan '17

03 Jan '17

This enables the dumb-vga-dac driver by default for davinci boards. The driver is needed for tilcdc support on da850-lcdk board. Signed-off-by: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> --- arch/arm/configs/davinci_all_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index b5e978f..ab1bf18 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -127,6 +127,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_TPS6507X=y CONFIG_DRM=m CONFIG_DRM_TILCDC=m +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_DUMB_VGA_DAC=m CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DA8XX=y -- 2.9.3

2 2

linux-next: manual merge of the drm-intel-fixes tree with the vfio-fixes tree
by Stephen Rothwell 03 Jan '17

03 Jan '17

Hi all, Today's linux-next merge of the drm-intel-fixes tree got a conflict in: drivers/gpu/drm/i915/gvt/kvmgt.c between commit: 99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract interfaces") from the vfio-fixes tree and commit: 364fb6b789ff ("drm/i915/gvt/kvmgt: prevent double-release of vgpu") from the drm-intel-fixes tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gvt/kvmgt.c index f8021a01df63,934963970288..000000000000 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@@ -497,10 -500,19 +500,19 @@@ static int intel_vgpu_open(struct mdev_ goto undo_iommu; } - return kvmgt_guest_init(mdev); + ret = kvmgt_guest_init(mdev); + if (ret) + goto undo_group; + + atomic_set(&vgpu->vdev.released, 0); + return ret; + + undo_group: + vfio_unregister_notifier(&mdev->dev, VFIO_GROUP_NOTIFY, + &vgpu->vdev.group_notifier); undo_iommu: - vfio_unregister_notifier(&mdev->dev, VFIO_IOMMU_NOTIFY, + vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY, &vgpu->vdev.iommu_notifier); out: return ret; @@@ -513,10 -526,16 +526,16 @@@ static void __intel_vgpu_release(struc if (!handle_valid(vgpu->handle)) return; - vfio_unregister_notifier(mdev_dev(vgpu->vdev.mdev), VFIO_IOMMU_NOTIFY, + if (atomic_cmpxchg(&vgpu->vdev.released, 0, 1)) + return; + - ret = vfio_unregister_notifier(&vgpu->vdev.mdev->dev, VFIO_IOMMU_NOTIFY, ++ ret = vfio_unregister_notifier(mdev_dev(vgpu->vdev.mdev), VFIO_IOMMU_NOTIFY, &vgpu->vdev.iommu_notifier); - vfio_unregister_notifier(mdev_dev(vgpu->vdev.mdev), VFIO_GROUP_NOTIFY, + WARN(ret, "vfio_unregister_notifier for iommu failed: %d\n", ret); + - ret = vfio_unregister_notifier(&vgpu->vdev.mdev->dev, VFIO_GROUP_NOTIFY, ++ ret = vfio_unregister_notifier(mdev_dev(vgpu->vdev.mdev), VFIO_GROUP_NOTIFY, &vgpu->vdev.group_notifier); + WARN(ret, "vfio_unregister_notifier for group failed: %d\n", ret); info = (struct kvmgt_guest_info *)vgpu->handle; kvmgt_guest_exit(info);

2 1

[PATCH v7 0/5] ARM: dts: da850: tilcdc related DT changes
by Bartosz Golaszewski 03 Jan '17

03 Jan '17

This series contains the last DT changes required for LCDC support on da850-lcdk. The first one adds the dumb-vga-dac nodes, the second limits the maximum pixel clock rate. v1 -> v2: - drop patch 3/3 (already merged) - use max-pixelclock instead of max-bandwidth for display mode limiting v2 -> v3: - make the commit message in patch [2/2] more detailed - move the max-pixelclock property to da850.dtsi as the limit affects all da850-based boards v3 -> v4: - remove the input port from the display node - move the display ports node to da850-lcdk.dts - rename the vga_bridge node to vga-bridge - move the LCDC pins to the LCDC node (from the vga bridge node) v4 -> v5: - rename the display label to lcdc - instead of using the 'dumb-vga-dac' compatible, add bindings for ti,ths8135 and use it as the vga-bridge node compatible v5 -> v6: - drop the endpoint numbers for nodes with single endpoints - split patch 2/4 from v5 into two separate patches: one adding DT bindings and one adding actual support for ths8135 v6 -> v7: - simplified patch 4/5 by removing unnecessary properties from ports and endpoints nodes Bartosz Golaszewski (5): ARM: dts: da850: rename the display node label drm: bridge: add DT bindings for TI ths8135 drm: bridge: add support for TI ths8135 ARM: dts: da850-lcdk: add the vga-bridge node ARM: dts: da850: specify the maximum pixel clock rate for tilcdc .../bindings/display/bridge/ti,ths8135.txt | 46 +++++++++++++++++++ arch/arm/boot/dts/da850-lcdk.dts | 51 ++++++++++++++++++++++ arch/arm/boot/dts/da850.dtsi | 3 +- drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + 4 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt -- 2.9.3

4 15

linux-next: manual merge of the drm-misc tree with the drm-intel tree
by Stephen Rothwell 03 Jan '17

03 Jan '17

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_pm.c between commit: e339d67eeb02 ("drm/i915: Pass crtc state to vlv_compute_wm_level()") from the drm-intel tree and commit: 353c85989963 ("drm: Replace drm_format_plane_cpp() with fb->format->cpp[]") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_pm.c index 4b12637e2084,ce03d9d5aca6..000000000000 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@@ -991,13 -960,13 +991,13 @@@ static uint16_t vlv_compute_wm_level(co if (dev_priv->wm.pri_latency[level] == 0) return USHRT_MAX; - if (!state->base.visible) + if (!plane_state->base.visible) return 0; - cpp = drm_format_plane_cpp(plane_state->base.fb->pixel_format, 0); - cpp = state->base.fb->format->cpp[0]; - clock = crtc->config->base.adjusted_mode.crtc_clock; - htotal = crtc->config->base.adjusted_mode.crtc_htotal; - width = crtc->config->pipe_src_w; ++ cpp = plane_state->base.fb->format->cpp[0]; + clock = adjusted_mode->crtc_clock; + htotal = adjusted_mode->crtc_htotal; + width = crtc_state->pipe_src_w; if (WARN_ON(htotal == 0)) htotal = 1;

1 0

linux-next: manual merge of the drm-misc tree with the drm-intel tree
by Stephen Rothwell 03 Jan '17

03 Jan '17

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_overlay.c between commit: 39ccc04e7435 ("drm/i915: Use primary plane->state for overlay ckey setup") from the drm-intel tree and commits: 1967b34d5afb ("drm/i915: Add local 'fb' variables") 438b74a5497c ("drm: Nuke fb->pixel_format") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_overlay.c index c95362327ffb,568d194435fd..000000000000 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@@ -722,10 -666,8 +722,10 @@@ static void update_colorkey(struct inte if (overlay->color_key_enabled) flags |= DST_KEY_ENABLE; - switch (fb->format->format) { + if (state->base.visible) - format = state->base.fb->pixel_format; ++ format = state->base.fb->format->format; + + switch (format) { case DRM_FORMAT_C8: key = 0; flags |= CLK_RGB8I_MASK;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2017