dri-devel May 2015

dri-devel@lists.freedesktop.org

191 participants
1132 discussions

[PATCH 1/3] drm/i915: get rid of -Iinclude/drm
by Maarten Lankhorst 13 May '15

13 May '15

This results in a warning when building out of tree: "cc1: warning: include/drm: No such file or directory [enabled by default]" Most code already uses #include <drm/foo.h> correctly, so fix the instances that don't. Reported-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> --- drivers/gpu/drm/i915/Makefile | 2 -- drivers/gpu/drm/i915/i915_gem_userptr.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 5238deb64505..b7ddf48e1d75 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -2,8 +2,6 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -ccflags-y := -Iinclude/drm - # Please keep these build lists sorted! # core driver code diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c index 1719078c763a..4039ede158be 100644 --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -22,8 +22,8 @@ * */ -#include "drmP.h" -#include "i915_drm.h" +#include <drm/drmP.h> +#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" #include "intel_drv.h" -- 2.1.0

2 3

[Bug 98101] New: kernel BUG at drivers/gpu/drm/drm_vma_manager.c:209!
by bugzilla-daemon＠bugzilla.kernel.org 13 May '15

13 May '15

https://bugzilla.kernel.org/show_bug.cgi?id=98101 Bug ID: 98101 Summary: kernel BUG at drivers/gpu/drm/drm_vma_manager.c:209! Product: Drivers Version: 2.5 Kernel Version: 4.01 Hardware: All OS: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: barz621(a)gmail.com Regression: No May 11 22:42:14 mainland kernel: ------------[ cut here ]------------ May 11 22:42:14 mainland kernel: WARNING: CPU: 1 PID: 413 at include/linux/kref.h:47 drm_gem_object_lookup+0xa2/0xc0 [drm]() May 11 22:42:14 mainland kernel: Modules linked in: mousedev hid_logitech_hidpp w83627ehf hwmon_vid hid_logitech_dj hid_generic nls_iso8859_1 nls_cp437 usbhid vfat hid fat coretemp intel_rapl iosf_mbi x86_pkg_temp_thermal intel_power May 11 22:42:14 mainland kernel: xhci_pci i8042 serio ext4 crc16 mbcache jbd2 ehci_hcd xhci_hcd usbcore sr_mod cdrom usb_common sd_mod ahci libahci libata scsi_mod radeon hwmon i2c_algo_bit drm_kms_helper ttm drm i2c_core May 11 22:42:14 mainland kernel: CPU: 1 PID: 413 Comm: Xorg Not tainted 4.0.1-1-ARCH #1 May 11 22:42:14 mainland kernel: Hardware name: /DZ77BH-55K, BIOS BHZ7710H.86A.0094.2012.1101.1115 11/01/2012 May 11 22:42:14 mainland kernel: 0000000000000000 000000005e6ff2ac ffff88030e583cb8 ffffffff8156de97 May 11 22:42:14 mainland kernel: 0000000000000000 0000000000000000 ffff88030e583cf8 ffffffff81074d7a May 11 22:42:14 mainland kernel: ffff8803018efdf0 ffff8800d90ed2c0 ffff88030ec0ec60 000000000000009d May 11 22:42:14 mainland kernel: Call Trace: May 11 22:42:14 mainland kernel: [<ffffffff8156de97>] dump_stack+0x4c/0x6e May 11 22:42:14 mainland kernel: [<ffffffff81074d7a>] warn_slowpath_common+0x8a/0xc0 May 11 22:42:14 mainland kernel: [<ffffffff81074eaa>] warn_slowpath_null+0x1a/0x20 May 11 22:42:14 mainland kernel: [<ffffffffa001a4f2>] drm_gem_object_lookup+0xa2/0xc0 [drm] May 11 22:42:14 mainland kernel: [<ffffffffa010b3fd>] radeon_gem_busy_ioctl+0x3d/0x130 [radeon] May 11 22:42:14 mainland kernel: [<ffffffffa001bcab>] drm_ioctl+0x1db/0x640 [drm] May 11 22:42:14 mainland kernel: [<ffffffffa010b3c0>] ? radeon_gem_mmap_ioctl+0x20/0x20 [radeon] May 11 22:42:14 mainland kernel: [<ffffffff81191cc2>] ? unmap_region+0xe2/0x130 May 11 22:42:14 mainland kernel: [<ffffffffa00d404c>] radeon_drm_ioctl+0x4c/0x80 [radeon] May 11 22:42:14 mainland kernel: [<ffffffff811e8f26>] do_vfs_ioctl+0x2c6/0x4d0 May 11 22:42:14 mainland kernel: [<ffffffff811f3762>] ? __fget+0x72/0xb0 May 11 22:42:14 mainland kernel: [<ffffffff811e91b1>] SyS_ioctl+0x81/0xa0 May 11 22:42:14 mainland kernel: [<ffffffff815737c9>] system_call_fastpath+0x12/0x17 May 11 22:42:14 mainland kernel: ---[ end trace ff4430287afe68e0 ]--- May 11 22:42:14 mainland kernel: ------------[ cut here ]------------ May 11 22:42:14 mainland kernel: WARNING: CPU: 1 PID: 413 at include/drm/ttm/ttm_bo_driver.h:855 radeon_bo_wait+0x101/0x110 [radeon]() May 11 22:42:14 mainland kernel: Modules linked in: mousedev hid_logitech_hidpp w83627ehf hwmon_vid hid_logitech_dj hid_generic nls_iso8859_1 nls_cp437 usbhid vfat hid fat coretemp intel_rapl iosf_mbi x86_pkg_temp_thermal intel_power May 11 22:42:14 mainland kernel: xhci_pci i8042 serio ext4 crc16 mbcache jbd2 ehci_hcd xhci_hcd usbcore sr_mod cdrom usb_common sd_mod ahci libahci libata scsi_mod radeon hwmon i2c_algo_bit drm_kms_helper ttm drm i2c_core May 11 22:42:14 mainland kernel: CPU: 1 PID: 413 Comm: Xorg Tainted: G W 4.0.1-1-ARCH #1 May 11 22:42:14 mainland kernel: Hardware name: /DZ77BH-55K, BIOS BHZ7710H.86A.0094.2012.1101.1115 11/01/2012 May 11 22:42:14 mainland kernel: 0000000000000000 000000005e6ff2ac ffff88030e583cb8 ffffffff8156de97 May 11 22:42:14 mainland kernel: 0000000000000000 0000000000000000 ffff88030e583cf8 ffffffff81074d7a May 11 22:42:14 mainland kernel: ffff8803018efdf0 ffff8800d90ed000 0000000000000001 ffff8800d90ed068 May 11 22:42:14 mainland kernel: Call Trace: May 11 22:42:14 mainland kernel: [<ffffffff8156de97>] dump_stack+0x4c/0x6e May 11 22:42:14 mainland kernel: [<ffffffff81074d7a>] warn_slowpath_common+0x8a/0xc0 May 11 22:42:14 mainland kernel: [<ffffffff81074eaa>] warn_slowpath_null+0x1a/0x20 May 11 22:42:14 mainland kernel: [<ffffffffa00f6241>] radeon_bo_wait+0x101/0x110 [radeon] May 11 22:42:14 mainland kernel: [<ffffffffa010b41e>] radeon_gem_busy_ioctl+0x5e/0x130 [radeon] May 11 22:42:14 mainland kernel: [<ffffffffa001bcab>] drm_ioctl+0x1db/0x640 [drm] May 11 22:42:14 mainland kernel: [<ffffffffa010b3c0>] ? radeon_gem_mmap_ioctl+0x20/0x20 [radeon] May 11 22:42:14 mainland kernel: [<ffffffff81191cc2>] ? unmap_region+0xe2/0x130 May 11 22:42:14 mainland kernel: [<ffffffffa00d404c>] radeon_drm_ioctl+0x4c/0x80 [radeon] May 11 22:42:14 mainland kernel: [<ffffffff811e8f26>] do_vfs_ioctl+0x2c6/0x4d0 May 11 22:42:14 mainland kernel: [<ffffffff811f3762>] ? __fget+0x72/0xb0 May 11 22:42:14 mainland kernel: [<ffffffff811e91b1>] SyS_ioctl+0x81/0xa0 May 11 22:42:14 mainland kernel: [<ffffffff815737c9>] system_call_fastpath+0x12/0x17 May 11 22:42:14 mainland kernel: ---[ end trace ff4430287afe68e1 ]--- May 11 22:42:14 mainland kernel: ------------[ cut here ]------------ May 11 22:42:14 mainland kernel: WARNING: CPU: 1 PID: 413 at include/drm/ttm/ttm_bo_driver.h:855 radeon_bo_wait+0x101/0x110 [radeon]() May 11 22:42:14 mainland kernel: Modules linked in: mousedev hid_logitech_hidpp w83627ehf hwmon_vid hid_logitech_dj hid_generic nls_iso8859_1 nls_cp437 usbhid vfat hid fat coretemp intel_rapl iosf_mbi x86_pkg_temp_thermal intel_power May 11 22:42:14 mainland kernel: xhci_pci i8042 serio ext4 crc16 mbcache jbd2 ehci_hcd xhci_hcd usbcore sr_mod cdrom usb_common sd_mod ahci libahci libata scsi_mod radeon hwmon i2c_algo_bit drm_kms_helper ttm drm i2c_core May 11 22:42:14 mainland kernel: CPU: 1 PID: 413 Comm: Xorg Tainted: G W 4.0.1-1-ARCH #1 May 11 22:42:14 mainland kernel: Hardware name: /DZ77BH-55K, BIOS BHZ7710H.86A.0094.2012.1101.1115 11/01/2012 May 11 22:42:14 mainland kernel: 0000000000000000 000000005e6ff2ac ffff88030e583cb8 ffffffff8156de97 May 11 22:42:14 mainland kernel: 0000000000000000 0000000000000000 ffff88030e583cf8 ffffffff81074d7a May 11 22:42:14 mainland kernel: 00000000fffffff0 ffff88030183e000 0000000000000001 ffff88030183e068 May 11 22:42:14 mainland kernel: Call Trace: May 11 22:42:14 mainland kernel: [<ffffffff8156de97>] dump_stack+0x4c/0x6e May 11 22:42:14 mainland kernel: [<ffffffff81074d7a>] warn_slowpath_common+0x8a/0xc0 May 11 22:42:14 mainland kernel: [<ffffffff81074eaa>] warn_slowpath_null+0x1a/0x20 May 11 22:42:14 mainland kernel: [<ffffffffa00f6241>] radeon_bo_wait+0x101/0x110 [radeon] May 11 22:42:14 mainland kernel: [<ffffffffa010b41e>] radeon_gem_busy_ioctl+0x5e/0x130 [radeon] May 11 22:42:14 mainland kernel: [<ffffffffa001bcab>] drm_ioctl+0x1db/0x640 [drm] May 11 22:42:14 mainland kernel: [<ffffffffa010b3c0>] ? radeon_gem_mmap_ioctl+0x20/0x20 [radeon] May 11 22:42:14 mainland kernel: [<ffffffff81191cc2>] ? unmap_region+0xe2/0x130 May 11 22:42:14 mainland kernel: [<ffffffffa00d404c>] radeon_drm_ioctl+0x4c/0x80 [radeon] May 11 22:42:14 mainland kernel: [<ffffffff811e8f26>] do_vfs_ioctl+0x2c6/0x4d0 May 11 22:42:14 mainland kernel: [<ffffffff811f3762>] ? __fget+0x72/0xb0 May 11 22:42:14 mainland kernel: [<ffffffff811e91b1>] SyS_ioctl+0x81/0xa0 May 11 22:42:14 mainland kernel: [<ffffffff815737c9>] system_call_fastpath+0x12/0x17 May 11 22:42:14 mainland kernel: ---[ end trace ff4430287afe68e2 ]--- May 11 22:42:14 mainland kernel: ------------[ cut here ]------------ May 11 22:42:14 mainland kernel: WARNING: CPU: 1 PID: 413 at include/drm/ttm/ttm_bo_driver.h:855 radeon_bo_wait+0x101/0x110 [radeon]() May 11 22:42:14 mainland kernel: Modules linked in: mousedev hid_logitech_hidpp w83627ehf hwmon_vid hid_logitech_dj hid_generic nls_iso8859_1 nls_cp437 usbhid vfat hid fat coretemp intel_rapl iosf_mbi x86_pkg_temp_thermal intel_power May 11 22:42:14 mainland kernel: xhci_pci i8042 serio ext4 crc16 mbcache jbd2 ehci_hcd xhci_hcd usbcore sr_mod cdrom usb_common sd_mod ahci libahci libata scsi_mod radeon hwmon i2c_algo_bit drm_kms_helper ttm drm i2c_core May 11 22:42:14 mainland kernel: CPU: 1 PID: 413 Comm: Xorg Tainted: G W 4.0.1-1-ARCH #1 May 11 22:42:14 mainland kernel: Hardware name: /DZ77BH-55K, BIOS BHZ7710H.86A.0094.2012.1101.1115 11/01/2012 May 11 22:42:14 mainland kernel: 0000000000000000 000000005e6ff2ac ffff88030e583cb8 ffffffff8156de97 May 11 22:42:14 mainland kernel: 0000000000000000 0000000000000000 ffff88030e583cf8 ffffffff81074d7a May 11 22:42:14 mainland kernel: 00000000fffffff0 ffff8802b8670400 0000000000000001 ffff8802b8670468 May 11 22:42:14 mainland kernel: Call Trace: May 11 22:42:14 mainland kernel: [<ffffffff8156de97>] dump_stack+0x4c/0x6e May 11 22:42:14 mainland kernel: [<ffffffff81074d7a>] warn_slowpath_common+0x8a/0xc0 May 11 22:42:14 mainland kernel: [<ffffffff81074eaa>] warn_slowpath_null+0x1a/0x20 May 11 22:42:14 mainland kernel: [<ffffffffa00f6241>] radeon_bo_wait+0x101/0x110 [radeon] May 11 22:42:14 mainland kernel: [<ffffffffa010b41e>] radeon_gem_busy_ioctl+0x5e/0x130 [radeon] May 11 22:42:14 mainland kernel: [<ffffffffa001bcab>] drm_ioctl+0x1db/0x640 [drm] May 11 22:42:14 mainland kernel: [<ffffffffa010b3c0>] ? radeon_gem_mmap_ioctl+0x20/0x20 [radeon] May 11 22:42:14 mainland kernel: [<ffffffff81191cc2>] ? unmap_region+0xe2/0x130 May 11 22:42:14 mainland kernel: [<ffffffffa00d404c>] radeon_drm_ioctl+0x4c/0x80 [radeon] May 11 22:42:14 mainland kernel: [<ffffffff811e8f26>] do_vfs_ioctl+0x2c6/0x4d0 May 11 22:42:14 mainland kernel: [<ffffffff811f3762>] ? __fget+0x72/0xb0 May 11 22:42:14 mainland kernel: [<ffffffff811e91b1>] SyS_ioctl+0x81/0xa0 May 11 22:42:14 mainland kernel: [<ffffffff815737c9>] system_call_fastpath+0x12/0x17 May 11 22:42:14 mainland kernel: ---[ end trace ff4430287afe68e3 ]--- May 11 22:42:14 mainland kernel: ------------[ cut here ]------------ May 11 22:42:14 mainland kernel: kernel BUG at drivers/gpu/drm/drm_vma_manager.c:209! glxinfo | grep -i opengl OpenGL vendor string: X.Org OpenGL renderer string: Gallium 0.4 on AMD BARTS OpenGL core profile version string: 3.3 (Core Profile) Mesa 10.5.4 OpenGL core profile shading language version string: 3.30 OpenGL core profile context flags: (none) OpenGL core profile profile mask: core profile OpenGL core profile extensions: OpenGL version string: 3.0 Mesa 10.5.4 OpenGL shading language version string: 1.30 OpenGL context flags: (none) OpenGL extensions: OpenGL ES profile version string: OpenGL ES 3.0 Mesa 10.5.4 OpenGL ES profile shading language version string: OpenGL ES GLSL ES 3.00 OpenGL ES profile extensions: Freezes the system and requires hard reset. -- You are receiving this mail because: You are watching the assignee of the bug.

1 3

Re: [PATCH v2 1/2] drm: Make HW_LOCK access functions optional.
by Daniel Vetter 13 May '15

13 May '15

Adding dri-devel, I've forgotten to do that ... -Daniel On Wed, May 13, 2015 at 09:14:29AM +0200, Daniel Vetter wrote: > On Wed, May 13, 2015 at 07:54:47AM +0100, Peter Antoine wrote: > > As these functions are only used by one driver and there are security holes > > in these functions. Make the functions optional. > > Is there a reference for why nouveau needs hw locks too? Also have you > done an audit of mesa history and X history to make sure there's no other > driver accidentally using it with a modern kms driver? > > > Issue: VIZ-5485 > > Signed-off-by: Peter Antoine <peter.antoine(a)intel.com> > > --- > > drivers/gpu/drm/drm_lock.c | 6 ++++++ > > drivers/gpu/drm/nouveau/nouveau_drm.c | 3 ++- > > include/drm/drmP.h | 23 ++++++++++++----------- > > 3 files changed, 20 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c > > index f861361..21eb180 100644 > > --- a/drivers/gpu/drm/drm_lock.c > > +++ b/drivers/gpu/drm/drm_lock.c > > @@ -61,6 +61,9 @@ int drm_legacy_lock(struct drm_device *dev, void *data, > > struct drm_master *master = file_priv->master; > > int ret = 0; > > > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > > You also need to allow these for all legacy drivers, i.e. without > DRIVER_MODESET. > -Daniel > > > + return -EINVAL; > > + > > ++file_priv->lock_count; > > > > if (lock->context == DRM_KERNEL_CONTEXT) { > > @@ -153,6 +156,9 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_ > > struct drm_lock *lock = data; > > struct drm_master *master = file_priv->master; > > > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > > + return -EINVAL; > > + > > if (lock->context == DRM_KERNEL_CONTEXT) { > > DRM_ERROR("Process %d using kernel context %d\n", > > task_pid_nr(current), lock->context); > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c > > index 8904933..9624b38 100644 > > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > > @@ -941,7 +941,8 @@ static struct drm_driver > > driver_stub = { > > .driver_features = > > DRIVER_USE_AGP | > > - DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER, > > + DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | > > + DRIVER_KMS_LEGACY_CONTEXT, > > > > .load = nouveau_drm_load, > > .unload = nouveau_drm_unload, > > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > > index df6d997..3874942 100644 > > --- a/include/drm/drmP.h > > +++ b/include/drm/drmP.h > > @@ -137,17 +137,18 @@ void drm_err(const char *format, ...); > > /*@{*/ > > > > /* driver capabilities and requirements mask */ > > -#define DRIVER_USE_AGP 0x1 > > -#define DRIVER_PCI_DMA 0x8 > > -#define DRIVER_SG 0x10 > > -#define DRIVER_HAVE_DMA 0x20 > > -#define DRIVER_HAVE_IRQ 0x40 > > -#define DRIVER_IRQ_SHARED 0x80 > > -#define DRIVER_GEM 0x1000 > > -#define DRIVER_MODESET 0x2000 > > -#define DRIVER_PRIME 0x4000 > > -#define DRIVER_RENDER 0x8000 > > -#define DRIVER_ATOMIC 0x10000 > > +#define DRIVER_USE_AGP 0x1 > > +#define DRIVER_PCI_DMA 0x8 > > +#define DRIVER_SG 0x10 > > +#define DRIVER_HAVE_DMA 0x20 > > +#define DRIVER_HAVE_IRQ 0x40 > > +#define DRIVER_IRQ_SHARED 0x80 > > +#define DRIVER_GEM 0x1000 > > +#define DRIVER_MODESET 0x2000 > > +#define DRIVER_PRIME 0x4000 > > +#define DRIVER_RENDER 0x8000 > > +#define DRIVER_ATOMIC 0x10000 > > +#define DRIVER_KMS_LEGACY_CONTEXT 0x20000 > > > > /***********************************************************************/ > > /** \name Macros to make printk easier */ > > -- > > 1.9.1 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

1 0

[patch] drm/edid: fix a debug message
by Dan Carpenter 13 May '15

13 May '15

There is an extra semi-colon on the if statement so the debug output always says "Failed to write EDID checksum" even when it didn't fail. Fixes: 559be30cb74d ('drm/i915: Implement the intel_dp_autotest_edid function for DP EDID complaince tests') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index eca82cf..75bccd6 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4142,7 +4142,7 @@ static uint8_t intel_dp_autotest_edid(struct intel_dp *intel_dp) if (!drm_dp_dpcd_write(&intel_dp->aux, DP_TEST_EDID_CHECKSUM, &intel_connector->detect_edid->checksum, - 1)); + 1)) DRM_DEBUG_KMS("Failed to write EDID checksum\n"); test_result = DP_TEST_ACK | DP_TEST_EDID_CHECKSUM_WRITE;

2 1

[PATCH i-g-t] tests/drm_hw_lock: Tests for hw_lock fixes.
by Peter Antoine 13 May '15

13 May '15

There are several issues with the hardware locks functions that stretch from kernel crashes to priority escalations. This new test will test the the fixes for these features. This test will cause a driver/kernel crash on un-patched kernels, the following patches should be applied to stop the crashes: drm: Kernel Crash in drm_unlock drm: Fixes unsafe deference in locks. Issue: VIZ-5485 Signed-off-by: Peter Antoine <peter.antoine(a)intel.com> --- lib/ioctl_wrappers.c | 19 +++++ lib/ioctl_wrappers.h | 1 + tests/Makefile.sources | 1 + tests/drm_hw_lock.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 228 insertions(+) create mode 100644 tests/drm_hw_lock.c diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 000d394..ad8b3d3 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -964,6 +964,25 @@ bool gem_has_bsd2(int fd) { return gem_has_enable_ring(fd,LOCAL_I915_PARAM_HAS_BSD2); } +#define I915_PARAM_HAS_LEGACY_CONTEXT 35 +bool drm_has_legacy_context(int fd) +{ + int tmp = 0; + drm_i915_getparam_t gp; + + memset(&gp, 0, sizeof(gp)); + gp.value = &tmp; + gp.param = I915_PARAM_HAS_LEGACY_CONTEXT; + + /* + * if legacy context param is not supported, then it's old and we + * can assume that the HW_LOCKS are supported. + */ + if (drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp) != 0) + return true; + + return tmp == 1; +} /** * gem_available_aperture_size: * @fd: open i915 drm file descriptor diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index ced7ef3..3adc700 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -120,6 +120,7 @@ bool gem_has_bsd(int fd); bool gem_has_blt(int fd); bool gem_has_vebox(int fd); bool gem_has_bsd2(int fd); +bool drm_has_legacy_context(int fd); bool gem_uses_aliasing_ppgtt(int fd); int gem_available_fences(int fd); uint64_t gem_available_aperture_size(int fd); diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 71de6de..2f69afc 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -84,6 +84,7 @@ TESTS_progs_M = \ pm_sseu \ prime_self_import \ template \ + drm_hw_lock \ $(NULL) TESTS_progs = \ diff --git a/tests/drm_hw_lock.c b/tests/drm_hw_lock.c new file mode 100644 index 0000000..aad50ba --- /dev/null +++ b/tests/drm_hw_lock.c @@ -0,0 +1,207 @@ +/* + * Copyright © 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Peter Antoine <peter.antoine(a)intel.com> + */ + +/* + * Testcase: Test the HW_LOCKs for correct support and non-crashing. + * + * This test will check that he hw_locks are only g_supported for drivers that + * require that support. If it is not g_supported then the functions all return + * the correct error code. + * + * If g_supported it will check that the functions do not crash when the crash + * tests are used, also that one of the tests is a security level escalation + * that should be rejected. + */ +#include <stdlib.h> +#include <signal.h> +#include <sys/ioctl.h> +#include <drm.h> +#include "drmtest.h" +#include "igt_core.h" +#include "ioctl_wrappers.h" + +#ifndef DRM_KERNEL_CONTEXT +# define DRM_KERNEL_CONTEXT (0) +#endif + +#ifndef _DRM_LOCK_HELD +# define _DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ +#endif + +#ifndef _DRM_LOCK_CONT +# define _DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ +#endif + +static bool g_sig_fired; +static bool g_supported; +static struct sigaction old_action; + +static void sig_term_handler(int value) +{ + g_sig_fired = true; +} + +static bool set_term_handler(void) +{ + static struct sigaction new_action; + + new_action.sa_handler = sig_term_handler; + sigemptyset(&new_action.sa_mask); + new_action.sa_flags = 0; + + igt_assert(sigaction(SIGTERM, &new_action, &old_action) == 0); + + if (old_action.sa_handler != SIG_IGN) + return true; + else + return false; +} + +static void restore_term_handler(void) +{ + sigaction(SIGTERM, &old_action, NULL); +} + +static void does_lock_crash(int fd) +{ + struct drm_lock rubbish; + int ret; + + memset(&rubbish, 'A', sizeof(struct drm_lock)); + + g_sig_fired = false; + igt_assert(set_term_handler()); + + ret = ioctl(fd, DRM_IOCTL_LOCK, &rubbish); + + igt_assert(ret == -1 && (!g_supported || g_sig_fired)); + igt_assert(ret == -1 && (g_supported || errno == EINVAL)); + + restore_term_handler(); +} + +static void does_unlock_crash(int fd) +{ + struct drm_lock rubbish; + int ret; + + g_sig_fired = false; + igt_assert(set_term_handler()); + + memset(&rubbish, 'A', sizeof(struct drm_lock)); + + ret = ioctl(fd, DRM_IOCTL_UNLOCK, &rubbish); + + igt_assert(ret == -1 && (!g_supported || g_sig_fired)); + igt_assert(ret == -1 && (g_supported || errno == EINVAL)); + + restore_term_handler(); +} + +static void priority_escalation(int fd) +{ + struct drm_lock rubbish; + int ret; + + g_sig_fired = false; + igt_assert(set_term_handler()); + + /* this should be rejected */ + rubbish.context = DRM_KERNEL_CONTEXT; + ret = ioctl(fd, DRM_IOCTL_LOCK, &rubbish); + igt_assert(ret == -1 && (!g_supported || errno == EPERM)); + igt_assert(ret == -1 && (g_supported || errno == EINVAL)); + + /* this should also be rejected */ + rubbish.context = _DRM_LOCK_HELD | DRM_KERNEL_CONTEXT; + g_sig_fired = false; + ret = ioctl(fd, DRM_IOCTL_LOCK, &rubbish); + igt_assert(ret == -1 && (!g_supported || errno == EPERM)); + igt_assert(ret == -1 && (g_supported || errno == EINVAL)); + + /* this should also be rejected */ + rubbish.context = _DRM_LOCK_CONT | DRM_KERNEL_CONTEXT; + g_sig_fired = false; + ret = ioctl(fd, DRM_IOCTL_LOCK, &rubbish); + igt_assert(ret == -1 && (!g_supported || errno == EPERM)); + igt_assert(ret == -1 && (g_supported || errno == EINVAL)); + + /* this should be rejected */ + rubbish.context = DRM_KERNEL_CONTEXT; + g_sig_fired = false; + ret = ioctl(fd, DRM_IOCTL_UNLOCK, &rubbish); + igt_assert(ret == -1 && (!g_supported || errno == EPERM)); + igt_assert(ret == -1 && (g_supported || errno == EINVAL)); + + /* this should also be rejected */ + rubbish.context = _DRM_LOCK_HELD | DRM_KERNEL_CONTEXT; + g_sig_fired = false; + ret = ioctl(fd, DRM_IOCTL_UNLOCK, &rubbish); + igt_assert(ret == -1 && (!g_supported || errno == EPERM)); + igt_assert(ret == -1 && (g_supported || errno == EINVAL)); + + /* this should also be rejected */ + rubbish.context = _DRM_LOCK_CONT | DRM_KERNEL_CONTEXT; + g_sig_fired = false; + ret = ioctl(fd, DRM_IOCTL_UNLOCK, &rubbish); + igt_assert(ret == -1 && (!g_supported || errno == EPERM)); + igt_assert(ret == -1 && (g_supported || errno == EINVAL)); + + restore_term_handler(); +} + +igt_main +{ + int fd = -1; + + g_sig_fired = false; + g_supported = false; + + igt_fixture { + fd = drm_open_any(); + igt_assert(fd >= 0); + } + + g_supported = drm_has_legacy_context(fd); + + igt_info("HW LOCK Supported: %s\n", g_supported?"Yes":"No"); + + igt_subtest("lock-crash") { + does_lock_crash(fd); + } + + igt_subtest("unlock-crash") { + does_unlock_crash(fd); + } + + igt_subtest("priority-escalation") { + priority_escalation(fd); + } + + igt_fixture + close(fd); +} + -- 1.9.1

6 7

[PATCH 01/42] drm/atomic: Allow drivers to subclass drm_atomic_state
by Maarten Lankhorst 13 May '15

13 May '15

Drivers may need to store the state of shared resources, such as PLLs or FIFO space, into the atomic state. Allow this by making it possible to subclass drm_atomic_state. Cc: dri-devel(a)lists.freedesktop.org Acked-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira(a)intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> --- drivers/gpu/drm/drm_atomic.c | 91 ++++++++++++++++++++++++++++++++------------ include/drm/drm_atomic.h | 4 ++ include/drm/drm_crtc.h | 4 ++ 3 files changed, 74 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 6e3b78ee7d16..f0f914591f1d 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -38,24 +38,19 @@ static void kfree_state(struct drm_atomic_state *state) kfree(state->crtc_states); kfree(state->planes); kfree(state->plane_states); - kfree(state); } /** - * drm_atomic_state_alloc - allocate atomic state + * __drm_atomic_new_state - init new atomic state * @dev: DRM device + * @state: atomic state * - * This allocates an empty atomic state to track updates. + * Default implementation for filling in a new atomic state. + * This is useful for drivers that subclass the atomic state. */ -struct drm_atomic_state * -drm_atomic_state_alloc(struct drm_device *dev) +int __drm_atomic_new_state(struct drm_device *dev, + struct drm_atomic_state *state) { - struct drm_atomic_state *state; - - state = kzalloc(sizeof(*state), GFP_KERNEL); - if (!state) - return NULL; - /* TODO legacy paths should maybe do a better job about * setting this appropriately? */ @@ -92,31 +87,50 @@ drm_atomic_state_alloc(struct drm_device *dev) state->dev = dev; - DRM_DEBUG_ATOMIC("Allocate atomic state %p\n", state); + DRM_DEBUG_ATOMIC("Allocated atomic state %p\n", state); - return state; + return 0; fail: kfree_state(state); + return -ENOMEM; +} +EXPORT_SYMBOL(__drm_atomic_new_state); - return NULL; +/** + * drm_atomic_state_alloc - allocate atomic state + * @dev: DRM device + * + * This allocates an empty atomic state to track updates. + */ +struct drm_atomic_state * +drm_atomic_state_alloc(struct drm_device *dev) +{ + struct drm_mode_config *config = &dev->mode_config; + struct drm_atomic_state *state; + + if (!config->funcs->atomic_new_state) { + state = kzalloc(sizeof(*state), GFP_KERNEL); + if (!state) + return NULL; + if (__drm_atomic_new_state(dev, state) < 0) { + kfree(state); + return NULL; + } + return state; + } + + return config->funcs->atomic_new_state(dev); } EXPORT_SYMBOL(drm_atomic_state_alloc); /** - * drm_atomic_state_clear - clear state object + * __drm_atomic_clear_state - clear atomic state * @state: atomic state * - * When the w/w mutex algorithm detects a deadlock we need to back off and drop - * all locks. So someone else could sneak in and change the current modeset - * configuration. Which means that all the state assembled in @state is no - * longer an atomic update to the current state, but to some arbitrary earlier - * state. Which could break assumptions the driver's ->atomic_check likely - * relies on. - * - * Hence we must clear all cached state and completely start over, using this - * function. + * Default implementation for clearing atomic state. + * This is useful for drivers that subclass the atomic state. */ -void drm_atomic_state_clear(struct drm_atomic_state *state) +void __drm_atomic_clear_state(struct drm_atomic_state *state) { struct drm_device *dev = state->dev; struct drm_mode_config *config = &dev->mode_config; @@ -162,6 +176,32 @@ void drm_atomic_state_clear(struct drm_atomic_state *state) state->plane_states[i] = NULL; } } +EXPORT_SYMBOL(__drm_atomic_clear_state); + +/** + * drm_atomic_state_clear - clear state object + * @state: atomic state + * + * When the w/w mutex algorithm detects a deadlock we need to back off and drop + * all locks. So someone else could sneak in and change the current modeset + * configuration. Which means that all the state assembled in @state is no + * longer an atomic update to the current state, but to some arbitrary earlier + * state. Which could break assumptions the driver's ->atomic_check likely + * relies on. + * + * Hence we must clear all cached state and completely start over, using this + * function. + */ +void drm_atomic_state_clear(struct drm_atomic_state *state) +{ + struct drm_device *dev = state->dev; + struct drm_mode_config *config = &dev->mode_config; + + if (config->funcs->atomic_clear_state) + config->funcs->atomic_clear_state(state); + else + __drm_atomic_clear_state(state); +} EXPORT_SYMBOL(drm_atomic_state_clear); /** @@ -181,6 +221,7 @@ void drm_atomic_state_free(struct drm_atomic_state *state) DRM_DEBUG_ATOMIC("Freeing atomic state %p\n", state); kfree_state(state); + kfree(state); } EXPORT_SYMBOL(drm_atomic_state_free); diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index c157103492b0..6125eec6ad79 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -35,6 +35,10 @@ drm_atomic_state_alloc(struct drm_device *dev); void drm_atomic_state_clear(struct drm_atomic_state *state); void drm_atomic_state_free(struct drm_atomic_state *state); +int __must_check +__drm_atomic_new_state(struct drm_device *dev, struct drm_atomic_state *state); +void __drm_atomic_clear_state(struct drm_atomic_state *state); + struct drm_crtc_state * __must_check drm_atomic_get_crtc_state(struct drm_atomic_state *state, struct drm_crtc *crtc); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 0a4a040d6bb7..e5bea3a45484 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -983,6 +983,8 @@ struct drm_mode_set { * @atomic_check: check whether a given atomic state update is possible * @atomic_commit: commit an atomic state update previously verified with * atomic_check() + * @atomic_clear_state: allocate a new atomic state + * @atomic_clear_state: clear the atomic state * * Some global (i.e. not per-CRTC, connector, etc) mode setting functions that * involve drivers. @@ -998,6 +1000,8 @@ struct drm_mode_config_funcs { int (*atomic_commit)(struct drm_device *dev, struct drm_atomic_state *a, bool async); + struct drm_atomic_state *(*atomic_new_state)(struct drm_device *dev); + void (*atomic_clear_state)(struct drm_atomic_state *state); }; /** -- 2.1.0

2 1

[PATCH 1/2] drm/exynos: mixer: don't dump registers under spinlock
by Tobias Jakobi 13 May '15

13 May '15

mixer_regs_dump() was called in mixer_run(), which was called under the register spinlock in mixer_graph_buffer() and vp_video_buffer(). This would trigger a sysmmu pagefault with drm.debug=0xff because of the large delay caused by the register dumping. To keep consistency also move register dumping out of mixer_stop(), which is the counterpart to mixer_run(). Kernel dump: [ 131.296529] [drm:mixer_win_commit] win: 2 [ 131.300693] [drm:mixer_regs_dump] MXR_STATUS = 00000081 [ 131.305888] [drm:mixer_regs_dump] MXR_CFG = 000007d5 [ 131.310835] [drm:mixer_regs_dump] MXR_INT_EN = 00000000 [ 131.316043] [drm:mixer_regs_dump] MXR_INT_STATUS = 00000900 [ 131.321598] [drm:mixer_regs_dump] MXR_LAYER_CFG = 00000321 [ 131.327066] [drm:mixer_regs_dump] MXR_VIDEO_CFG = 00000000 [ 131.332535] [drm:mixer_regs_dump] MXR_GRAPHIC0_CFG = 00310700 [ 131.338263] [drm:mixer_regs_dump] MXR_GRAPHIC0_BASE = 20c00000 [ 131.344079] [drm:mixer_regs_dump] MXR_GRAPHIC0_SPAN = 00000780 [ 131.349895] [drm:mixer_regs_dump] MXR_GRAPHIC0_WH = 07800438 [ 131.355537] [drm:mixer_regs_dump] MXR_GRAPHIC0_SXY = 00000000 [ 131.361265] [drm:mixer_regs_dump] MXR_GRAPHIC0_DXY = 00000000 [ 131.366994] [drm:mixer_regs_dump] MXR_GRAPHIC1_CFG = 00000000 [ 131.372723] [drm:mixer_regs_dump] MXR_GRAPHIC1_BASE = 00000000 [ 131.378539] [drm:mixer_regs_dump] MXR_GRAPHIC1_SPAN = 00000000 [ 131.384354] [drm:mixer_regs_dump] MXR_GRAPHIC1_WH = 00000000 [ 131.389996] [drm:mixer_regs_dump] MXR_GRAPHIC1_SXY = 00000000 [ 131.395725] [drm:mixer_regs_dump] MXR_GRAPHIC1_DXY = 00000000 [ 131.401486] PAGE FAULT occurred at 0x0 by 12e20000.sysmmu(Page table base: 0x6d990000) [ 131.409353] Lv1 entry: 0x6e0f2401 [ 131.412753] ------------[ cut here ]------------ [ 131.417339] kernel BUG at drivers/iommu/exynos-iommu.c:358! [ 131.422894] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM [ 131.428709] Modules linked in: ecb bridge stp llc bnep btrfs xor xor_neon zlib_inflate zlib_deflate raid6_pq btusb bluetooth usb_storage s5p_jpeg videobuf2_dma_contig videobuf2_memops v4l2_mem2mem videobuf2_core [ 131.447461] CPU: 0 PID: 2418 Comm: lt-modetest Tainted: G W 4.0.1-debug+ #3 [ 131.455530] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 131.461607] task: ee194100 ti: ec4fe000 task.ti: ec4fe000 [ 131.466995] PC is at exynos_sysmmu_irq+0x2a0/0x2a8 [ 131.471766] LR is at vprintk_emit+0x268/0x594 [ 131.476103] pc : [<c02781a4>] lr : [<c00650d0>] psr: a00001d3 [ 131.476103] sp : ec4ff9d8 ip : 00000000 fp : ec4ffa14 [ 131.487559] r10: ffffffda r9 : ee206e28 r8 : ee2d1a10 [ 131.492767] r7 : 00000000 r6 : 00000000 r5 : 00000000 r4 : ee206e10 [ 131.499277] r3 : c06fca20 r2 : 00000000 r1 : 00000000 r0 : ee28be00 [ 131.505788] Flags: NzCv IRQs off FIQs off Mode SVC_32 ISA ARM Segment user [ 131.513079] Control: 10c5387d Table: 6c72404a DAC: 00000015 [ 131.518808] Process lt-modetest (pid: 2418, stack limit = 0xec4fe218) [ 131.525231] Stack: (0xec4ff9d8 to 0xec500000) [ 131.529571] f9c0: ec4ff9e4 c03a0c40 [ 131.537732] f9e0: bbfa6e35 6d990000 6d161c3d ee20a900 ee04a7e0 00000028 ee007000 00000000 [ 131.545891] fa00: 00000000 c06fb1fc ec4ffa5c ec4ffa18 c0066a34 c0277f10 ee257664 0000000b [ 131.554050] fa20: ec4ffa5c c06fafbb ee04a780 c06fb1e8 00000000 ee04a780 ee04a7e0 ee20a900 [ 131.562209] fa40: ee007000 00000015 ec4ffb48 ee008000 ec4ffa7c ec4ffa60 c0066c90 c00669e0 [ 131.570369] fa60: 00020000 ee04a780 ee04a7e0 00001000 ec4ffa94 ec4ffa80 c0069c6c c0066c58 [ 131.578528] fa80: 00000028 ee004450 ec4ffaac ec4ffa98 c0066028 c0069bac 000000a0 c06e19b4 [ 131.586687] faa0: ec4ffad4 ec4ffab0 c0223678 c0066000 c02235dc 00000015 00000000 00000015 [ 131.594846] fac0: ec4ffc80 00000001 ec4ffaec ec4ffad8 c0066028 c02235e8 00000089 c06bfc54 [ 131.603005] fae0: ec4ffb1c ec4ffaf0 c006633c c0066000 ec4ffb48 f002000c 00000025 00000015 [ 131.611165] fb00: c06c680c ec4ffb48 f0020000 ee008000 ec4ffb44 ec4ffb20 c000867c c00662c4 [ 131.619324] fb20: c02046ac 60000153 ffffffff ec4ffb7c 00000000 00000101 ec4ffbb4 ec4ffb48 [ 131.627483] fb40: c0013240 c0008650 00000001 ee257508 00000002 00000001 ee257504 ee257508 [ 131.635642] fb60: 00000000 c06bf27c 00000000 00000101 ee008000 ec4ffbb4 00000000 ec4ffb90 [ 131.643802] fb80: c002e124 c02046ac 60000153 ffffffff c002e09c 00000000 c06c6080 00000283 [ 131.651960] fba0: 00000001 c06fb1ac ec4ffc0c ec4ffbb8 c002d690 c002e0a8 ee78d080 ee008000 [ 131.660120] fbc0: 00400000 c04eb3b0 ffff7c44 c06c6100 c06fdac0 0000000a c06bf2f0 c06c6080 [ 131.668279] fbe0: c06bfc54 c06bfc54 00000000 00000025 00000000 00000001 ec4ffc80 ee008000 [ 131.676438] fc00: ec4ffc24 ec4ffc10 c002dbb8 c002d564 00000089 c06bfc54 ec4ffc54 ec4ffc28 [ 131.684597] fc20: c0066340 c002dafc ec4ffc80 f002000c 0000001c 0000000c c06c680c ec4ffc80 [ 131.692757] fc40: f0020000 00000080 ec4ffc7c ec4ffc58 c000867c c00662c4 c04e6624 60000053 [ 131.700916] fc60: ffffffff ec4ffcb4 c072df54 ee22d010 ec4ffcdc ec4ffc80 c0013240 c0008650 [ 131.709075] fc80: ee22d664 ee194100 00000000 ec4fe000 60000053 00000400 00000002 ee22d420 [ 131.717234] fca0: c072df54 ee22d010 00000080 ec4ffcdc ec4ffcc8 ec4ffcc8 c04e6620 c04e6624 [ 131.725393] fcc0: 60000053 ffffffff ec4fe000 c072df54 ec4ffd34 ec4ffce0 c02b64d0 c04e6618 [ 131.733552] fce0: ec4ffcf8 00000000 00000000 60000053 00010000 00010000 00000000 200cb000 [ 131.741712] fd00: 20080000 ee22d664 00000001 ee256000 ee261400 ee22d420 00000080 00000080 [ 131.749871] fd20: ee256000 00000280 ec4ffd74 ec4ffd38 c02a8844 c02b5fec 00000080 00000280 [ 131.758030] fd40: 000001e0 00000000 00000000 00000280 000001e0 ee22d220 01e00000 00000002 [ 131.766189] fd60: ee22d420 ee261400 ec4ffdbc ec4ffd78 c0293cbc c02a87a4 00000080 00000280 [ 131.774348] fd80: 000001e0 00000000 00000000 02800000 01e00000 ee261400 ee22d460 ee261400 [ 131.782508] fda0: ee22d420 00000000 01e00000 000001e0 ec4ffe24 ec4ffdc0 c0297800 c0293b24 [ 131.790667] fdc0: 00000080 00000280 000001e0 00000000 00000000 02800000 01e00000 ec4ffdf8 [ 131.798826] fde0: c028db00 00000080 00000080 ee256000 02800000 00000000 ec4ffe24 c06c6448 [ 131.806985] fe00: c072df54 000000b7 ee013800 ec4ffe54 edbf7300 ec4ffe54 ec4fff04 ec4ffe28 [ 131.815145] fe20: c028a848 c029768c 00000001 c06195d8 ec4ffe5c ec4ffe40 c0297680 c0521f6c [ 131.823304] fe40: 00000030 bed45d38 00000030 c03064b7 ec4ffe8c 00000011 00000015 00000022 [ 131.831463] fe60: 00000000 00000080 00000080 00000280 000001e0 00000000 00000000 01e00000 [ 131.839622] fe80: 02800000 00000000 00000000 0004b000 00000000 00000000 c00121e4 c0011080 [ 131.847781] fea0: c00110a4 00000000 00000000 00000000 ec4ffeec ec4ffec0 c00110f0 c00121cc [ 131.855940] fec0: 00000000 c00e7fec ec4ffeec ec4ffed8 c004af2c dc8ba201 edae4fc0 edbf7000 [ 131.864100] fee0: edbf7000 00000003 bed45d38 00000003 bed45d38 ee3f2040 ec4fff7c ec4fff08 [ 131.872259] ff00: c010b62c c028a684 edae4fc0 00000000 00000000 b6666000 ec40d108 edae4fc4 [ 131.880418] ff20: ec4fff6c ec4fff30 c00e7fec c02207b0 000001f9 00000000 edae5008 ec40d110 [ 131.888577] ff40: 00070800 edae5008 edae4fc0 00070800 b6666000 edbf7000 edbf7000 c03064b7 [ 131.896736] ff60: bed45d38 00000003 ec4fe000 00000000 ec4fffa4 ec4fff80 c010b84c c010b208 [ 131.904896] ff80: 00000022 00000000 bed45d38 c03064b7 00000036 c000ede4 00000000 ec4fffa8 [ 131.913055] ffa0: c000ec40 c010b81c 00000000 bed45d38 00000003 c03064b7 bed45d38 00000022 [ 131.921214] ffc0: 00000000 bed45d38 c03064b7 00000036 00000080 00000080 00000000 000001e0 [ 131.929373] ffe0: b6da4064 bed45d1c b6d98968 b6e8082c 60000050 00000003 00000000 00000000 [ 131.937529] Backtrace: [ 131.939967] [<c0277f04>] (exynos_sysmmu_irq) from [<c0066a34>] (handle_irq_event_percpu+0x60/0x278) [ 131.948988] r10:c06fb1fc r9:00000000 r8:00000000 r7:ee007000 r6:00000028 r5:ee04a7e0 [ 131.956799] r4:ee20a900 [ 131.959320] [<c00669d4>] (handle_irq_event_percpu) from [<c0066c90>] (handle_irq_event+0x44/0x64) [ 131.968170] r10:ee008000 r9:ec4ffb48 r8:00000015 r7:ee007000 r6:ee20a900 r5:ee04a7e0 [ 131.975982] r4:ee04a780 [ 131.978504] [<c0066c4c>] (handle_irq_event) from [<c0069c6c>] (handle_level_irq+0xcc/0x144) [ 131.986832] r6:00001000 r5:ee04a7e0 r4:ee04a780 r3:00020000 [ 131.992478] [<c0069ba0>] (handle_level_irq) from [<c0066028>] (generic_handle_irq+0x34/0x44) [ 132.000894] r5:ee004450 r4:00000028 [ 132.004459] [<c0065ff4>] (generic_handle_irq) from [<c0223678>] (combiner_handle_cascade_irq+0x9c/0x108) [ 132.013914] r4:c06e19b4 r3:000000a0 [ 132.017476] [<c02235dc>] (combiner_handle_cascade_irq) from [<c0066028>] (generic_handle_irq+0x34/0x44) [ 132.026847] r8:00000001 r7:ec4ffc80 r6:00000015 r5:00000000 r4:00000015 r3:c02235dc [ 132.034576] [<c0065ff4>] (generic_handle_irq) from [<c006633c>] (__handle_domain_irq+0x84/0xf0) [ 132.043252] r4:c06bfc54 r3:00000089 [ 132.046815] [<c00662b8>] (__handle_domain_irq) from [<c000867c>] (gic_handle_irq+0x38/0x70) [ 132.055144] r10:ee008000 r9:f0020000 r8:ec4ffb48 r7:c06c680c r6:00000015 r5:00000025 [ 132.062956] r4:f002000c r3:ec4ffb48 [ 132.066520] [<c0008644>] (gic_handle_irq) from [<c0013240>] (__irq_svc+0x40/0x74) [ 132.073980] Exception stack(0xec4ffb48 to 0xec4ffb90) [ 132.079016] fb40: 00000001 ee257508 00000002 00000001 ee257504 ee257508 [ 132.087176] fb60: 00000000 c06bf27c 00000000 00000101 ee008000 ec4ffbb4 00000000 ec4ffb90 [ 132.095333] fb80: c002e124 c02046ac 60000153 ffffffff [ 132.100367] r9:00000101 r8:00000000 r7:ec4ffb7c r6:ffffffff r5:60000153 r4:c02046ac [ 132.108098] [<c002e09c>] (tasklet_hi_action) from [<c002d690>] (__do_softirq+0x138/0x38c) [ 132.116251] r8:c06fb1ac r7:00000001 r6:00000283 r5:c06c6080 r4:00000000 r3:c002e09c [ 132.123980] [<c002d558>] (__do_softirq) from [<c002dbb8>] (irq_exit+0xc8/0x104) [ 132.131268] r10:ee008000 r9:ec4ffc80 r8:00000001 r7:00000000 r6:00000025 r5:00000000 [ 132.139080] r4:c06bfc54 [ 132.141600] [<c002daf0>] (irq_exit) from [<c0066340>] (__handle_domain_irq+0x88/0xf0) [ 132.149409] r4:c06bfc54 r3:00000089 [ 132.152971] [<c00662b8>] (__handle_domain_irq) from [<c000867c>] (gic_handle_irq+0x38/0x70) [ 132.161300] r10:00000080 r9:f0020000 r8:ec4ffc80 r7:c06c680c r6:0000000c r5:0000001c [ 132.169112] r4:f002000c r3:ec4ffc80 [ 132.172675] [<c0008644>] (gic_handle_irq) from [<c0013240>] (__irq_svc+0x40/0x74) [ 132.180137] Exception stack(0xec4ffc80 to 0xec4ffcc8) [ 132.185173] fc80: ee22d664 ee194100 00000000 ec4fe000 60000053 00000400 00000002 ee22d420 [ 132.193332] fca0: c072df54 ee22d010 00000080 ec4ffcdc ec4ffcc8 ec4ffcc8 c04e6620 c04e6624 [ 132.201489] fcc0: 60000053 ffffffff [ 132.204961] r9:ee22d010 r8:c072df54 r7:ec4ffcb4 r6:ffffffff r5:60000053 r4:c04e6624 [ 132.212694] [<c04e660c>] (_raw_spin_unlock_irqrestore) from [<c02b64d0>] (mixer_win_commit+0x4f0/0xcc8) [ 132.222060] r4:c072df54 r3:ec4fe000 [ 132.225625] [<c02b5fe0>] (mixer_win_commit) from [<c02a8844>] (exynos_update_plane+0xac/0xb8) [ 132.234126] r10:00000280 r9:ee256000 r8:00000080 r7:00000080 r6:ee22d420 r5:ee261400 [ 132.241937] r4:ee256000 [ 132.244461] [<c02a8798>] (exynos_update_plane) from [<c0293cbc>] (__setplane_internal+0x1a4/0x2c0) [ 132.253395] r7:ee261400 r6:ee22d420 r5:00000002 r4:01e00000 [ 132.259041] [<c0293b18>] (__setplane_internal) from [<c0297800>] (drm_mode_setplane+0x180/0x244) [ 132.267804] r9:000001e0 r8:01e00000 r7:00000000 r6:ee22d420 r5:ee261400 r4:ee22d460 [ 132.275535] [<c0297680>] (drm_mode_setplane) from [<c028a848>] (drm_ioctl+0x1d0/0x58c) [ 132.283428] r10:ec4ffe54 r9:edbf7300 r8:ec4ffe54 r7:ee013800 r6:000000b7 r5:c072df54 [ 132.291240] r4:c06c6448 [ 132.293763] [<c028a678>] (drm_ioctl) from [<c010b62c>] (do_vfs_ioctl+0x430/0x614) [ 132.301222] r10:ee3f2040 r9:bed45d38 r8:00000003 r7:bed45d38 r6:00000003 r5:edbf7000 [ 132.309034] r4:edbf7000 [ 132.311555] [<c010b1fc>] (do_vfs_ioctl) from [<c010b84c>] (SyS_ioctl+0x3c/0x64) [ 132.318842] r10:00000000 r9:ec4fe000 r8:00000003 r7:bed45d38 r6:c03064b7 r5:edbf7000 [ 132.326654] r4:edbf7000 [ 132.329176] [<c010b810>] (SyS_ioctl) from [<c000ec40>] (ret_fast_syscall+0x0/0x34) [ 132.336723] r8:c000ede4 r7:00000036 r6:c03064b7 r5:bed45d38 r4:00000000 r3:00000022 [ 132.344451] Code: e3130002 0affffaf eb09a67d eaffffad (e7f001f2) [ 132.350528] ---[ end trace d428689b94df895c ]--- [ 132.355126] Kernel panic - not syncing: Fatal exception in interrupt [ 132.361465] CPU2: stopping [ 132.364155] CPU: 2 PID: 0 Comm: swapper/2 Tainted: G D W 4.0.1-debug+ #3 [ 132.371791] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 132.377866] Backtrace: [ 132.380304] [<c0012484>] (dump_backtrace) from [<c001269c>] (show_stack+0x18/0x1c) [ 132.387849] r6:c06e158c r5:ffffffff r4:00000000 r3:dc8ba201 [ 132.393497] [<c0012684>] (show_stack) from [<c04dfb94>] (dump_stack+0x88/0xc8) [ 132.400698] [<c04dfb0c>] (dump_stack) from [<c0014894>] (handle_IPI+0x1c8/0x2c4) [ 132.408073] r6:c06bfc54 r5:c06bfc54 r4:00000005 r3:ee0b0000 [ 132.413718] [<c00146cc>] (handle_IPI) from [<c00086b0>] (gic_handle_irq+0x6c/0x70) [ 132.421267] r9:f0028000 r8:ee0b1f48 r7:c06c680c r6:fffffff5 r5:00000005 r4:f002800c [ 132.428995] [<c0008644>] (gic_handle_irq) from [<c0013240>] (__irq_svc+0x40/0x74) [ 132.436457] Exception stack(0xee0b1f48 to 0xee0b1f90) [ 132.441493] 1f40: 00000001 00000000 00000000 c00206c0 c06c6518 c04eb3a4 [ 132.449653] 1f60: 00000000 00000000 c06c0dc0 00000001 c06fb774 ee0b1f9c ee0b1fa0 ee0b1f90 [ 132.457811] 1f80: c000f82c c000f830 600f0053 ffffffff [ 132.462844] r9:00000001 r8:c06c0dc0 r7:ee0b1f7c r6:ffffffff r5:600f0053 r4:c000f830 [ 132.470575] [<c000f7f0>] (arch_cpu_idle) from [<c005b6e8>] (cpu_startup_entry+0x318/0x4ec) [ 132.478818] [<c005b3d0>] (cpu_startup_entry) from [<c00144d0>] (secondary_start_kernel+0xf4/0x100) [ 132.487755] r7:c06fd440 [ 132.490279] [<c00143dc>] (secondary_start_kernel) from [<40008744>] (0x40008744) [ 132.497651] r4:6e09006a r3:c000872c [ 132.501210] CPU3: stopping [ 132.503904] CPU: 3 PID: 0 Comm: swapper/3 Tainted: G D W 4.0.1-debug+ #3 [ 132.511539] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 132.517614] Backtrace: [ 132.520051] [<c0012484>] (dump_backtrace) from [<c001269c>] (show_stack+0x18/0x1c) [ 132.527597] r6:c06e158c r5:ffffffff r4:00000000 r3:dc8ba201 [ 132.533243] [<c0012684>] (show_stack) from [<c04dfb94>] (dump_stack+0x88/0xc8) [ 132.540446] [<c04dfb0c>] (dump_stack) from [<c0014894>] (handle_IPI+0x1c8/0x2c4) [ 132.547820] r6:c06bfc54 r5:c06bfc54 r4:00000005 r3:ee0b2000 [ 132.553466] [<c00146cc>] (handle_IPI) from [<c00086b0>] (gic_handle_irq+0x6c/0x70) [ 132.561014] r9:f002c000 r8:ee0b3f48 r7:c06c680c r6:fffffff5 r5:00000005 r4:f002c00c [ 132.568743] [<c0008644>] (gic_handle_irq) from [<c0013240>] (__irq_svc+0x40/0x74) [ 132.576205] Exception stack(0xee0b3f48 to 0xee0b3f90) [ 132.581241] 3f40: 00000001 00000000 00000000 c00206c0 c06c6518 c04eb3a4 [ 132.589401] 3f60: 00000000 00000000 c06c0dc0 00000001 c06fb774 ee0b3f9c ee0b3fa0 ee0b3f90 [ 132.597558] 3f80: c000f82c c000f830 600f0053 ffffffff [ 132.602591] r9:00000001 r8:c06c0dc0 r7:ee0b3f7c r6:ffffffff r5:600f0053 r4:c000f830 [ 132.610321] [<c000f7f0>] (arch_cpu_idle) from [<c005b6e8>] (cpu_startup_entry+0x318/0x4ec) [ 132.618566] [<c005b3d0>] (cpu_startup_entry) from [<c00144d0>] (secondary_start_kernel+0xf4/0x100) [ 132.627503] r7:c06fd440 [ 132.630023] [<c00143dc>] (secondary_start_kernel) from [<40008744>] (0x40008744) [ 132.637399] r4:6e09006a r3:c000872c [ 132.640958] CPU1: stopping [ 132.643651] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G D W 4.0.1-debug+ #3 [ 132.651287] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 132.657362] Backtrace: [ 132.659799] [<c0012484>] (dump_backtrace) from [<c001269c>] (show_stack+0x18/0x1c) [ 132.667344] r6:c06e158c r5:ffffffff r4:00000000 r3:dc8ba201 [ 132.672991] [<c0012684>] (show_stack) from [<c04dfb94>] (dump_stack+0x88/0xc8) [ 132.680194] [<c04dfb0c>] (dump_stack) from [<c0014894>] (handle_IPI+0x1c8/0x2c4) [ 132.687569] r6:c06bfc54 r5:c06bfc54 r4:00000005 r3:ee0ae000 [ 132.693214] [<c00146cc>] (handle_IPI) from [<c00086b0>] (gic_handle_irq+0x6c/0x70) [ 132.700762] r9:f0024000 r8:ee0aff48 r7:c06c680c r6:fffffff5 r5:00000005 r4:f002400c [ 132.708491] [<c0008644>] (gic_handle_irq) from [<c0013240>] (__irq_svc+0x40/0x74) [ 132.715953] Exception stack(0xee0aff48 to 0xee0aff90) [ 132.720989] ff40: 00000001 00000000 00000000 c00206c0 c06c6518 c04eb3a4 [ 132.729149] ff60: 00000000 00000000 c06c0dc0 00000001 c06fb774 ee0aff9c ee0affa0 ee0aff90 [ 132.737306] ff80: c000f82c c000f830 60070053 ffffffff [ 132.742339] r9:00000001 r8:c06c0dc0 r7:ee0aff7c r6:ffffffff r5:60070053 r4:c000f830 [ 132.750069] [<c000f7f0>] (arch_cpu_idle) from [<c005b6e8>] (cpu_startup_entry+0x318/0x4ec) [ 132.758314] [<c005b3d0>] (cpu_startup_entry) from [<c00144d0>] (secondary_start_kernel+0xf4/0x100) [ 132.767251] r7:c06fd440 [ 132.769772] [<c00143dc>] (secondary_start_kernel) from [<40008744>] (0x40008744) [ 132.777146] r4:6e09006a r3:c000872c [ 132.780709] ---[ end Kernel panic - not syncing: Fatal exception in interrupt Signed-off-by: Tobias Jakobi <tjakobi(a)math.uni-bielefeld.de> --- drivers/gpu/drm/exynos/exynos_mixer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 1a07fdd..ff15702 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -365,8 +365,6 @@ static void mixer_run(struct mixer_context *ctx) struct mixer_resources *res = &ctx->mixer_res; mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_REG_RUN); - - mixer_regs_dump(ctx); } static void mixer_stop(struct mixer_context *ctx) @@ -379,8 +377,6 @@ static void mixer_stop(struct mixer_context *ctx) while (!(mixer_reg_read(res, MXR_STATUS) & MXR_STATUS_REG_IDLE) && --timeout) usleep_range(10000, 12000); - - mixer_regs_dump(ctx); } static void vp_video_buffer(struct mixer_context *ctx, int win) @@ -480,6 +476,7 @@ static void vp_video_buffer(struct mixer_context *ctx, int win) mixer_vsync_set_update(ctx, true); spin_unlock_irqrestore(&res->reg_slock, flags); + mixer_regs_dump(ctx); vp_regs_dump(ctx); } @@ -620,6 +617,8 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win) mixer_vsync_set_update(ctx, true); spin_unlock_irqrestore(&res->reg_slock, flags); + + mixer_regs_dump(ctx); } static void vp_win_reset(struct mixer_context *ctx) @@ -1073,6 +1072,7 @@ static void mixer_poweroff(struct mixer_context *ctx) mutex_unlock(&ctx->mixer_mutex); mixer_stop(ctx); + mixer_regs_dump(ctx); mixer_window_suspend(ctx); ctx->int_en = mixer_reg_read(res, MXR_INT_EN); -- 2.0.5

4 6

[Bug 90421] DOTA2 when selecting naga clones locks GPU
by bugzilla-daemon＠freedesktop.org 13 May '15

13 May '15

https://bugs.freedesktop.org/show_bug.cgi?id=90421 Bug ID: 90421 Summary: DOTA2 when selecting naga clones locks GPU Product: Mesa Version: 10.5 Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: hypnodreams(a)gmail.com QA Contact: dri-devel(a)lists.freedesktop.org DE Cinnamon GC AMD 7870HD GHZ edition OS Arch Linux kernel 4.0.1-1 mesa-10.5.4-1 & mesa 10.5.5-1 (may effect many others) Dota2 locks GPU when trying to select a naga siren clone, this happens with either her skill or a manta sytle it hard locks mesa, It should be noted other characters can use manta without the crash. Steps to reproduce. 1.) run steam, dota2 2.) start any game with naga siren 3.) cast skill 1 (or buy a mantastyle) and select any or all clone(s) Some useful bits from a pipe... Steam: An X Error occurred X Error of failed request: BadWindow (invalid Window parameter) Major opcode of failed request: 40 (X_TranslateCoords) Resource id in failed request: 0x1212f7b Serial number of failed request: 7617 xerror_handler: X failed, continuing Installing breakpad exception handler for appid(dota_linux)/version(1.0) Looking up breakpad interfaces from steamclient Calling BreakpadMiniDumpSystemInit Steam_SetMinidumpSteamID: Caching Steam ID: xxx [API loaded yes] Steam_SetMinidumpSteamID: Setting Steam ID: xxx [0512/103641:ERROR:renderer_main.cc(227)] Running without renderer sandbox radeon: The kernel rejected CS, see dmesg for more information. steamwebhelper: Fatal IO error 11 (Resource temporarily unavailable) on X server :0.0. Fatal IO error 11 (Resource temporarily unavailable) on X server :0.0. XIO: fatal IO error 11 (Resource temporarily unavailable) on X server ":0.0" after 5698 requests (5698 known processed) with 671 events remaining. Assert( Assertion Failed: CFileWriterThread: pending file writer content_log.txt ):/home/buildbot/buildslave/steam_rel_client_linux/build/src/tier1/../tier1/fileio.cpp:4008 I haven't been able to get any errors to log and maybe have to start a ssh server to grab a dmesg log. -- You are receiving this mail because: You are the assignee for the bug.

1 3

[PATCH v3] dma-buf: add ref counting for module as exporter
by Sumit Semwal 12 May '15

12 May '15

Add reference counting on a kernel module that exports dma-buf and implements its operations. This prevents the module from being unloaded while DMABUF file is in use. The original patch [1] was submitted by Tomasz Stanislawski, but this is a simpler way to do it. v3: call module_put() as late as possible, per gregkh's comment. v2: move owner to struct dma_buf, and use DEFINE_DMA_BUF_EXPORT_INFO macro to simplify the change. Signed-off-by: Sumit Semwal <sumit.semwal(a)linaro.org> [1]: https://lkml.org/lkml/2012/8/8/163 --- drivers/dma-buf/dma-buf.c | 10 +++++++++- include/linux/dma-buf.h | 10 ++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index c5a9138a6a8d..63a9914e42b8 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -29,6 +29,7 @@ #include <linux/anon_inodes.h> #include <linux/export.h> #include <linux/debugfs.h> +#include <linux/module.h> #include <linux/seq_file.h> #include <linux/poll.h> #include <linux/reservation.h> @@ -72,6 +73,7 @@ static int dma_buf_release(struct inode *inode, struct file *file) if (dmabuf->resv == (struct reservation_object *)&dmabuf[1]) reservation_object_fini(dmabuf->resv); + module_put(dmabuf->owner); kfree(dmabuf); return 0; } @@ -302,14 +304,20 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) return ERR_PTR(-EINVAL); } + if (!try_module_get(exp_info->owner)) + return ERR_PTR(-ENOENT); + dmabuf = kzalloc(alloc_size, GFP_KERNEL); - if (dmabuf == NULL) + if (!dmabuf) { + module_put(exp_info->owner); return ERR_PTR(-ENOMEM); + } dmabuf->priv = exp_info->priv; dmabuf->ops = exp_info->ops; dmabuf->size = exp_info->size; dmabuf->exp_name = exp_info->exp_name; + dmabuf->owner = exp_info->owner; init_waitqueue_head(&dmabuf->poll); dmabuf->cb_excl.poll = dmabuf->cb_shared.poll = &dmabuf->poll; dmabuf->cb_excl.active = dmabuf->cb_shared.active = 0; diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 2f0b431b73e0..f98bd7068d55 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -115,6 +115,8 @@ struct dma_buf_ops { * @attachments: list of dma_buf_attachment that denotes all devices attached. * @ops: dma_buf_ops associated with this buffer object. * @exp_name: name of the exporter; useful for debugging. + * @owner: pointer to exporter module; used for refcounting when exporter is a + * kernel module. * @list_node: node for dma_buf accounting and debugging. * @priv: exporter specific private data for this buffer object. * @resv: reservation object linked to this dma-buf @@ -129,6 +131,7 @@ struct dma_buf { unsigned vmapping_counter; void *vmap_ptr; const char *exp_name; + struct module *owner; struct list_head list_node; void *priv; struct reservation_object *resv; @@ -164,7 +167,8 @@ struct dma_buf_attachment { /** * struct dma_buf_export_info - holds information needed to export a dma_buf - * @exp_name: name of the exporting module - useful for debugging. + * @exp_name: name of the exporter - useful for debugging. + * @owner: pointer to exporter module - used for refcounting kernel module * @ops: Attach allocator-defined dma buf ops to the new buffer * @size: Size of the buffer * @flags: mode flags for the file @@ -176,6 +180,7 @@ struct dma_buf_attachment { */ struct dma_buf_export_info { const char *exp_name; + struct module *owner; const struct dma_buf_ops *ops; size_t size; int flags; @@ -187,7 +192,8 @@ struct dma_buf_export_info { * helper macro for exporters; zeros and fills in most common values */ #define DEFINE_DMA_BUF_EXPORT_INFO(a) \ - struct dma_buf_export_info a = { .exp_name = KBUILD_MODNAME } + struct dma_buf_export_info a = { .exp_name = KBUILD_MODNAME, \ + .owner = THIS_MODULE } /** * get_dma_buf - convenience wrapper for get_file. -- 1.9.1

2 1

[PATCH v2] drm: Implement drmHandleEvent2()
by Tobias Jakobi 12 May '15

12 May '15

Basically this is an extended version of drmHandleEvent(). drmHandleEvent() only handles core events (like e.g. page flips), but since kernel DRM drivers might use vendor-specific events to signal userspace the completion of pending jobs, etc., its desirable to provide a way to handle these without putting vendor-specific code in the core libdrm. To use this you provide drmHandleEvent2() with a function that handles your non-core events. The signature of that function looks like this: void vendor(int fd, struct drm_event *e, void *ctx); 'fd' is the DRM file descriptor, 'e' the non-core event and 'ctx' the event context (casted to void). This way we don't have to maintain a copy of drmHandleEvent() in the vendor code. v2: Remove the opaque pointer, since this can be better handled with a container approach. Signed-off-by: Tobias Jakobi <tjakobi(a)math.uni-bielefeld.de> --- xf86drm.h | 21 +++++++++++++++++++++ xf86drmMode.c | 10 +++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/xf86drm.h b/xf86drm.h index 40c55c9..e9d632d 100644 --- a/xf86drm.h +++ b/xf86drm.h @@ -741,8 +741,29 @@ typedef struct _drmEventContext { } drmEventContext, *drmEventContextPtr; +typedef void (*drmEventVendorHandler)(int fd, struct drm_event *e, void *ctx); + extern int drmHandleEvent(int fd, drmEventContextPtr evctx); +/* + * drmHandleEvent2() is an extended variant of drmHandleEvent() which + * allows handling of vendor-specific/non-core events. + * The function pointer 'vendorhandler' is used (if non-zero) to + * process non-core events. Users of have to prepare a container struct + * in the following way: + * + * struct vendor_event_context { + * drmEventContext base; + * int vendor_specific_data[num]; + * }; + * + * And then call: + * struct vendor_event_context ctx = {0}; + * drmHandleEvent2(fd, &ctx.base, handler); + */ +extern int drmHandleEvent2(int fd, drmEventContextPtr evctx, + drmEventVendorHandler vendorhandler); + extern char *drmGetDeviceNameFromFd(int fd); extern int drmGetNodeTypeFromFd(int fd); diff --git a/xf86drmMode.c b/xf86drmMode.c index 1333da4..675fd15 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -857,7 +857,8 @@ int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size, return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETGAMMA, &l); } -int drmHandleEvent(int fd, drmEventContextPtr evctx) +int drmHandleEvent2(int fd, drmEventContextPtr evctx, + drmEventVendorHandler vendorhandler) { char buffer[1024]; int len, i; @@ -900,6 +901,8 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx) U642VOID (vblank->user_data)); break; default: + if (vendorhandler) + vendorhandler(fd, e, evctx); break; } i += e->length; @@ -908,6 +911,11 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx) return 0; } +int drmHandleEvent(int fd, drmEventContextPtr evctx) +{ + return drmHandleEvent2(fd, evctx, NULL); +} + int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id, uint32_t flags, void *user_data) { -- 2.0.5

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2015