dri-devel January 2015

dri-devel@lists.freedesktop.org

165 participants
1123 discussions

[PATCH] drm/amdkfd: Load mqd to hqd in non-HWS mode
by Oded Gabbay 06 Jan '15

06 Jan '15

From: Ben Goz <ben.goz(a)amd.com> This patch fixes a bug in DQM, where the MQD of a newly created compute queue is not loaded to an HQD slot. As a result, the CP never reads packets from this queue. This bug happens only in non-HWS (hardware scheduling) mode. In HWS mode, the CP is responsible of loading MQDs to HQDs slots. Signed-off-by: Ben Goz <ben.goz(a)amd.com> Reviewed-by: Oded Gabbay <oded.gabbay(a)amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index f44d673..3b08ed6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -272,6 +272,18 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm, return retval; } + pr_debug("kfd: loading mqd to hqd on pipe (%d) queue (%d)\n", + q->pipe, + q->queue); + + retval = mqd->load_mqd(mqd, q->mqd, q->pipe, + q->queue, q->properties.write_ptr); + if (retval != 0) { + deallocate_hqd(dqm, q); + mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj); + return retval; + } + return 0; } -- 2.1.0

2 1

[PATCH v2 0/7] Add SDMA user-mode queues support to amdkfd
by Oded Gabbay 06 Jan '15

06 Jan '15

Although I didn't get any replies on v1, I still decided to send this v2, because: a. Alex and I decided to move some H/W initialization functionallity into radeon. b. The next patch-set that I intend to send (prepare to support future AMD GPUs) is based on this patch-set. Therefore, I wanted to quickly publish the most updated version of this patch-set. The only change in this version is moving initialization of H/W registers into radeon driver, instead of putting it in the interface file. It is detailed in the relevant commits. Link to cover letter of original version: http://lists.freedesktop.org/archives/dri-devel/2014-December/073934.html Oded Gabbay Ben Goz (7): drm/amd: Add SDMA functions to kfd-->kgd interface drm/radeon: Implement SDMA interface functions drm/amdkfd: Add SDMA mqd support drm/amdkfd: Add SDMA user-mode queues support to QCM drm/amdkfd: Identify SDMA queue in create queue ioctl drm/amdkfd: Pass queue type to pqm_create_queue() drm/radeon: Enable sdma preemption drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 159 ++++++++++++++-- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 5 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 121 +++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 8 + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 13 +- drivers/gpu/drm/radeon/cik_reg.h | 200 ++++++++++++++++++++- drivers/gpu/drm/radeon/cik_sdma.c | 29 +++ drivers/gpu/drm/radeon/radeon_kfd.c | 115 +++++++++++- 10 files changed, 640 insertions(+), 18 deletions(-) -- 2.1.0

2 8

[PATCH v9 0/2] drm: add support for Atmel HLCDC Display Controller
by Boris Brezillon 06 Jan '15

06 Jan '15

Hi Dave, As I already said here [1], I'd really like to have the Atmel HLCDC driver merged in 3.20 (it's already floating around for quite some time now). So, unless someone complain about this version, I plan to send a PR soon, is that okay for you ? Please note that this series depends on [1] (which I can also include in my PR). Here comes the usual description: This patch series adds support for the Atmel HLCDC Display Controller embedded in the HLCDC block. The drivers supports basic CRTC functionalities, several overlays and provides an hardware cursor. At the moment, it only supports connection to LCD panels through an RGB connector (defined as an LVDS connector in my implementation), though connection to other kind of devices (like DRM bridges) could be added later. It also supports several RGB formats on all planes and some YUV formats on the HEO overlay plane. Best Regards, Boris [1]https://lkml.org/lkml/2015/1/6/171 Changes since v8: - remove dependency on this series https://lkml.org/lkml/2014/11/16/12 (which did not make it into 3.19) to avoid cross subsystem dependency issues Changes since v7: - split MFD, PWM and Display Controller drivers in several patch series - fix inline documentation (suggested by Nicolas) - fix DMA BURST LEN config (suggested by Nicolas) - call load and unload in probe and remove functions instead of setting them in drm_driver struct Changes since v6: - move interrupts property from hlcdc display controller node to its parent node (the MFD device) - add mode_set_base implementation - rework page flip handling to rely on vblank events instead of DMA transfer events (the end of a DMA transfer does not mean the frame is actually flipped: data are first copied to an output FIFO before being sent on the RGB/DPI connector) - few minor coding style fixes Changes since v5: - fix Kconfig dependency bug - use adjusted mode in crtc config - move signal config (clk, hsync, vsync) from connector to crtc mode_set function - use standard rotation property - check display_mode validity in connecto mode_valid function - remove dma_set_coherent mask call (now done in MFD core) - do not use drm_platform_init Changes since v4: - fix a few more bugs in rotation handling (rotation was buggy on some formats) - return connector_status_unknown until a panel is exposed by the drm_panel infrastructure (prevent fbdev creation until everyting is in place) - rework Kconfig MFD_ATMEL_HLCDC selection to simplify the configuration (automatically select this option when selecting the HLCDC PMW or DRM driver, instead of depending on this option) Changes since v3: - rework the layer code to simplify several parts (locking and layer disabling) - make use of the drm_flip_work infrastructure - rely on default HW cursor implementation using on the cursor plane - rework the display controller DT bindings (based on OF graph representation) - add rotation support - retrieve RGB bus format from drm_display_info - drop the dynamic pinctrl state selection - rework HLCDC output handling (previously specialized to interface with LCD panels) - drop ".module = THIS_MODULE" lines - change display controller compatible string Changes since v2: - fix coding style issues (macro indentation) - make use of GENMASK in several places - declare regmap config as a static structure - rework hlcdc plane update API - rework cursor handling to make use of the new plane update API - fix backporch config - do not use devm_regmap_init_mmio_clk to avoid extra clk_enable clk disable calls when accessing registers - explicitly include regmap and clk headers instead of relying on atmel-hlcdc.h inclusions - make the atmel-hlcdc driver depends on CONFIG_OF - separate DT bindings documentation from driver implementation - support several pin muxing for HLCDC pins on sama5d3 SoCs Changes since v1: - replace the backlight driver by a PWM driver - make use of drm_panel infrastructure - split driver code in several subsystem: MFD, PWM and DRM - add support for overlays - add support for hardware cursor Boris Brezillon (2): drm: add Atmel HLCDC Display Controller support drm: add DT bindings documentation for atmel-hlcdc-dc driver .../devicetree/bindings/drm/atmel/hlcdc-dc.txt | 53 ++ drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/atmel-hlcdc/Kconfig | 11 + drivers/gpu/drm/atmel-hlcdc/Makefile | 7 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 406 ++++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 579 ++++++++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 213 +++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 667 ++++++++++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h | 398 ++++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 319 ++++++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 856 +++++++++++++++++++++ 12 files changed, 3512 insertions(+) create mode 100644 Documentation/devicetree/bindings/drm/atmel/hlcdc-dc.txt create mode 100644 drivers/gpu/drm/atmel-hlcdc/Kconfig create mode 100644 drivers/gpu/drm/atmel-hlcdc/Makefile create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c create mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c -- 1.9.1

2 3

[PATCH 1/3] drm/radeon: fix VM flush on cayman/aruba (v2)
by Alex Deucher 06 Jan '15

06 Jan '15

We need to wait for the GPUVM flush to complete. There was some confusion as to how this mechanism was supposed to work. The operation is not atomic. For GPU initiated invalidations you need to read back a VM register to introduce enough latency for the update to complete. v2: drop gart changes Reviewed-by: Christian König <christian.koenig(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/ni.c | 10 ++++++++++ drivers/gpu/drm/radeon/ni_dma.c | 6 ++++++ drivers/gpu/drm/radeon/nid.h | 21 +++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 360de9f..ba7c68b 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -2516,6 +2516,16 @@ void cayman_vm_flush(struct radeon_device *rdev, struct radeon_ring *ring, radeon_ring_write(ring, PACKET0(VM_INVALIDATE_REQUEST, 0)); radeon_ring_write(ring, 1 << vm_id); + /* wait for the invalidate to complete */ + radeon_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5)); + radeon_ring_write(ring, (WAIT_REG_MEM_FUNCTION(3) | /* == */ + WAIT_REG_MEM_ENGINE(0))); /* me */ + radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2); + radeon_ring_write(ring, 0); + radeon_ring_write(ring, 0); /* ref */ + radeon_ring_write(ring, 1 << vm_id); /* mask */ + radeon_ring_write(ring, 0x20); /* poll interval */ + /* sync PFP to ME, otherwise we might get invalid PFP reads */ radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0)); radeon_ring_write(ring, 0x0); diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c index 50f8861..545e5f1 100644 --- a/drivers/gpu/drm/radeon/ni_dma.c +++ b/drivers/gpu/drm/radeon/ni_dma.c @@ -463,5 +463,11 @@ void cayman_dma_vm_flush(struct radeon_device *rdev, struct radeon_ring *ring, radeon_ring_write(ring, DMA_PACKET(DMA_PACKET_SRBM_WRITE, 0, 0, 0)); radeon_ring_write(ring, (0xf << 16) | (VM_INVALIDATE_REQUEST >> 2)); radeon_ring_write(ring, 1 << vm_id); + + /* wait for invalidate to complete */ + radeon_ring_write(ring, DMA_SRBM_POLL_PACKET); + radeon_ring_write(ring, (0xff << 20) | (VM_INVALIDATE_REQUEST >> 2)); + radeon_ring_write(ring, 1 << vm_id); /* mask */ + radeon_ring_write(ring, 0); /* value */ } diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h index 2e12e4d..e2b8bbf 100644 --- a/drivers/gpu/drm/radeon/nid.h +++ b/drivers/gpu/drm/radeon/nid.h @@ -1133,6 +1133,23 @@ #define PACKET3_MEM_SEMAPHORE 0x39 #define PACKET3_MPEG_INDEX 0x3A #define PACKET3_WAIT_REG_MEM 0x3C +#define WAIT_REG_MEM_FUNCTION(x) ((x) << 0) + /* 0 - always + * 1 - < + * 2 - <= + * 3 - == + * 4 - != + * 5 - >= + * 6 - > + */ +#define WAIT_REG_MEM_MEM_SPACE(x) ((x) << 4) + /* 0 - reg + * 1 - mem + */ +#define WAIT_REG_MEM_ENGINE(x) ((x) << 8) + /* 0 - me + * 1 - pfp + */ #define PACKET3_MEM_WRITE 0x3D #define PACKET3_PFP_SYNC_ME 0x42 #define PACKET3_SURFACE_SYNC 0x43 @@ -1272,6 +1289,10 @@ (1 << 21) | \ (((n) & 0xFFFFF) << 0)) +#define DMA_SRBM_POLL_PACKET ((9 << 28) | \ + (1 << 27) | \ + (1 << 26)) + /* async DMA Packet types */ #define DMA_PACKET_WRITE 0x2 #define DMA_PACKET_COPY 0x3 -- 1.8.3.1

1 2

[Bug 87625] Radeon 7950 hangs for a bit when switching video to fullscreen mode in mplayer2
by bugzilla-daemon＠freedesktop.org 06 Jan '15

06 Jan '15

https://bugs.freedesktop.org/show_bug.cgi?id=87625 Bug ID: 87625 Summary: Radeon 7950 hangs for a bit when switching video to fullscreen mode in mplayer2 Product: Mesa Version: 10.3 Hardware: Other OS: All Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: luke-jr+freedesktopbugs(a)utopios.org When I fullscreen a video in mplayer2 (gl3 vo driver), my display freezes - usually for a number of seconds - after which the fullscreen completes successfully and continues playing. Sometimes the hang is very brief or even unnoticable (I think if I had recently played a video fullscreen - which may make troubleshooting harder). During the hang, CPU appears to be idle, I *think* I/O wait is high (but nothing showed in iotop), and perf top didn't notice anything busy. This does not affect my 5850 card, only the 7950. -- You are receiving this mail because: You are the assignee for the bug.

1 10

[RESEND PATCH v5 0/3] drm: describe display bus format
by Boris Brezillon 06 Jan '15

06 Jan '15

Hello, Resending this series I depends on for the Atmel HLCDC driver which, BTW, I really expect to be merged in 3.20. Thierry, do you see any remaining issues that should be fixed ? If not, Dave, Thierry, could you take it for 3.20 (or, if you prefer, I could make it part of my PR for the atmel-hlcdc driver inclusion). Here follows the usual description: This series makes use of the MEDIA_BUS_FMT definition to describe how the data are transmitted to the display. This will allow drivers to configure their output display bus according to the display capabilities. For example some display controllers support DPI (or raw RGB) connectors and need to specify which format will be transmitted on the DPI bus (RGB444, RGB565, RGB888, ...). This series also adds a field to the panel_desc struct so that one can specify which format is natevely supported by a panel. Regards, Boris Changes since v4: - fix typo - fix 'line over 80 characters' warnings - fix leak of formats array Changes since v3: - store num_bus_formats on an unsigned int - clearly state that fmts argument (in drm_display_info_set_bus_formats function) should be an array of MEDIA_BUS_FMT_* values. Changes since v2: - use the MEDIA_BUS_FMT macros Changes since v1: - rename nformats into num_formats - declare num_formats as an unsigned int Boris Brezillon (3): drm: add bus_formats and num_bus_formats fields to drm_display_info drm: panel: simple-panel: add support for bus_format retrieval drm: panel: simple-panel: add bus format information for foxlink panel drivers/gpu/drm/drm_crtc.c | 35 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/panel/panel-simple.c | 6 ++++++ include/drm/drm_crtc.h | 8 ++++++++ 3 files changed, 49 insertions(+) -- 1.9.1

1 3

[PATCH RESEND 1/2] exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls
by Hyungwon Hwang 06 Jan '15

06 Jan '15

The ioctl DRM_EXYNOS_GEM_MAP_OFFSET and DRM_EXYNOS_GEM_MMAP are removed from the linux kernel. This patch modifies libdrm and libkms to use drm generic ioctls instead of the removed ioctls. Signed-off-by: Hyungwon Hwang <human.hwang(a)samsung.com> Signed-off-by: Inki Dae <inki.dae(a)samsung.com> --- exynos/exynos_drm.c | 24 +++++++++++++----------- libkms/exynos.c | 7 ++++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c index 4c7dd13..4cb6a6d 100644 --- a/exynos/exynos_drm.c +++ b/exynos/exynos_drm.c @@ -283,20 +283,22 @@ drm_public void *exynos_bo_map(struct exynos_bo *bo) { if (!bo->vaddr) { struct exynos_device *dev = bo->dev; - struct drm_exynos_gem_mmap req = { - .handle = bo->handle, - .size = bo->size, - }; + struct drm_mode_map_dumb arg; + void *map = NULL; int ret; - ret = drmIoctl(dev->fd, DRM_IOCTL_EXYNOS_GEM_MMAP, &req); - if (ret) { - fprintf(stderr, "failed to mmap[%s].\n", - strerror(errno)); - return NULL; - } + memset(&arg, 0, sizeof(arg)); + arg.handle = bo->handle; + + ret = drmIoctl(dev->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg); + if (ret) + return ret; - bo->vaddr = (void *)(uintptr_t)req.mapped; + map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, + dev->fd, arg.offset); + + if (map == MAP_FAILED) + return NULL; } return bo->vaddr; diff --git a/libkms/exynos.c b/libkms/exynos.c index 92e329c..1123482 100644 --- a/libkms/exynos.c +++ b/libkms/exynos.c @@ -25,6 +25,7 @@ #include <sys/ioctl.h> #include "xf86drm.h" +#include "libdrm.h" #include "exynos_drm.h" struct exynos_bo @@ -124,7 +125,7 @@ static int exynos_bo_map(struct kms_bo *_bo, void **out) { struct exynos_bo *bo = (struct exynos_bo *)_bo; - struct drm_exynos_gem_map_off arg; + struct drm_mode_map_dumb arg; void *map = NULL; int ret; @@ -137,11 +138,11 @@ exynos_bo_map(struct kms_bo *_bo, void **out) memset(&arg, 0, sizeof(arg)); arg.handle = bo->base.handle; - ret = drmCommandWriteRead(bo->base.kms->fd, DRM_EXYNOS_GEM_MAP_OFFSET, &arg, sizeof(arg)); + ret = drmIoctl(bo->base.kms->fd, DRM_IOCTL_MODE_MAP_DUMB, &arg); if (ret) return ret; - map = mmap(0, bo->base.size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->base.kms->fd, arg.offset); + map = drm_mmap(0, bo->base.size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->base.kms->fd, arg.offset); if (map == MAP_FAILED) return -errno; -- 1.9.1

1 2

[PATCH 1/5] gpu: host1x: Call ->remove() only when a device is bound
by Thierry Reding 06 Jan '15

06 Jan '15

From: Thierry Reding <treding(a)nvidia.com> When a driver's ->probe() function fails, the host1x bus must not call its ->remove() function because the driver will already have cleaned up in the error handling path in ->probe(). Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- drivers/gpu/host1x/bus.c | 9 +++++++-- include/linux/host1x.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index aaf54859adb0..e4182e68e29c 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -116,7 +116,10 @@ static void host1x_subdev_register(struct host1x_device *device, if (list_empty(&device->subdevs)) { err = device->driver->probe(device); if (err < 0) - dev_err(&device->dev, "probe failed: %d\n", err); + dev_err(&device->dev, "probe failed for %ps: %d\n", + device->driver, err); + else + device->bound = true; } } @@ -130,10 +133,12 @@ static void __host1x_subdev_unregister(struct host1x_device *device, * If all subdevices have been activated, we're about to remove the * first active subdevice, so unload the driver first. */ - if (list_empty(&device->subdevs)) { + if (list_empty(&device->subdevs) && device->bound) { err = device->driver->remove(device); if (err < 0) dev_err(&device->dev, "remove failed: %d\n", err); + + device->bound = false; } /* diff --git a/include/linux/host1x.h b/include/linux/host1x.h index bb9840fd1e18..7890b553d12e 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -272,6 +272,8 @@ struct host1x_device { struct mutex clients_lock; struct list_head clients; + + bool bound; }; static inline struct host1x_device *to_host1x_device(struct device *dev) -- 2.1.3

3 12

[PATCH v2] drm/radeon: Fix kernel panic with HDMI w/o SAD
by Takashi Iwai 05 Jan '15

05 Jan '15

A BUG_ON() call in dce3_2_afmt_write_sad_regs() is triggered when a HDMI monitor without audio is plugged: kernel BUG at ../drivers/gpu/drm/radeon/dce3_1_afmt.c:110! invalid opcode: 0000 [#1] PREEMPT SMP CPU: 2 PID: 967 Comm: Xorg Tainted: PO 3.16.7-7-desktop #1 Hardware name: System manufacturer System Product Name/M4A77T, BIOS 2401 05/18/2011 task: ffff8800cea86350 ti: ffff8800c1880000 task.ti: ffff8800c1880000 RIP: 0010:[<ffffffffa0126c50>] dce3_1_hdmi_setmode+0x570/0x5a0 [radeon] Call Trace: [<ffffffffa00a6936>] drm_crtc_helper_set_mode+0x346/0x520 [drm_kms_helper] [<ffffffffa00a7678>] drm_crtc_helper_set_config+0x8a8/0xad0 [drm_kms_helper] [<ffffffffa00ede3f>] radeon_crtc_set_config+0x3f/0x110 [radeon] [<ffffffffa001edc1>] drm_mode_set_config_internal+0x61/0xe0 [drm] [<ffffffffa00a9a6b>] restore_fbdev_mode+0xab/0xd0 [drm_kms_helper] [<ffffffffa00a9aae>] drm_fb_helper_restore_fbdev_mode_unlocked+0x1e/0x30 [drm_kms_helper] [<ffffffffa00ab642>] drm_fb_helper_set_par+0x22/0x60 [drm_kms_helper] [<ffffffffa00ab5cb>] drm_fb_helper_hotplug_event+0x8b/0xe0 [drm_kms_helper] [<ffffffffa00ab65a>] drm_fb_helper_set_par+0x3a/0x60 [drm_kms_helper] [<ffffffff813818ce>] fb_set_var+0x15e/0x3b0 [<ffffffff81378d0b>] fbcon_blank+0x1cb/0x2b0 [<ffffffff813f2a31>] do_unblank_screen+0xa1/0x1b0 [<ffffffff813e8fd3>] complete_change_console+0x53/0xe0 [<ffffffff813e9fa9>] vt_ioctl+0xf49/0x10d0 [<ffffffff813ddfdc>] tty_ioctl+0x26c/0xb70 [<ffffffff811cad17>] do_vfs_ioctl+0x2e7/0x4c0 [<ffffffff811caf71>] SyS_ioctl+0x81/0xa0 [<ffffffff81622a2d>] system_call_fastpath+0x1a/0x1f [<00007f2fae8c6397>] 0x7f2fae8c6396 Actually the BUG_ON() check is wrong, since sads may be NULL when sad_count is zero. This patch removes the BUG_ON() and adds the proper NULL initialization of sads. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=911356 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- drivers/gpu/drm/radeon/dce3_1_afmt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c index 2fe8cfc966d9..7ca23f45829e 100644 --- a/drivers/gpu/drm/radeon/dce3_1_afmt.c +++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c @@ -72,7 +72,7 @@ static void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder) struct radeon_device *rdev = encoder->dev->dev_private; struct drm_connector *connector; struct radeon_connector *radeon_connector = NULL; - struct cea_sad *sads; + struct cea_sad *sads = NULL; int i, sad_count; static const u16 eld_reg_to_type[][2] = { @@ -107,7 +107,6 @@ static void dce3_2_afmt_write_sad_regs(struct drm_encoder *encoder) DRM_ERROR("Couldn't read SADs: %d\n", sad_count); return; } - BUG_ON(!sads); for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) { u32 value = 0; -- 2.2.0

2 5

[PATCH] drm/amd: Fixing typos in kfd<->kgd interface
by Oded Gabbay 05 Jan '15

05 Jan '15

From: Ben Goz <ben.goz(a)amd.com> Signed-off-by: Ben Goz <ben.goz(a)amd.com> Reviewed-by: Oded Gabbay <oded.gabbay(a)amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 +- drivers/gpu/drm/radeon/radeon_kfd.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c index adc3147..4c3828c 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c @@ -184,7 +184,7 @@ static bool is_occupied(struct mqd_manager *mm, void *mqd, uint32_t queue_id) { - return kfd2kgd->hqd_is_occupies(mm->dev->kgd, queue_address, + return kfd2kgd->hqd_is_occupied(mm->dev->kgd, queue_address, pipe_id, queue_id); } diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h index 47b5519..96a5122 100644 --- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h +++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h @@ -183,7 +183,7 @@ struct kfd2kgd_calls { int (*hqd_load)(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, uint32_t queue_id, uint32_t __user *wptr); - bool (*hqd_is_occupies)(struct kgd_dev *kgd, uint64_t queue_address, + bool (*hqd_is_occupied)(struct kgd_dev *kgd, uint64_t queue_address, uint32_t pipe_id, uint32_t queue_id); int (*hqd_destroy)(struct kgd_dev *kgd, uint32_t reset_type, diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c index d3e78b4..12c43df 100644 --- a/drivers/gpu/drm/radeon/radeon_kfd.c +++ b/drivers/gpu/drm/radeon/radeon_kfd.c @@ -72,7 +72,7 @@ static int kgd_init_pipeline(struct kgd_dev *kgd, uint32_t pipe_id, static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, uint32_t queue_id, uint32_t __user *wptr); -static bool kgd_hqd_is_occupies(struct kgd_dev *kgd, uint64_t queue_address, +static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address, uint32_t pipe_id, uint32_t queue_id); static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type, @@ -92,7 +92,7 @@ static const struct kfd2kgd_calls kfd2kgd = { .init_memory = kgd_init_memory, .init_pipeline = kgd_init_pipeline, .hqd_load = kgd_hqd_load, - .hqd_is_occupies = kgd_hqd_is_occupies, + .hqd_is_occupied = kgd_hqd_is_occupied, .hqd_destroy = kgd_hqd_destroy, .get_fw_version = get_fw_version }; @@ -529,7 +529,7 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, return 0; } -static bool kgd_hqd_is_occupies(struct kgd_dev *kgd, uint64_t queue_address, +static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address, uint32_t pipe_id, uint32_t queue_id) { uint32_t act; -- 1.9.1

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2015