dri-devel May 2015

dri-devel@lists.freedesktop.org

191 participants
1132 discussions

[GIT PULL] tilcdc DRM refactoring
by Jyri Sarha 27 May '15

27 May '15

David, Please pull the contents of "Use DRM component API in tilcdc to connect to tda998x" patch series[1] from: https://github.com/jsarha/linux.git linux-4.1.0-rc5-tilcdc-refactor The commits have been rebased on top of v4.1-rc5 mainline tag and they are ready for taking. The commits have been acked by Tomi Valkeinen. Best regards and thanks, Jyri [1] http://lists.freedesktop.org/archives/dri-devel/2015-May/083619.html ----------------------------------------------------------- Jyri Sarha (6): drm/tilcdc: Fix module unloading drm/tilcdc: Remove tilcdc slave support for tda998x driver drm/tilcdc: Add support for external tda998x encoder drm/tilcdc: Add DRM_TILCDC_SLAVE_COMPAT for ti,tilcdc,slave binding support drm/tilcdc: Force building of DRM_TILCDC_SLAVE_COMPAT ARM: dts: am335x-boneblack: Use new binding for HDMI Tomi Valkeinen (1): drm/tilcdc: use pm_runtime_irq_safe() .../devicetree/bindings/drm/tilcdc/slave.txt | 18 - .../devicetree/bindings/drm/tilcdc/tilcdc.txt | 27 ++ arch/arm/boot/dts/am335x-boneblack.dts | 20 +- drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/tilcdc/Kconfig | 12 + drivers/gpu/drm/tilcdc/Makefile | 5 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 36 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 99 +++-- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 6 +- drivers/gpu/drm/tilcdc/tilcdc_external.c | 166 +++++++++ drivers/gpu/drm/tilcdc/tilcdc_external.h | 25 ++ drivers/gpu/drm/tilcdc/tilcdc_slave.c | 411 --------------------- drivers/gpu/drm/tilcdc/tilcdc_slave.h | 26 -- drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 270 ++++++++++++++ drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts | 72 ++++ drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h | 25 ++ 16 files changed, 730 insertions(+), 490 deletions(-) delete mode 100644 Documentation/devicetree/bindings/drm/tilcdc/slave.txt create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_external.c create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_external.h delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave.c delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave.h create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h

1 1

[PULL] topic/drm-fixes
by Jani Nikula 27 May '15

27 May '15

Hi Dave, here's a drm regression fix for drivers only partially converted to atomic. BR, Jani. The following changes since commit 030bbdbf4c833bc69f502eae58498bc5572db736: Linux 4.1-rc3 (2015-05-10 15:12:29 -0700) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/topic/drm-fixes-2015-05-27 for you to fetch changes up to 2e7f43c41c042d6fed4d67aceeaae32d8f102e98: drm/plane-helper: Adapt cursor hack to transitional helpers (2015-05-22 08:48:08 +0300) ---------------------------------------------------------------- Daniel Vetter (1): drm/plane-helper: Adapt cursor hack to transitional helpers drivers/gpu/drm/drm_plane_helper.c | 3 +++ 1 file changed, 3 insertions(+) -- Jani Nikula, Intel Open Source Technology Center

1 0

2 questions about git and merging
by Rainer Koenig 27 May '15

27 May '15

Hi, a week ago I experienced problems on the skylake platform and got the adivce to try out the drm-intel-nightly branch. I tried and it was a success. So after the initial "git clone" of the tree I tried to keep updated by doing a "git pull" from time to time, but what's really strange is that I got merge conflicts, usually in the file integration-manifest, but sometimes also in source files. That's looks somewhat weird because I didn't touch any of the files in the tree and I thought that after cloning a frequent "git pull" will keep me up to date without the need to resolve merge conflicts. What is wrong with my thought? What did I do wrong? Second, I pulled the "Linus"-tree today and found some log entries that said Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes and Merge tag 'drm-intel-fixes-2015-05-21' of git://anongit.freedesktop.org/drm-intel into drm-fixes So I assumed, that the fix I proved to work one week ago now should also be available in the "vanilla" tree. So I compiled that on my test machine and got my bug back. :-( So my other question is, how do fixes from drm-intel-nightly find their weay into the "vanilla" linux tree? Is there some sort of process description. Thanks for any explanation Rainer -- Dipl.-Inf. (FH) Rainer Koenig Project Manager Linux Clients Dept. PDG WPS R&D SW OSE Fujitsu Technology Solutions Bürgermeister-Ullrich-Str. 100 86199 Augsburg Germany Telephone: +49-821-804-3321 Telefax: +49-821-804-2131 Mail: mailto:Rainer.Koenig@ts.fujitsu.com Internet ts.fujtsu.com Company Details ts.fujitsu.com/imprint.html

4 7

[PATCH v6 0/7] Use DRM component API in tilcdc to connect to tda998x
by Jyri Sarha 27 May '15

27 May '15

Like the last time, for all that I know this should be good for taking :). Changes since v5 * Move DRM_TILCDC_SLAVE_COMPAT after DRM_TILCDC in .../drm/tilcdc/Kconfig * Add "drm/tilcdc: use pm_runtime_irq_safe()"-patch Changes since v4 * Rebased on top linux-4.1-rc2 * Drop "drm/tilcdc: Decrement refcount of ep-node from of_graph_get_next_..." * Make connector_funcs const in struct tilcdc_drm_private because struct drm_connector's helper_private has been qualified as const in linux-4.1 * Check if a subcomponent has already triggered the unloading. - Fixes an oops if the external encoder is unloaded first and tilcdc after * Add comment to explain hijacking of external drm connectors helper hijacking Changes since v3 version of the patch-set: * drm/tilcdc: Add support for external tda998x encoder - Hijack external connectors helper functions - Remove select of nonexistent DRM_TILCDC_INIT in tilcdc Kconfig - Correct author mail address to tilcdc_exteral.h * drm/tilcdc: Add DRM_TILCDC_SLAVE_COMPAT for ti,tilcdc,slave binding - Add a header file for tilcdc_slave_compat.dtb symbol declarations Changes since v2 version of the patch-set: - use obj-y in Makefle for tilcdc subdir in: "drm/tilcdc: Force building of DRM_TILCDC_SLAVE_COMPAT" - move to last: "drm/tilcdc: Decrement refcount of ep-node from of_graph_get_next_endpoint" Changes since first version of the patch-set: - Rename DRM_TILCDC_INIT to DRM_TILCDC_SLAVE_COMPAT and make it visible - Add separate: drm/tilcdc: Decrement refcount of ep-node from of_graph_get_next_endpoint - Reduce info-level spam - Use component_master_add_with_match() - Be more explicit about tda998x being the only supported external encoder Remove tilcdc slave support and connect to tda998x trough its component DRM API. For dtb backward compatibility the code creates at boot time a DT overlay based on the earlier binding. The overlay conforms to the new graph based binding. The "drm/tilcdc: Decrement refcount of ep-node from of_graph_get_next_endpoint" should probably not be merged. The "of: Decrement refcount of previous endpoint in of_graph_get_next_endpoint" is eventually going to be merged and before that leaking of two of-node refcount increments each time the module is loaded is not that serious. The of-nodes live forever anyway. The merge of the dts patch can be delayed until the next merger window, when the other patches are already in. The DRM_TILCDC_SLAVE_COMPAT should keep the bbb HDMI operational until then. The first patch is just a bugfix and can be applied or dropped independently. Jyri Sarha (6): drm/tilcdc: Fix module unloading drm/tilcdc: Remove tilcdc slave support for tda998x driver drm/tilcdc: Add support for external tda998x encoder drm/tilcdc: Add DRM_TILCDC_SLAVE_COMPAT for ti,tilcdc,slave binding support drm/tilcdc: Force building of DRM_TILCDC_SLAVE_COMPAT ARM: dts: am335x-boneblack: Use new binding for HDMI Tomi Valkeinen (1): drm/tilcdc: use pm_runtime_irq_safe() .../devicetree/bindings/drm/tilcdc/slave.txt | 18 - .../devicetree/bindings/drm/tilcdc/tilcdc.txt | 27 ++ arch/arm/boot/dts/am335x-boneblack.dts | 20 +- drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/tilcdc/Kconfig | 12 + drivers/gpu/drm/tilcdc/Makefile | 5 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 36 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 99 +++-- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 6 +- drivers/gpu/drm/tilcdc/tilcdc_external.c | 166 +++++++++ drivers/gpu/drm/tilcdc/tilcdc_external.h | 25 ++ drivers/gpu/drm/tilcdc/tilcdc_slave.c | 411 --------------------- drivers/gpu/drm/tilcdc/tilcdc_slave.h | 26 -- drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 270 ++++++++++++++ drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts | 72 ++++ drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h | 25 ++ 16 files changed, 730 insertions(+), 490 deletions(-) delete mode 100644 Documentation/devicetree/bindings/drm/tilcdc/slave.txt create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_external.c create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_external.h delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave.c delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave.h create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h -- 1.9.1

1 7

[PATCH v6 00/12] drm/exynos: atomic modesetting support
by Gustavo Padovan 27 May '15

27 May '15

From: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> Hi, Here goes the full support for atomic modesetting on exynos. I've split the patches in the various phases of atomic support. v2: fixes comments by Joonyoung - remove unused var in patch 09 - use ->disable instead of outdated ->dpms in hdmi code - remove WARN_ON from crtc enable/disable v3: fixes comment by Joonyoung - move the removal of drm_helper_disable_unused_functions() to separated patch v4: add patches that remove unnecessary calls to disable_plane() v5: fixes NULL CRTC crash on planes updates (reported by Inki and Tobias) v6: rebase on latest exynos_drm_next Gustavo Padovan (12): drm/exynos: atomic phase 1: use drm_plane_helper_update() drm/exynos: atomic phase 1: use drm_plane_helper_disable() drm/exynos: atomic phase 1: add .mode_set_nofb() callback drm/exynos: atomic phase 2: wire up state reset(), duplicate() and destroy() drm/exynos: atomic phase 2: keep track of framebuffer pointer drm/exynos: atomic phase 3: atomic updates of planes drm/exynos: atomic phase 3: use atomic .set_config helper drm/exynos: atomic phase 3: convert page flips drm/exynos: remove exported functions from exynos_drm_plane drm/exynos: don't disable unused functions at init drm/exynos: atomic dpms support drm/exynos: remove unnecessary calls to disable_plane() drivers/gpu/drm/bridge/ps8622.c | 6 +- drivers/gpu/drm/bridge/ptn3460.c | 6 +- drivers/gpu/drm/exynos/exynos_dp_core.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 215 ++++++++-------------------- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 + drivers/gpu/drm/exynos/exynos_drm_drv.h | 4 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 35 +---- drivers/gpu/drm/exynos/exynos_drm_fb.c | 12 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 3 - drivers/gpu/drm/exynos/exynos_drm_plane.c | 120 +++++++++------- drivers/gpu/drm/exynos/exynos_drm_plane.h | 11 -- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 6 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 10 +- 15 files changed, 184 insertions(+), 264 deletions(-) -- 2.1.0

4 25

[PATCH v2 0/3] drm_of_encoder_active_endpoint helpers
by Philipp Zabel 27 May '15

27 May '15

Hi, this patch factors out the mostly identical imx_drm_encoder_get_mux_id and rockchip_drm_encoder_get_mux_id functions into a common helper to parse the active endpoint and two inline functions to return its id or port id. All prerequisites are now upstream. I'd like to get an Acked-by from the Rockchip developers and then to queue this series through imx-drm. Changes since v1: - Added missing struct drm_encoder declaration to drm_of.h - Rebased onto v4.1-rc2 regards Philipp Philipp Zabel (3): drm: add drm_of_encoder_active_endpoint helpers drm/imx: remove imx_drm_encoder_get_mux_id drm/rockchip: remove rockchip_drm_encoder_get_mux_id drivers/gpu/drm/drm_of.c | 34 +++++++++++++++++++++++++++++ drivers/gpu/drm/imx/dw_hdmi-imx.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 30 ------------------------- drivers/gpu/drm/imx/imx-drm.h | 2 -- drivers/gpu/drm/imx/imx-ldb.c | 4 ++-- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 30 ------------------------- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 -- include/drm/drm_of.h | 33 ++++++++++++++++++++++++++++ 9 files changed, 71 insertions(+), 68 deletions(-) -- 2.1.4

1 4

[PATCH v3.18-rc3] drm: msm: Allow exported dma-bufs to be mapped
by Daniel Thompson 27 May '15

27 May '15

Currently msm does not implement gem_prime_mmap. Without this it is not possible to draw onto a dma-buf from another process (making its very hard to implement the Android rendering model). Implementing this mostly just providing some boilerplate code. However in addition to providing the implementation of mmap itself we must also interfere with the flags during the export. Without this the mmap() will fail the permission checks early in the syscall handling and msm_gem_prime_mmap() will never be called. Signed-off-by: Daniel Thompson <daniel.thompson(a)linaro.org> --- Notes: I've tested this both with a rather hacked about Android userspace and with a fairly small test case run from debian. Both currently use dumb buffers. Thanks to Benjamin for his help in finding this bit of code. drivers/gpu/drm/msm/msm_drv.c | 3 ++- drivers/gpu/drm/msm/msm_drv.h | 5 +++++ drivers/gpu/drm/msm/msm_gem_prime.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index b67ef5985125..f0d77ee482a5 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -824,7 +824,7 @@ static struct drm_driver msm_driver = { .dumb_destroy = drm_gem_dumb_destroy, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = drm_gem_prime_export, + .gem_prime_export = msm_gem_prime_export, .gem_prime_import = drm_gem_prime_import, .gem_prime_pin = msm_gem_prime_pin, .gem_prime_unpin = msm_gem_prime_unpin, @@ -832,6 +832,7 @@ static struct drm_driver msm_driver = { .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, .gem_prime_vmap = msm_gem_prime_vmap, .gem_prime_vunmap = msm_gem_prime_vunmap, + .gem_prime_mmap = msm_gem_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init, .debugfs_cleanup = msm_debugfs_cleanup, diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 67f9d0a2332c..3a1c85f7f241 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -154,6 +154,8 @@ void msm_update_fence(struct drm_device *dev, uint32_t fence); int msm_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_file *file); +int msm_gem_mmap_obj(struct drm_gem_object *obj, + struct vm_area_struct *vma); int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma); int msm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj); @@ -167,9 +169,12 @@ int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev, struct drm_mode_create_dumb *args); int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, uint32_t handle, uint64_t *offset); +struct dma_buf *msm_gem_prime_export(struct drm_device *dev, + struct drm_gem_object *obj, int flags); struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj); void *msm_gem_prime_vmap(struct drm_gem_object *obj); void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); +int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sg); int msm_gem_prime_pin(struct drm_gem_object *obj); diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c index ad772fe36115..4e4fa5828d5d 100644 --- a/drivers/gpu/drm/msm/msm_gem_prime.c +++ b/drivers/gpu/drm/msm/msm_gem_prime.c @@ -20,6 +20,14 @@ #include <linux/dma-buf.h> +struct dma_buf *msm_gem_prime_export(struct drm_device *dev, + struct drm_gem_object *obj, int flags) +{ + /* we want to be able to write in mmapped buffer */ + flags |= O_RDWR; + return drm_gem_prime_export(dev, obj, flags); +} + struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj = to_msm_bo(obj); @@ -37,6 +45,19 @@ void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) /* TODO msm_gem_vunmap() */ } +int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) +{ + int ret; + + mutex_lock(&obj->dev->struct_mutex); + ret = drm_gem_mmap_obj(obj, obj->size, vma); + mutex_unlock(&obj->dev->struct_mutex); + if (ret < 0) + return ret; + + return msm_gem_mmap_obj(vma->vm_private_data, vma); +} + struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sg) { -- 1.9.3

5 16

[PATCH] drm/radeon: don't share plls if monitors differ in audio support
by Alex Deucher 27 May '15

27 May '15

Enabling audio may enable different pll dividers. Don't share plls if the monitors differ in audio support. bug: https://bugzilla.kernel.org/show_bug.cgi?id=98751 Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/atombios_crtc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 42b2ea3..e597ffc 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1798,7 +1798,9 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc) if ((crtc->mode.clock == test_crtc->mode.clock) && (adjusted_clock == test_adjusted_clock) && (radeon_crtc->ss_enabled == test_radeon_crtc->ss_enabled) && - (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID)) + (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID) && + (drm_detect_monitor_audio(radeon_connector_edid(test_radeon_crtc->connector)) == + drm_detect_monitor_audio(radeon_connector_edid(radeon_crtc->connector)))) return test_radeon_crtc->pll_id; } } -- 1.8.3.1

1 0

4.1-rc3: i915-related crash
by Pavel Machek 26 May '15

26 May '15

Hi! Debian 8 based system. X suddenly froze. Not quite reproducible, I'm afraid. Pavel [331445.592203] ftdi_sio 5-2:1.0: device disconnected [331447.063345] r8169 0000:03:00.0 eth0: link up [331447.930260] PM: resume of devices complete after 2860.478 msecs [331447.930312] ftdi_sio 5-2:1.0: FTDI USB Serial Device converter detected [331447.930481] usb 5-2: Detected FT232RL [331447.933092] usb 5-2: FTDI USB Serial Device converter now attached to ttyUSB0 [331447.933809] PM: resume devices took 2.864 seconds [331447.933870] PM: Finishing wakeup. [331447.933871] Restarting tasks ... [331447.933975] i915 0000:00:02.0: BAR 6: [??? 0x00000000 flags 0x2] has bogus alignment [331447.933981] pci 0000:00:1f.0: BAR 7: [io size 0x0080] has bogus alignment [331447.933986] pci 0000:00:1e.0: PCI bridge to [bus 04] [331447.942242] i915 0000:00:02.0: BAR 6: [??? 0x00000000 flags 0x2] has bogus alignment [331447.942252] pci 0000:00:1f.0: BAR 7: [io size 0x0080] has bogus alignment [331447.942257] pci 0000:00:1e.0: PCI bridge to [bus 04] [331447.942414] i915 0000:00:02.0: BAR 6: [??? 0x00000000 flags 0x2] has bogus alignment [331447.942417] pci 0000:00:1f.0: BAR 7: [io size 0x0080] has bogus alignment [331447.942419] pci 0000:00:1e.0: PCI bridge to [bus 04] [331447.942566] i915 0000:00:02.0: BAR 6: [??? 0x00000000 flags 0x2] has bogus alignment [331447.942568] pci 0000:00:1f.0: BAR 7: [io size 0x0080] has bogus alignment [331447.942571] pci 0000:00:1e.0: PCI bridge to [bus 04] [331447.942714] i915 0000:00:02.0: BAR 6: [??? 0x00000000 flags 0x2] has bogus alignment [331447.942717] pci 0000:00:1f.0: BAR 7: [io size 0x0080] has bogus alignment [331447.942719] pci 0000:00:1e.0: PCI bridge to [bus 04] [331447.943194] done. [339876.723061] general protection fault: 0000 [#1] SMP DEBUG_PAGEALLOC [339876.723095] Modules linked in: [339876.723106] CPU: 0 PID: 2672 Comm: Xorg Tainted: G W 4.1.0-rc3 #22 [339876.723130] Hardware name: /DG41MJ, BIOS MJG4110H.86A.0006.2009.1223.1155 12/23/2009 [339876.723159] task: ffff8800a8cee050 ti: ffff8800a8cf0000 task.ti: ffff8800a8cf0000 [339876.723183] RIP: 0010:[<ffffffff843f2d50>] [<ffffffff843f2d50>] intel_gtt_insert_sg_entries+0x30/0xa0 [339876.723220] RSP: 0000:ffff8800a8cf3958 EFLAGS: 00213206 [339876.723235] RAX: 000000005a5a5a5a RBX: ffff88012bf36f00 RCX: 0000000000004d1f [339876.723257] RDX: 0000000000010000 RSI: 0000000000004d1f RDI: ffff88008dd7a500 [339876.723278] RBP: ffff8800a8cf3998 R08: 0000000000000000 R09: 0000000004f6d000 [339876.723300] R10: 0000000000000000 R11: 0000000000000000 R12: 5a5a5a5a5a5a0100 [339876.723322] R13: 0000000000004d1f R14: 0000000000010000 R15: 0000000000000000 [339876.723345] FS: 0000000000000000(0000) GS:ffff88013f200000(0063) knlGS:00000000f714d880 [339876.723370] CS: 0010 DS: 002b ES: 002b CR0: 000000008005003b [339876.723387] CR2: 00000000f72b4d64 CR3: 000000013200f000 CR4: 00000000000406b0 [339876.723409] Stack: [339876.723413] ffff88008dd7a500 0000000000000000 ffff8800a8cf3988 ffff88012bf36f00 [339876.723444] 0000000000000000 0000000000000000 ffff8801378290a8 0000000000000000 [339876.723475] ffff8800a8cf39b8 ffffffff8444aaa4 ffff8800a8cf3a48 ffff88012bf36f00 [339876.723507] Call Trace: [339876.723517] [<ffffffff8444aaa4>] i915_ggtt_bind_vma+0x44/0x70 [339876.723534] [<ffffffff8444c4a6>] i915_vma_bind+0x46/0x460 [339876.723551] [<ffffffff84327335>] ? swiotlb_map_sg_attrs+0x75/0x160 [339876.723571] [<ffffffff8444bbf2>] ? i915_gem_gtt_prepare_object+0x82/0xc0 [339876.723593] [<ffffffff8445354e>] i915_gem_object_do_pin+0x85e/0x9d0 [339876.723612] [<ffffffff8444cde0>] ? i915_gem_request_free+0x40/0x60 [339876.723633] [<ffffffff844536f5>] i915_gem_object_pin+0x35/0x40 [339876.723652] [<ffffffff844454b1>] i915_gem_execbuffer_reserve_vma.isra.19+0x71/0x140 [339876.723676] [<ffffffff8444585c>] i915_gem_execbuffer_reserve+0x2dc/0x310 [339876.724701] [<ffffffff84445f95>] i915_gem_do_execbuffer.isra.25+0x705/0x11b0 [339876.725709] [<ffffffff841142d7>] ? cache_alloc_debugcheck_after.isra.63+0x67/0x2f0 [339876.726019] [<ffffffff84447c71>] ? i915_gem_execbuffer2+0x91/0x2b0 [339876.726019] [<ffffffff84447d21>] i915_gem_execbuffer2+0x141/0x2b0 [339876.726019] [<ffffffff84408370>] drm_ioctl+0x1a0/0x690 [339876.726019] [<ffffffff84437b55>] i915_compat_ioctl+0x45/0x50 [339876.726019] [<ffffffff84166c20>] compat_SyS_ioctl+0xa0/0x1190 [339876.726019] [<ffffffff840a90f6>] ? ktime_get_ts64+0x86/0x150 [339876.726019] [<ffffffff840a556c>] ? posix_ktime_get_ts+0xc/0x10 [339876.726019] [<ffffffff840a556c>] ? posix_ktime_get_ts+0xc/0x10 [339876.726019] [<ffffffff84310203>] ? lockdep_sys_exit_thunk+0x12/0x14 [339876.726019] [<ffffffff84990255>] ia32_do_call+0x13/0x13 [339876.736025] Code: 57 41 56 41 89 d6 41 55 41 89 f5 41 54 53 48 83 ec 18 8b 47 08 48 89 7d c0 4c 8b 27 c7 45 cc 00 00 00 00 85 c0 74 58 0f 1f 40 00 <41> 8b 5c 24 18 c1 eb 0c 85 db 74 2d 45 31 ff 90 48 8b 0d d9 7f [339876.736025] RIP [<ffffffff843f2d50>] intel_gtt_insert_sg_entries+0x30/0xa0 [339876.736025] RSP <ffff8800a8cf3958> [339876.743455] ---[ end trace e8b388331768406b ]--- [339914.594279] Watchdog[5681]: segfault at 0 ip 000000005a738293 sp 00000000f4aeebb0 error 6 in chromium[56565000+61f2000] -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

1 0

[PATCH v2] nouveau: add coherent BO attribute
by Alexandre Courbot 26 May '15

26 May '15

Add a flag allowing Nouveau to specify that an object should be coherent at allocation time. This is required for some class of objects like fences which are randomly-accessed by both the CPU and GPU. This flag instructs the kernel driver to make sure the object remains coherent even on architectures for which coherency is not guaranteed by the bus. Signed-off-by: Alexandre Courbot <acourbot(a)nvidia.com> --- Changes since v1: None, just added Martin so he can merge the patch. R-b and A-b wanted. :) include/drm/nouveau_drm.h | 1 + nouveau/abi16.c | 3 +++ nouveau/nouveau.h | 1 + 3 files changed, 5 insertions(+) diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h index b18cad02419b..87aefc5e9d2f 100644 --- a/include/drm/nouveau_drm.h +++ b/include/drm/nouveau_drm.h @@ -96,6 +96,7 @@ struct drm_nouveau_setparam { #define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1) #define NOUVEAU_GEM_DOMAIN_GART (1 << 2) #define NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3) +#define NOUVEAU_GEM_DOMAIN_COHERENT (1 << 4) #define NOUVEAU_GEM_TILE_LAYOUT_MASK 0x0000ff00 #define NOUVEAU_GEM_TILE_16BPP 0x00000001 diff --git a/nouveau/abi16.c b/nouveau/abi16.c index 538f3a730dbe..4ca0bfbaf592 100644 --- a/nouveau/abi16.c +++ b/nouveau/abi16.c @@ -195,6 +195,9 @@ abi16_bo_init(struct nouveau_bo *bo, uint32_t alignment, if (bo->flags & NOUVEAU_BO_MAP) info->domain |= NOUVEAU_GEM_DOMAIN_MAPPABLE; + if (bo->flags & NOUVEAU_BO_COHERENT) + info->domain |= NOUVEAU_GEM_DOMAIN_COHERENT; + if (!(bo->flags & NOUVEAU_BO_CONTIG)) info->tile_flags = NOUVEAU_GEM_TILE_NONCONTIG; diff --git a/nouveau/nouveau.h b/nouveau/nouveau.h index a55e2b020778..4adda0e3594c 100644 --- a/nouveau/nouveau.h +++ b/nouveau/nouveau.h @@ -127,6 +127,7 @@ union nouveau_bo_config { #define NOUVEAU_BO_MAP 0x80000000 #define NOUVEAU_BO_CONTIG 0x40000000 #define NOUVEAU_BO_NOSNOOP 0x20000000 +#define NOUVEAU_BO_COHERENT 0x10000000 struct nouveau_bo { struct nouveau_device *device; -- 2.4.0

6 7

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2015