dri-devel December 2014

dri-devel@lists.freedesktop.org

156 participants
1053 discussions

[PATCH] amdkfd/process: init aperture once per process
by Oded Gabbay 10 Dec '14

10 Dec '14

From: Alexey Skidanov <Alexey.Skidanov(a)amd.com> Since the user space may call open() more that once from the same process, the aperture initialization should be moved from kfd_open() Signed-off-by: Alexey Skidanov <Alexey.Skidanov(a)amd.com> Reviewed-by: Oded Gabbay <oded.gabbay(a)amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ---- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 6 ++---- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 9 +++++++++ 3 files … [View More]changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index 4f7b275..7d4974b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -121,13 +121,9 @@ static int kfd_open(struct inode *inode, struct file *filep) if (IS_ERR(process)) return PTR_ERR(process); - process->is_32bit_user_mode = is_32bit_user_mode; - dev_dbg(kfd_device, "process %d opened, compat mode (32 bit) - %d\n", process->pasid, process->is_32bit_user_mode); - kfd_init_apertures(process); - return 0; } diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c index 66df4da..e64aa99 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c @@ -299,13 +299,13 @@ int kfd_init_apertures(struct kfd_process *process) struct kfd_dev *dev; struct kfd_process_device *pdd; - mutex_lock(&process->mutex); - /*Iterating over all devices*/ while ((dev = kfd_topology_enum_kfd_devices(id)) != NULL && id < NUM_OF_SUPPORTED_GPUS) { pdd = kfd_get_process_device_data(dev, process, 1); + if (!pdd) + return -1; /* * For 64 bit process aperture will be statically reserved in @@ -348,8 +348,6 @@ int kfd_init_apertures(struct kfd_process *process) id++; } - mutex_unlock(&process->mutex); - return 0; } diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index b85eb0b..3c76ef0 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -26,6 +26,8 @@ #include <linux/slab.h> #include <linux/amd-iommu.h> #include <linux/notifier.h> +#include <linux/compat.h> + struct mm_struct; #include "kfd_priv.h" @@ -285,8 +287,15 @@ static struct kfd_process *create_process(const struct task_struct *thread) if (err != 0) goto err_process_pqm_init; + /* init process apertures*/ + process->is_32bit_user_mode = is_compat_task(); + if (kfd_init_apertures(process) != 0) + goto err_init_apretures; + return process; +err_init_apretures: + pqm_uninit(&process->pqm); err_process_pqm_init: hash_del_rcu(&process->kfd_processes); synchronize_rcu(); -- 1.9.1 [View Less]

1 0

[PATCH 1/5] drm/armada: Remove dummy ->load_lut() implementation
by Thierry Reding 10 Dec '14

10 Dec '14

From: Thierry Reding <treding(a)nvidia.com> The ->load_lut() callback is optional, therefore a dummy implementation is not needed. Cc: Russell King <rmk+kernel(a)arm.linux.org.uk> Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- drivers/gpu/drm/armada/armada_crtc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index e3a7a5078e5c..42d2ffa08716 100644 --- a/drivers/gpu/drm/armada/… [View More]

2 5

[PULL] topic/core-stuff
by Daniel Vetter 10 Dec '14

10 Dec '14

Hi Dave, Decided to send a pull request for my misc drm branch because of teh memset patch from Thierry for drm_*_cleanup functions (fixes drivers using deferred probe) and the patch from Takashi. Everything else fairly trivial. Cheers, Daniel The following changes since commit e5b5341c28c66a122982d3d8822a4f9a0938f923: drm/atomic: clear plane's CRTC and FB when shutting down (2014-11-27 15:39:11 +0100) are available in the git repository at: git://anongit.freedesktop.org/drm-intel … [View More]

1 0

[PATCH] drm: Zero out DRM object memory upon cleanup
by Thierry Reding 10 Dec '14

10 Dec '14

From: Thierry Reding <treding(a)nvidia.com> Drivers where the DRM objects have a lifetime that extends beyond that of the DRM device need to zero out the DRM object memory to void stale data such as properties. The DRM core code expects to operate on newly allocated and zeroed out objects and will behave unexpectedly, such as add duplicate properties, otherwise. Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- drivers/gpu/drm/drm_crtc.c | 11 ++++++++++- 1 file changed, … [View More]

3 2

[PATCH 0/20] fix misspelling of current function in string
by Julia Lawall 10 Dec '14

10 Dec '14

These patches replace what appears to be a reference to the name of the current function but is misspelled in some way by either the name of the function itself, or by %s and then __func__ in an argument list. // <smpl> // sudo apt-get install python-pip // sudo pip install python-Levenshtein // spatch requires the argument --in-place virtual after_start @initialize:ocaml@ @@ let extensible_functions = ref ([] : string list) let restarted = ref false let restart _ = restarted := … [View More]true; let it = new iteration() in it#add_virtual_rule After_start; Printf.eprintf "restarting\n"; it#register() @initialize:python@ @@ import re from Levenshtein import distance mindist = 1 // 1 to find only misspellings maxdist = 2 ignore_leading = True // --------------------------------------------------------------------- @r0@ constant char [] c; identifier f; @@ f(...,c,...) @script:ocaml@ c << r0.c; f << r0.f; @@ (if not !restarted then restart()); match Str.split_delim (Str.regexp "%") c with _::_::_ -> if not (List.mem f !extensible_functions) then extensible_functions := f :: !extensible_functions | _ -> () // --------------------------------------------------------------------- @r depends on after_start@ constant char [] c; position p; identifier f; @@ f(...,c@p,...) @script:python flt@ c << r.c; p << r.p; matched; @@ func = p[0].current_element wpattern = "[a-zA-Z_][a-zA-Z0-9_]*" if ignore_leading: func = func.strip("_") wpattern = "[a-zA-Z][a-zA-Z0-9_]*" lf = len(func) cocci.include_match(False) // ignore extremely short function names if lf > 3: words = [w for w in re.findall(wpattern, c) if abs(len(w) - lf) <= maxdist] for w in words: d = distance(w, func) if mindist <= d and d <= maxdist: coccinelle.matched = w cocci.include_match(True) //print "%s:%d:%s():%d: %s" % (p[0].file, int(p[0].line), func, d, c) break @script:ocaml r2@ c << r.c; f << r.f; matched << flt.matched; fixed; @@ let pieces = Str.split_delim (Str.regexp_string matched) c in match pieces with [before;after] -> let preceeding = List.length(Str.split (Str.regexp_string "%") before) > 1 in if preceeding then Coccilib.include_match false else if List.mem f !extensible_functions then fixed := before ^ "%s" ^ after else Coccilib.include_match false | _ -> Coccilib.include_match false @changed1@ constant char [] r.c; identifier r2.fixed; position r.p; identifier r.f; @@ f(..., -c@p +fixed,__func__ ,...) // ------------------------------------------------------------------- @s depends on after_start@ constant char [] c; position p; identifier f; @@ f(...,c@p,...) @script:python flt2@ c << s.c; p << s.p; matched; @@ func = p[0].current_element wpattern = "[a-zA-Z_][a-zA-Z0-9_]*" if ignore_leading: func = func.strip("_") wpattern = "[a-zA-Z][a-zA-Z0-9_]*" lf = len(func) cocci.include_match(False) // ignore extremely short function names if lf > 3: words = [w for w in re.findall(wpattern, c) if abs(len(w) - lf) <= maxdist] for w in words: d = distance(w, func) if mindist <= d and d <= maxdist: coccinelle.matched = w cocci.include_match(True) //print "%s:%d:%s():%d: %s" % (p[0].file, int(p[0].line), func, d, c) break @script:ocaml s2@ c << s.c; f << s.f; p << s.p; matched << flt2.matched; fixed; @@ let ce = (List.hd p).current_element in let pieces = Str.split_delim (Str.regexp_string matched) c in match pieces with [before;after] -> let preceeding = List.length(Str.split (Str.regexp_string "%") before) > 1 in if preceeding then Coccilib.include_match false else if List.mem f !extensible_functions then Coccilib.include_match false else fixed := before ^ ce ^ after | _ -> Coccilib.include_match false @changed2@ constant char [] s.c; identifier s2.fixed; position s.p; identifier s.f; @@ f(..., -c@p +fixed ,...) // </smpl> [View Less]

7 11

linux-next: manual merge of the drm-misc tree with the tree
by Stephen Rothwell 10 Dec '14

10 Dec '14

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in drivers/gpu/drm/drm_edid.c between commit 40d9b043a89e ("drm/connector: store tile information from displayid (v3)") from the drm tree and commit d6885d659037 ("drm/edid: move drm_edid_is_zero to top, make edid argument const") and c465bbc87ce3 ("drm/edid: new drm_edid_block_checksum helper function V3") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- … [View More]Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc drivers/gpu/drm/drm_edid.c index 72fd8820e186,21cc45cf3367..000000000000 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@@ -1015,8 -1014,24 +1015,27 @@@ module_param_named(edid_fixup, edid_fix MODULE_PARM_DESC(edid_fixup, "Minimum number of valid EDID header bytes (0-8, default 6)"); +static void drm_get_displayid(struct drm_connector *connector, + struct edid *edid); ++ + static int drm_edid_block_checksum(const u8 *raw_edid) + { + int i; + u8 csum = 0; + for (i = 0; i < EDID_LENGTH; i++) + csum += raw_edid[i]; + + return csum; + } + + static bool drm_edid_is_zero(const u8 *in_edid, int length) + { + if (memchr_inv(in_edid, 0, length)) + return false; + + return true; + } + /** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block @@@ -1179,34 -1196,8 +1200,26 @@@ drm_do_probe_ddc_edid(void *data, u8 *b return ret == xfers ? 0 : -1; } - static bool drm_edid_is_zero(u8 *in_edid, int length) - { - if (memchr_inv(in_edid, 0, length)) - return false; - - return true; - } - -static u8 * -drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) +/** + * drm_do_get_edid - get EDID data using a custom EDID block read function + * @connector: connector we're probing + * @get_edid_block: EDID block read function + * @data: private data passed to the block read function + * + * When the I2C adapter connected to the DDC bus is hidden behind a device that + * exposes a different interface to read EDID blocks this function can be used + * to get EDID data using a custom block read function. + * + * As in the general case the DDC bus is accessible by the kernel at the I2C + * level, drivers must make all reasonable efforts to expose it as an I2C + * adapter and use drm_get_edid() instead of abusing this function. + * + * Return: Pointer to valid EDID or NULL if we couldn't find any. + */ +struct edid *drm_do_get_edid(struct drm_connector *connector, + int (*get_edid_block)(void *data, u8 *buf, unsigned int block, + size_t len), + void *data) { int i, j = 0, valid_extensions = 0; u8 *block, *new; [View Less]

1 0

[Bug 87172] UHD 4K (DisplayPort 1.2) monitor autodetects at 60Hz on Radeon 5870, which fails as this card doesn't support DP1.2
by bugzilla-daemon＠freedesktop.org 10 Dec '14

10 Dec '14

1 0

linux-next: manual merge of the drm-misc tree with the drm tree
by Stephen Rothwell 10 Dec '14

10 Dec '14

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in Documentation/DocBook/drm.tmpl between commit 6f134d7bb434 ("drm/tile: expose the tile property to userspace (v3)") from the drm tree and commit e2beb6cd5d0f ("drm/Documentation: Fix rowspan value in drm-kms-properties") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc … [View More]

1 0

[PATCH] modetest: Allocate dumb buffers with the correct bpp
by Laurent Pinchart 09 Dec '14

09 Dec '14

The modetest application uses libkms to allocate dumb buffers, leading to overallocation due to the hardcoded 32 bpp value. This can even cause failures in drivers when the resulting pitch is too large for the hardware to handle and gets rejected by the driver when creating the frame buffer. Fix this by computing the required bpp value and allocating dumb buffers directly without going through libkms. Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> --- tests/… [View More]modetest/Android.mk | 2 +- tests/modetest/Makefile.am | 2 - tests/modetest/buffers.c | 216 ++++++++++++++++++++++++++++++++++++--------- tests/modetest/buffers.h | 6 +- tests/modetest/modetest.c | 45 +++++----- 5 files changed, 197 insertions(+), 74 deletions(-) diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index 0a32b5f..aee3564 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk @@ -9,6 +9,6 @@ LOCAL_MODULE := modetest LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm -LOCAL_SHARED_LIBRARIES := libdrm libkms +LOCAL_SHARED_LIBRARIES := libdrm include $(BUILD_EXECUTABLE) diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am index 8fc924a..93820fa 100644 --- a/tests/modetest/Makefile.am +++ b/tests/modetest/Makefile.am @@ -4,7 +4,6 @@ AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) AM_CFLAGS += \ -I$(top_srcdir)/include/drm \ - -I$(top_srcdir)/libkms/ \ -I$(top_srcdir) if HAVE_INSTALL_TESTS @@ -19,7 +18,6 @@ modetest_SOURCES = $(MODETEST_FILES) modetest_LDADD = \ $(top_builddir)/libdrm.la \ - $(top_builddir)/libkms/libkms.la \ -lpthread if HAVE_CAIRO diff --git a/tests/modetest/buffers.c b/tests/modetest/buffers.c index e725c32..e4e8149 100644 --- a/tests/modetest/buffers.c +++ b/tests/modetest/buffers.c @@ -34,9 +34,13 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> +#include <sys/ioctl.h> +#include "drm.h" #include "drm_fourcc.h" -#include "libkms.h" + +#include "libdrm.h" +#include "xf86drm.h" #include "buffers.h" @@ -47,6 +51,16 @@ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +struct bo +{ + int fd; + void *ptr; + size_t size; + size_t offset; + size_t pitch; + unsigned handle; +}; + /* ----------------------------------------------------------------------------- * Formats */ @@ -1001,48 +1015,82 @@ fill_pattern(unsigned int format, enum fill_pattern pattern, void *planes[3], * Buffers management */ -static struct kms_bo * -allocate_buffer(struct kms_driver *kms, unsigned int width, unsigned int height, - unsigned int *stride) +static struct bo * +bo_create_dumb(int fd, unsigned int width, unsigned int height, unsigned int bpp) { - struct kms_bo *bo; - unsigned bo_attribs[] = { - KMS_WIDTH, 0, - KMS_HEIGHT, 0, - KMS_BO_TYPE, KMS_BO_TYPE_SCANOUT_X8R8G8B8, - KMS_TERMINATE_PROP_LIST - }; + struct drm_mode_create_dumb arg; + struct bo *bo; int ret; - bo_attribs[1] = width; - bo_attribs[3] = height; - - ret = kms_bo_create(kms, bo_attribs, &bo); - if (ret) { - fprintf(stderr, "failed to alloc buffer: %s\n", - strerror(-ret)); + bo = malloc(sizeof(*bo)); + if (bo == NULL) { + fprintf(stderr, "failed to allocate buffer object\n"); return NULL; } - ret = kms_bo_get_prop(bo, KMS_PITCH, stride); + memset(&arg, 0, sizeof(arg)); + arg.bpp = bpp; + arg.width = width; + arg.height = height; + + ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg); if (ret) { - fprintf(stderr, "failed to retreive buffer stride: %s\n", - strerror(-ret)); - kms_bo_destroy(&bo); + fprintf(stderr, "failed to create dumb buffer: %s\n", + strerror(errno)); + free(bo); return NULL; } + bo->fd = fd; + bo->handle = arg.handle; + bo->size = arg.size; + bo->pitch = arg.pitch; + return bo; } -struct kms_bo * -create_test_buffer(struct kms_driver *kms, unsigned int format, - unsigned int width, unsigned int height, - unsigned int handles[4], unsigned int pitches[4], - unsigned int offsets[4], enum fill_pattern pattern) +static int bo_map(struct bo *bo, void **out) +{ + struct drm_mode_map_dumb arg; + void *map; + int ret; + + memset(&arg, 0, sizeof(arg)); + arg.handle = bo->handle; + + ret = drmIoctl(bo->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg); + if (ret) + return ret; + + map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, + bo->fd, arg.offset); + if (map == MAP_FAILED) + return -EINVAL; + + bo->ptr = map; + *out = map; + + return 0; +} + +static void bo_unmap(struct bo *bo) +{ + if (!bo->ptr) + return; + + drm_munmap(bo->ptr, bo->size); + bo->ptr = NULL; +} + +struct bo * +bo_create(int fd, unsigned int format, + unsigned int width, unsigned int height, + unsigned int handles[4], unsigned int pitches[4], + unsigned int offsets[4], enum fill_pattern pattern) { unsigned int virtual_height; - struct kms_bo *bo; + struct bo *bo; + unsigned int bpp; void *planes[3] = { 0, }; void *virtual; int ret; @@ -1050,6 +1098,70 @@ create_test_buffer(struct kms_driver *kms, unsigned int format, switch (format) { case DRM_FORMAT_NV12: case DRM_FORMAT_NV21: + case DRM_FORMAT_NV16: + case DRM_FORMAT_NV61: + case DRM_FORMAT_YUV420: + case DRM_FORMAT_YVU420: + bpp = 8; + break; + + case DRM_FORMAT_ARGB4444: + case DRM_FORMAT_XRGB4444: + case DRM_FORMAT_ABGR4444: + case DRM_FORMAT_XBGR4444: + case DRM_FORMAT_RGBA4444: + case DRM_FORMAT_RGBX4444: + case DRM_FORMAT_BGRA4444: + case DRM_FORMAT_BGRX4444: + case DRM_FORMAT_ARGB1555: + case DRM_FORMAT_XRGB1555: + case DRM_FORMAT_ABGR1555: + case DRM_FORMAT_XBGR1555: + case DRM_FORMAT_RGBA5551: + case DRM_FORMAT_RGBX5551: + case DRM_FORMAT_BGRA5551: + case DRM_FORMAT_BGRX5551: + case DRM_FORMAT_RGB565: + case DRM_FORMAT_BGR565: + case DRM_FORMAT_UYVY: + case DRM_FORMAT_VYUY: + case DRM_FORMAT_YUYV: + case DRM_FORMAT_YVYU: + bpp = 16; + break; + + case DRM_FORMAT_BGR888: + case DRM_FORMAT_RGB888: + bpp = 24; + break; + + case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_XRGB8888: + case DRM_FORMAT_ABGR8888: + case DRM_FORMAT_XBGR8888: + case DRM_FORMAT_RGBA8888: + case DRM_FORMAT_RGBX8888: + case DRM_FORMAT_BGRA8888: + case DRM_FORMAT_BGRX8888: + case DRM_FORMAT_ARGB2101010: + case DRM_FORMAT_XRGB2101010: + case DRM_FORMAT_ABGR2101010: + case DRM_FORMAT_XBGR2101010: + case DRM_FORMAT_RGBA1010102: + case DRM_FORMAT_RGBX1010102: + case DRM_FORMAT_BGRA1010102: + case DRM_FORMAT_BGRX1010102: + bpp = 32; + break; + + default: + fprintf(stderr, "unsupported format 0x%08x\n", format); + return NULL; + } + + switch (format) { + case DRM_FORMAT_NV12: + case DRM_FORMAT_NV21: virtual_height = height * 3 / 2; break; @@ -1063,15 +1175,15 @@ create_test_buffer(struct kms_driver *kms, unsigned int format, break; } - bo = allocate_buffer(kms, width, virtual_height, &pitches[0]); + bo = bo_create_dumb(fd, width, virtual_height, bpp); if (!bo) return NULL; - ret = kms_bo_map(bo, &virtual); + ret = bo_map(bo, &virtual); if (ret) { fprintf(stderr, "failed to map buffer: %s\n", - strerror(-ret)); - kms_bo_destroy(&bo); + strerror(-errno)); + bo_destroy(bo); return NULL; } @@ -1084,8 +1196,8 @@ create_test_buffer(struct kms_driver *kms, unsigned int format, case DRM_FORMAT_YUYV: case DRM_FORMAT_YVYU: offsets[0] = 0; - kms_bo_get_prop(bo, KMS_HANDLE, &handles[0]); - kms_bo_get_prop(bo, KMS_PITCH, &pitches[0]); + handles[0] = bo->handle; + pitches[0] = bo->pitch; planes[0] = virtual; break; @@ -1095,11 +1207,11 @@ create_test_buffer(struct kms_driver *kms, unsigned int format, case DRM_FORMAT_NV16: case DRM_FORMAT_NV61: offsets[0] = 0; - kms_bo_get_prop(bo, KMS_HANDLE, &handles[0]); - kms_bo_get_prop(bo, KMS_PITCH, &pitches[0]); + handles[0] = bo->handle; + pitches[0] = bo->pitch; pitches[1] = pitches[0]; offsets[1] = pitches[0] * height; - kms_bo_get_prop(bo, KMS_HANDLE, &handles[1]); + handles[1] = bo->handle; planes[0] = virtual; planes[1] = virtual + offsets[1]; @@ -1108,14 +1220,14 @@ create_test_buffer(struct kms_driver *kms, unsigned int format, case DRM_FORMAT_YUV420: case DRM_FORMAT_YVU420: offsets[0] = 0; - kms_bo_get_prop(bo, KMS_HANDLE, &handles[0]); - kms_bo_get_prop(bo, KMS_PITCH, &pitches[0]); + handles[0] = bo->handle; + pitches[0] = bo->pitch; pitches[1] = pitches[0] / 2; offsets[1] = pitches[0] * height; - kms_bo_get_prop(bo, KMS_HANDLE, &handles[1]); + handles[1] = bo->handle; pitches[2] = pitches[1]; offsets[2] = offsets[1] + pitches[1] * height / 2; - kms_bo_get_prop(bo, KMS_HANDLE, &handles[2]); + handles[2] = bo->handle; planes[0] = virtual; planes[1] = virtual + offsets[1]; @@ -1159,15 +1271,31 @@ create_test_buffer(struct kms_driver *kms, unsigned int format, case DRM_FORMAT_BGRA1010102: case DRM_FORMAT_BGRX1010102: offsets[0] = 0; - kms_bo_get_prop(bo, KMS_HANDLE, &handles[0]); - kms_bo_get_prop(bo, KMS_PITCH, &pitches[0]); + handles[0] = bo->handle; + pitches[0] = bo->pitch; planes[0] = virtual; break; } fill_pattern(format, pattern, planes, width, height, pitches[0]); - kms_bo_unmap(bo); + bo_unmap(bo); return bo; } + +void bo_destroy(struct bo *bo) +{ + struct drm_mode_destroy_dumb arg; + int ret; + + memset(&arg, 0, sizeof(arg)); + arg.handle = bo->handle; + + ret = drmIoctl(bo->fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg); + if (ret) + fprintf(stderr, "failed to destroy dumb buffer: %s\n", + strerror(errno)); + + free(bo); +} diff --git a/tests/modetest/buffers.h b/tests/modetest/buffers.h index e320389..ad73d0e 100644 --- a/tests/modetest/buffers.h +++ b/tests/modetest/buffers.h @@ -27,8 +27,7 @@ #ifndef __BUFFERS_H__ #define __BUFFERS_H__ -struct kms_bo; -struct kms_driver; +struct bo; enum fill_pattern { PATTERN_TILES = 0, @@ -36,10 +35,11 @@ enum fill_pattern { PATTERN_SMPTE = 2, }; -struct kms_bo *create_test_buffer(struct kms_driver *kms, unsigned int format, +struct bo *bo_create(int fd, unsigned int format, unsigned int width, unsigned int height, unsigned int handles[4], unsigned int pitches[4], unsigned int offsets[4], enum fill_pattern pattern); +void bo_destroy(struct bo *bo); unsigned int format_fourcc(const char *name); diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 2c9a17a..4b9cf2f 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -57,7 +57,6 @@ #include "xf86drm.h" #include "xf86drmMode.h" #include "drm_fourcc.h" -#include "libkms.h" #include "buffers.h" #include "cursor.h" @@ -104,14 +103,13 @@ struct device { int fd; struct resources *resources; - struct kms_driver *kms; struct { unsigned int width; unsigned int height; unsigned int fb_id; - struct kms_bo *bo; + struct bo *bo; } mode; }; @@ -968,7 +966,7 @@ static int set_plane(struct device *dev, struct plane_arg *p) drmModePlane *ovr; uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */ uint32_t plane_id = 0; - struct kms_bo *plane_bo; + struct bo *plane_bo; uint32_t plane_flags = 0; int crtc_x, crtc_y, crtc_w, crtc_h; struct crtc *crtc = NULL; @@ -1009,8 +1007,8 @@ static int set_plane(struct device *dev, struct plane_arg *p) fprintf(stderr, "testing %dx%d@%s overlay plane %u\n", p->w, p->h, p->format_str, plane_id); - plane_bo = create_test_buffer(dev->kms, p->fourcc, p->w, p->h, handles, - pitches, offsets, PATTERN_TILES); + plane_bo = bo_create(dev->fd, p->fourcc, p->w, p->h, handles, + pitches, offsets, PATTERN_TILES); if (plane_bo == NULL) return -1; @@ -1050,7 +1048,7 @@ static void set_mode(struct device *dev, struct pipe_arg *pipes, unsigned int co { uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */ unsigned int fb_id; - struct kms_bo *bo; + struct bo *bo; unsigned int i; unsigned int j; int ret, x; @@ -1070,9 +1068,8 @@ static void set_mode(struct device *dev, struct pipe_arg *pipes, unsigned int co dev->mode.height = pipe->mode->vdisplay; } - bo = create_test_buffer(dev->kms, pipes[0].fourcc, - dev->mode.width, dev->mode.height, - handles, pitches, offsets, PATTERN_SMPTE); + bo = bo_create(dev->fd, pipes[0].fourcc, dev->mode.width, dev->mode.height, + handles, pitches, offsets, PATTERN_SMPTE); if (bo == NULL) return; @@ -1129,7 +1126,7 @@ static void set_planes(struct device *dev, struct plane_arg *p, unsigned int cou static void set_cursors(struct device *dev, struct pipe_arg *pipes, unsigned int count) { uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */ - struct kms_bo *bo; + struct bo *bo; unsigned int i; int ret; @@ -1140,8 +1137,8 @@ static void set_cursors(struct device *dev, struct pipe_arg *pipes, unsigned int /* create cursor bo.. just using PATTERN_PLAIN as it has * translucent alpha */ - bo = create_test_buffer(dev->kms, DRM_FORMAT_ARGB8888, - cw, ch, handles, pitches, offsets, PATTERN_PLAIN); + bo = bo_create(dev->fd, DRM_FORMAT_ARGB8888, cw, ch, handles, pitches, + offsets, PATTERN_PLAIN); if (bo == NULL) return; @@ -1170,14 +1167,14 @@ static void test_page_flip(struct device *dev, struct pipe_arg *pipes, unsigned { uint32_t handles[4], pitches[4], offsets[4] = {0}; /* we only use [0] */ unsigned int other_fb_id; - struct kms_bo *other_bo; + struct bo *other_bo; drmEventContext evctx; unsigned int i; int ret; - other_bo = create_test_buffer(dev->kms, pipes[0].fourcc, - dev->mode.width, dev->mode.height, - handles, pitches, offsets, PATTERN_PLAIN); + other_bo = bo_create(dev->fd, pipes[0].fourcc, + dev->mode.width, dev->mode.height, + handles, pitches, offsets, PATTERN_PLAIN); if (other_bo == NULL) return; @@ -1252,7 +1249,7 @@ static void test_page_flip(struct device *dev, struct pipe_arg *pipes, unsigned drmHandleEvent(dev->fd, &evctx); } - kms_bo_destroy(&other_bo); + bo_destroy(other_bo); } #define min(a, b) ((a) < (b) ? (a) : (b)) @@ -1611,10 +1608,11 @@ int main(int argc, char **argv) set_property(&dev, &prop_args[i]); if (count || plane_count) { - ret = kms_create(dev.fd, &dev.kms); - if (ret) { - fprintf(stderr, "failed to create kms driver: %s\n", - strerror(-ret)); + uint64_t cap = 0; + + ret = drmGetCap(dev.fd, DRM_CAP_DUMB_BUFFER, &cap); + if (ret || cap == 0) { + fprintf(stderr, "driver doesn't support the dumb buffer API\n"); return 1; } @@ -1638,8 +1636,7 @@ int main(int argc, char **argv) if (test_cursor) clear_cursors(&dev); - kms_bo_destroy(&dev.mode.bo); - kms_destroy(&dev.kms); + bo_destroy(dev.mode.bo); } free_resources(dev.resources); -- Regards, Laurent Pinchart [View Less]

1 0

[PATCH] drm/dp-mst: Remove branches before dropping the reference
by Daniel Vetter 09 Dec '14

09 Dec '14

When we unplug a dp mst branch we unreference the entire tree from the root towards the leaves. Which is ok, since that's the way the pointers and so also the refcounts go. But when we drop the reference we must make sure that we remove the branches/ports from the lists/pointers before dropping the reference. Otherwise the get_validated functions will still return it instead of returning NULL (which indicates a potentially on-going unplug). The mst branch destroy gets this right for ports: … [View More]First it deletes the port from the ports list, then it unrefs. But the ports destroy function gets it wrong: First it unrefs, then it drops the ref. Which means a zombie mst branch can still be validate with get_validated_mstb_ref when it shouldn't. Fix this. This should address a backtrace Dave dug out somewhere on unplug: [<ffffffffa00cc262>] drm_dp_mst_get_validated_mstb_ref_locked+0x92/0xa0 [drm_kms_helper] [<ffffffffa00cc211>] drm_dp_mst_get_validated_mstb_ref_locked+0x41/0xa0 [drm_kms_helper] [<ffffffffa00cc2aa>] drm_dp_get_validated_mstb_ref+0x3a/0x60 [drm_kms_helper] [<ffffffffa00cc2fb>] drm_dp_payload_send_msg.isra.14+0x2b/0x100 [drm_kms_helper] [<ffffffffa00cc547>] drm_dp_update_payload_part1+0x177/0x360 [drm_kms_helper] [<ffffffffa015c52e>] intel_mst_disable_dp+0x3e/0x80 [i915] [<ffffffffa013d60b>] haswell_crtc_disable+0x1cb/0x340 [i915] [<ffffffffa0136739>] intel_crtc_control+0x49/0x100 [i915] [<ffffffffa0136857>] intel_crtc_update_dpms+0x67/0x80 [i915] [<ffffffffa013fa59>] intel_connector_dpms+0x59/0x70 [i915] [<ffffffffa015c752>] intel_dp_destroy_mst_connector+0x32/0xc0 [i915] [<ffffffffa00cb44b>] drm_dp_destroy_port+0x6b/0xa0 [drm_kms_helper] [<ffffffffa00cb588>] drm_dp_destroy_mst_branch_device+0x108/0x130 [drm_kms_helper] [<ffffffffa00cb3cd>] drm_dp_port_teardown_pdt+0x3d/0x50 [drm_kms_helper] [<ffffffffa00cdb79>] drm_dp_mst_handle_up_req+0x499/0x540 [drm_kms_helper] [<ffffffff810d9ead>] ? trace_hardirqs_on_caller+0x15d/0x200 [<ffffffffa00cdc73>] drm_dp_mst_hpd_irq+0x53/0xa00 [drm_kms_helper] [<ffffffffa00c7dfb>] ? drm_dp_dpcd_read+0x1b/0x20 [drm_kms_helper] [<ffffffffa0153ed8>] ? intel_dp_dpcd_read_wake+0x38/0x70 [i915] [<ffffffffa015a225>] intel_dp_check_mst_status+0xb5/0x250 [i915] [<ffffffffa015ac71>] intel_dp_hpd_pulse+0x181/0x210 [i915] [<ffffffffa01104f6>] i915_digport_work_func+0x96/0x120 [i915] Cc: Dave Airlie <airlied(a)redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- drivers/gpu/drm/drm_dp_mst_topology.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 5682d7e9f1ec..71a56d65a0d2 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -839,6 +839,8 @@ static void drm_dp_put_mst_branch_device(struct drm_dp_mst_branch *mstb) static void drm_dp_port_teardown_pdt(struct drm_dp_mst_port *port, int old_pdt) { + struct drm_dp_mst_branch *mstb; + switch (old_pdt) { case DP_PEER_DEVICE_DP_LEGACY_CONV: case DP_PEER_DEVICE_SST_SINK: @@ -846,8 +848,9 @@ static void drm_dp_port_teardown_pdt(struct drm_dp_mst_port *port, int old_pdt) drm_dp_mst_unregister_i2c_bus(&port->aux); break; case DP_PEER_DEVICE_MST_BRANCHING: - drm_dp_put_mst_branch_device(port->mstb); + mstb = port_mstb; port->mstb = NULL; + drm_dp_put_mst_branch_device(mstb); break; } } -- 2.1.1 [View Less]

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel December 2014