dri-devel September 2014

dri-devel@lists.freedesktop.org

173 participants
1045 discussions

[PATCH 2/9] drm/ast: POST chip at probe time if VGA not enabled
by Benjamin Herrenschmidt 04 Sep '14

04 Sep '14

We need to do it on machines without a BIOS such as POWER8. Also for detection to work without triggering PCIe errors, we need to enable VGA early on, inside ast_detect_chip(). While touching those files, replace a few hard coded register numbers with the corresponding symbolic constant. Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> --- drivers/gpu/drm/ast/ast_drv.h | 3 +++ drivers/gpu/drm/ast/ast_main.c | 47 ++++++++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/ast/ast_post.c | 23 +++++++++++++-------- 3 files changed, 62 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index a203a6f..78fc683 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -384,6 +384,9 @@ int ast_bo_push_sysram(struct ast_bo *bo); int ast_mmap(struct file *filp, struct vm_area_struct *vma); /* ast post */ +void ast_enable_vga(struct drm_device *dev); +void ast_enable_mmio(struct drm_device *dev); +bool ast_is_vga_enabled(struct drm_device *dev); void ast_post_gpu(struct drm_device *dev); u32 ast_mindwm(struct ast_private *ast, u32 r); void ast_moutdwm(struct ast_private *ast, u32 r, u32 v); diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index c2ff793..556d065 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -63,7 +63,7 @@ uint8_t ast_get_index_reg_mask(struct ast_private *ast, } -static int ast_detect_chip(struct drm_device *dev) +static int ast_detect_chip(struct drm_device *dev, bool *need_post) { struct ast_private *ast = dev->dev_private; uint32_t data, jreg; @@ -109,6 +109,21 @@ static int ast_detect_chip(struct drm_device *dev) } } + /* + * If VGA isn't enabled, we need to enable now or subsequent + * access to the scratch registers will fail. We also inform + * our caller that it needs to POST the chip + * (Assumption: VGA not enabled -> need to POST) + */ + if (!ast_is_vga_enabled(dev)) { + ast_enable_vga(dev); + ast_enable_mmio(dev); + DRM_INFO("VGA not enabled on entry, requesting chip POST\n"); + *need_post = true; + } else + *need_post = false; + + /* Check if we support wide screen */ switch (ast->chip) { case AST1180: ast->support_wide_screen = true; @@ -124,6 +139,7 @@ static int ast_detect_chip(struct drm_device *dev) ast->support_wide_screen = true; else { ast->support_wide_screen = false; + /* Read SCU7c (silicon revision register) */ ast_write32(ast, 0xf004, 0x1e6e0000); ast_write32(ast, 0xf000, 0x1); data = ast_read32(ast, 0x1207c); @@ -136,11 +152,23 @@ static int ast_detect_chip(struct drm_device *dev) break; } + /* Check 3rd Tx option (digital output afaik) */ ast->tx_chip_type = AST_TX_NONE; + + /* + * VGACRA3 Enhanced Color Mode Register, check if DVO is already + * enabled, in that case, assume we have a SIL164 TMDS transmitter + */ jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa3, 0xff); if (jreg & 0x80) ast->tx_chip_type = AST_TX_SIL164; + if ((ast->chip == AST2300) || (ast->chip == AST2400)) { + /* + * On AST2300 and 2400, look the configuration set by the SoC in + * the SOC scratch register #1 bits 11:8 (interestingly marked + * as "reserved" in the spec + */ jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd1, 0xff); switch (jreg) { case 0x04: @@ -161,6 +189,17 @@ static int ast_detect_chip(struct drm_device *dev) } } + /* Print stuff for diagnostic purposes */ + switch(ast->tx_chip_type) { + case AST_TX_SIL164: + DRM_INFO("Using Sil164 TMDS transmitter\n"); + break; + case AST_TX_DP501: + DRM_INFO("Using DP501 DisplayPort transmitter\n"); + break; + default: + DRM_INFO("Analog VGA only\n"); + } return 0; } @@ -345,6 +384,7 @@ static u32 ast_get_vram_info(struct drm_device *dev) int ast_driver_load(struct drm_device *dev, unsigned long flags) { struct ast_private *ast; + bool need_post; int ret = 0; ast = kzalloc(sizeof(struct ast_private), GFP_KERNEL); @@ -379,7 +419,7 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags) } } - ast_detect_chip(dev); + ast_detect_chip(dev, &need_post); if (ast->chip != AST1180) { ast_get_dram_info(dev); @@ -387,6 +427,9 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags) DRM_INFO("dram %d %d %d %08x\n", ast->mclk, ast->dram_type, ast->dram_bus_width, ast->vram_size); } + if (need_post) + ast_post_gpu(dev); + ret = ast_mm_init(ast); if (ret) goto out_free; diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c index 38d437f..810c51d 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c @@ -33,18 +33,23 @@ static void ast_init_dram_2300(struct drm_device *dev); -static void -ast_enable_vga(struct drm_device *dev) +void ast_enable_vga(struct drm_device *dev) +{ + struct ast_private *ast = dev->dev_private; + + ast_io_write8(ast, AST_IO_VGA_ENABLE_PORT, 0x01); + ast_io_write8(ast, AST_IO_MISC_PORT_WRITE, 0x01); +} + +void ast_enable_mmio(struct drm_device *dev) { struct ast_private *ast = dev->dev_private; - ast_io_write8(ast, 0x43, 0x01); - ast_io_write8(ast, 0x42, 0x01); + ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa1, 0xff, 0x04); } -#if 0 /* will use later */ -static bool -ast_is_vga_enabled(struct drm_device *dev) + +bool ast_is_vga_enabled(struct drm_device *dev) { struct ast_private *ast = dev->dev_private; u8 ch; @@ -52,7 +57,7 @@ ast_is_vga_enabled(struct drm_device *dev) if (ast->chip == AST1180) { /* TODO 1180 */ } else { - ch = ast_io_read8(ast, 0x43); + ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT); if (ch) { ast_open_key(ast); ch = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xff); @@ -61,7 +66,6 @@ ast_is_vga_enabled(struct drm_device *dev) } return 0; } -#endif static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff }; static const u8 extreginfo_ast2300a0[] = { 0x0f, 0x04, 0x1c, 0xff }; @@ -371,6 +375,7 @@ void ast_post_gpu(struct drm_device *dev) pci_write_config_dword(ast->dev->pdev, 0x04, reg); ast_enable_vga(dev); + ast_enable_mmio(dev); ast_open_key(ast); ast_set_def_ext_reg(dev);

1 0

[PATCH 1/9] drm/ast: Try to use MMIO registers when PIO isn't supported
by Benjamin Herrenschmidt 04 Sep '14

04 Sep '14

If the PIO resources haven't been assigned, then we have no choice but try to use the MMIO version. This is the case for example on POWER8 which doesn't support PIO at all. Chips rev 0x20 or later have MMIO decoding enabled by default. Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> --- drivers/gpu/drm/ast/ast_drv.h | 5 ++++- drivers/gpu/drm/ast/ast_main.c | 20 +++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index 957d4fa..a203a6f 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -125,8 +125,9 @@ struct ast_gem_object; #define AST_IO_AR_PORT_WRITE (0x40) #define AST_IO_MISC_PORT_WRITE (0x42) +#define AST_IO_VGA_ENABLE_PORT (0x43) #define AST_IO_SEQ_PORT (0x44) -#define AST_DAC_INDEX_READ (0x3c7) +#define AST_IO_DAC_INDEX_READ (0x47) #define AST_IO_DAC_INDEX_WRITE (0x48) #define AST_IO_DAC_DATA (0x49) #define AST_IO_GR_PORT (0x4E) @@ -134,6 +135,8 @@ struct ast_gem_object; #define AST_IO_INPUT_STATUS1_READ (0x5A) #define AST_IO_MISC_PORT_READ (0x4C) +#define AST_IO_MM_OFFSET (0x380) + #define __ast_read(x) \ static inline u##x ast_read##x(struct ast_private *ast, u32 reg) { \ u##x val = 0;\ diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index a2cc6be..c2ff793 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -359,10 +359,24 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags) ret = -EIO; goto out_free; } - ast->ioregs = pci_iomap(dev->pdev, 2, 0); + + /* + * If we don't have IO space at all, use MMIO now and + * assume the chip has MMIO enabled by default (rev 0x20 + * and higher). + */ + if (!(pci_resource_flags(dev->pdev, 2) & IORESOURCE_IO)) { + DRM_INFO("platform has no IO space, trying MMIO\n"); + ast->ioregs = ast->regs + AST_IO_MM_OFFSET; + } + + /* "map" IO regs if the above hasn't done so already */ if (!ast->ioregs) { - ret = -EIO; - goto out_free; + ast->ioregs = pci_iomap(dev->pdev, 2, 0); + if (!ast->ioregs) { + ret = -EIO; + goto out_free; + } } ast_detect_chip(dev);

1 0

[Bug 83453] dpm not working in Gigabyte RADEON HD 7870 (bios F11)
by bugzilla-daemon＠freedesktop.org 04 Sep '14

04 Sep '14

https://bugs.freedesktop.org/show_bug.cgi?id=83453 --- Comment #2 from Zermond <zermond(a)gmail.com> --- thanks you Michel Dänzer -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 73338] Fan speed in idle at 40% with radeonsi and at 18% with catalyst
by bugzilla-daemon＠freedesktop.org 04 Sep '14

04 Sep '14

https://bugs.freedesktop.org/show_bug.cgi?id=73338 --- Comment #23 from Zermond <zermond(a)gmail.com> --- I have a similar problem with Radeon7870HD https://bugs.freedesktop.org/show_bug.cgi?id=83453 But there are some differences in the windows ... Catalyst says that the cooler is spinning at a rate of 40% - it is quiet, but Linuxs on hearing much more ... -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 83453] dpm not working in Gigabyte RADEON HD 7870 (bios F11)
by bugzilla-daemon＠freedesktop.org 04 Sep '14

04 Sep '14

https://bugs.freedesktop.org/show_bug.cgi?id=83453 Michel Dänzer <michel(a)daenzer.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|xorg-driver-ati(a)lists.x.org |dri-devel(a)lists.freedesktop | |.org QA Contact|xorg-team(a)lists.x.org | Product|xorg |DRI Component|Driver/Radeon |DRM/Radeon --- Comment #1 from Michel Dänzer <michel(a)daenzer.net> --- Sounds like bug 73338. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 80878] New: [r600g][regression] Metro: Last Light freezes when trying to kill stealthily
by bugzilla-daemon＠freedesktop.org 03 Sep '14

03 Sep '14

https://bugs.freedesktop.org/show_bug.cgi?id=80878 Priority: medium Bug ID: 80878 Assignee: dri-devel(a)lists.freedesktop.org Summary: [r600g][regression] Metro: Last Light freezes when trying to kill stealthily Severity: normal Classification: Unclassified OS: Linux (All) Reporter: yashax(a)windowslive.com Hardware: x86-64 (AMD64) Status: NEW Version: git Component: Drivers/Gallium/r600 Product: Mesa With a recent mesa git (fcac702, oibaf PPA on Ubuntu), when trying to stealthily kill an enemy, the game freezes. The sound still works and I can access the menu, but can't do any action inside the game. A week ago, the game worked fine. Tested with Linux 3.15.0 and 3.16-rc3 (the game worked with 3.15.0, so it's not a kernel bug). GPU: Radeon HD 4850 (RV770) -- You are receiving this mail because: You are the assignee for the bug.

1 11

[PATCH] drm: sti: do not iterate over the info frame array
by Benjamin Gaignard 03 Sep '14

03 Sep '14

avi infoframe is a 13 bytes array, do not read after this limite. Signed-off-by: Benjamin Gaignard <benjamin.gaignard(a)linaro.org> --- drivers/gpu/drm/sti/sti_hdmi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index 284e541..90ee20a 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -298,7 +298,6 @@ static int hdmi_avi_infoframe_config(struct sti_hdmi *hdmi) hdmi_write(hdmi, val, HDMI_SW_DI_N_PKT_WORD2(HDMI_IFRAME_SLOT_AVI)); val = frame[0xC]; - val |= frame[0xD] << 8; hdmi_write(hdmi, val, HDMI_SW_DI_N_PKT_WORD3(HDMI_IFRAME_SLOT_AVI)); /* Enable transmission slot for AVI infoframe -- 1.9.1

1 0

[PATCH 1/3] drm/qxl: Remove release_lock stupidity
by Maarten Lankhorst 03 Sep '14

03 Sep '14

The locking of release_lock was stupid; it should have been be called with fence_lock_irq if it was legitimately used. Unfortunately it never protected anything except the fence implementation correctly. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- drivers/gpu/drm/qxl/qxl_debugfs.c | 2 -- drivers/gpu/drm/qxl/qxl_release.c | 9 +++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c index a4a63fd84803..6911b8c44492 100644 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c @@ -57,7 +57,6 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data) struct qxl_device *qdev = node->minor->dev->dev_private; struct qxl_bo *bo; - spin_lock(&qdev->release_lock); list_for_each_entry(bo, &qdev->gem.objects, list) { struct reservation_object_list *fobj; int rel; @@ -71,7 +70,6 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data) (unsigned long)bo->gem_base.size, bo->pin_count, rel); } - spin_unlock(&qdev->release_lock); return 0; } diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index 15158c5a5b3a..828d47e90dce 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -71,7 +71,7 @@ static long qxl_fence_wait(struct fence *fence, bool intr, signed long timeout) retry: sc++; - if (fence_is_signaled_locked(fence)) + if (fence_is_signaled(fence)) goto signaled; qxl_io_notify_oom(qdev); @@ -80,11 +80,11 @@ retry: if (!qxl_queue_garbage_collect(qdev, true)) break; - if (fence_is_signaled_locked(fence)) + if (fence_is_signaled(fence)) goto signaled; } - if (fence_is_signaled_locked(fence)) + if (fence_is_signaled(fence)) goto signaled; if (have_drawable_releases || sc < 4) { @@ -457,8 +457,6 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release) glob = bo->glob; spin_lock(&glob->lru_lock); - /* acquire release_lock to protect bo->resv->fence and its contents */ - spin_lock(&qdev->release_lock); list_for_each_entry(entry, &release->bos, head) { bo = entry->bo; @@ -468,7 +466,6 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release) ttm_bo_add_to_lru(bo); __ttm_bo_unreserve(bo); } - spin_unlock(&qdev->release_lock); spin_unlock(&glob->lru_lock); ww_acquire_fini(&release->ticket); } -- 2.0.4

1 2

Re: [RFC] firmware coredump: add new firmware coredump class
by Daniel Vetter 03 Sep '14

03 Sep '14

If the idea is to also convert gpu crash dumps to this we should add dri-devel. And there the crashes are usually not due to firmware, but because the shaders and command batches userspace submitted have issues, so this should also be renamed to dev_coredump I think. On the overall design I wonder whether this shouldn't work more like a real core dump and dump to a real file. At least currently the dumps i915 creates are only useful as a general guide to where things went wrong, but if we actually want to submit them as traces to the hardware people we need to dump a _lot_ more. Otoh with the future of shared virtual address spaces between gpu/cpu we might just do a real core dump, so maybe this use case should be out of scope for your patch here. On the logic itself I'm not sure whether the timeout is all that useful - at least in i915 our crash recovery works well enough that reporters often don't realize right away when it happened, but only later on when looking through logs to explain the tiny corruptions. If the crashdupm has evapored meanwhile that's not that useful. Also, at least for gpus it's usually not interesting to grab subsequent dumps: Often the gpu is in a bad mood due to the first crash, or it's just a massive row of duplicated dumps. So in i915 we only record the first crash and keep it around forever. And tooling can still free it by writing to the file. This also ensures that we don't waste excessive amounts of memory with crash dumps. And if we want to use this for i915 we need some way for tools to go from the i915 drm class device node to the error state, not just from the error state back to the device. -Daniel On Wed, Sep 3, 2014 at 1:15 PM, Johannes Berg <johannes(a)sipsolutions.net> wrote: > From: Johannes Berg <johannes.berg(a)intel.com> > > Many devices run firmware, and as other software such firmware has > bugs. When it misbehaves, however, it is often much harder to debug > than software running on the host. > > Introduce a "firmware coredump" mechanism to allow dumping internal > firmware state through a generalized mechanism. As all devices are > different and information needed can vary accordingly, this doesn't > prescribe a file format - it just provides mechanism to get data to > be able to capture it in a generalized way (e.g. in distributions.) > > Note that generalized capturing of such data may result in privacy > issues, so users generally need to be involved. In order to allow > certain users/system integrators/... to disable the feature at all, > introduce a Kconfig option to override the drivers that would like > to have the feature. > > For now, this provides two ways of dumping data: > 1) with a vmalloc'ed area, that is then given to the fwcoredump > subsystem and freed after retrieval or timeout > 2) with a generalized reader/free function method > > We could/should add more options, e.g. a list of pages, since the > vmalloc area is very limited on some architectures. > > Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> > --- > MAINTAINERS | 7 ++ > drivers/base/Kconfig | 21 +++++ > drivers/base/Makefile | 1 + > drivers/base/fwcoredump.c | 222 > +++++++++++++++++++++++++++++++++++++++++++++ > include/linux/fwcoredump.h | 35 +++++++ > 5 files changed, 286 insertions(+) > create mode 100644 drivers/base/fwcoredump.c > create mode 100644 include/linux/fwcoredump.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 2f85f55c8fb8..394bda1cde52 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -3729,6 +3729,13 @@ F: Documentation/firmware_class/ > F: drivers/base/firmware*.c > F: include/linux/firmware.h > > +FIRMWARE COREDUMP (fwcoredump) > +M: Johannes Berg <johannes(a)sipsolutions.net> > +L: linux-kernel(a)vger.kernel.org > +S: Maintained > +F: drivers/base/fwcoredump.c > +F: include/linux/fwcoredump.h > + > FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card) > M: Joshua Morris <josh.h.morris(a)us.ibm.com> > M: Philip Kelleher <pjk1939(a)linux.vnet.ibm.com> > diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig > index 4e7f0ff83ae7..31eabab20c8a 100644 > --- a/drivers/base/Kconfig > +++ b/drivers/base/Kconfig > @@ -165,6 +165,27 @@ config FW_LOADER_USER_HELPER_FALLBACK > > If you are unsure about this, say N here. > > +config WANT_FW_COREDUMP > + bool > + help > + Drivers should "select" this option if they desire to use the > + firmware coredump mechanism. > + > +config DISABLE_FW_COREDUMP > + bool "Disable firmware coredump" if EXPERT > + help > + Disable the firmware coredump mechanism despite drivers wanting > to > + use it; this allows for more sensitive systems or systems that > + don't want to ever access the information to not have the code, > + nor keep any data. > + > + If unsure, say N. > + > +config FW_COREDUMP > + bool > + default y if WANT_FW_COREDUMP > + depends on !DISABLE_FW_COREDUMP > + > config DEBUG_DRIVER > bool "Driver Core verbose debug messages" > depends on DEBUG_KERNEL > diff --git a/drivers/base/Makefile b/drivers/base/Makefile > index 4aab26ec0292..2af1be519653 100644 > --- a/drivers/base/Makefile > +++ b/drivers/base/Makefile > @@ -21,6 +21,7 @@ obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o > obj-$(CONFIG_REGMAP) += regmap/ > obj-$(CONFIG_SOC_BUS) += soc.o > obj-$(CONFIG_PINCTRL) += pinctrl.o > +obj-$(CONFIG_FW_COREDUMP) += fwcoredump.o > > ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG > > diff --git a/drivers/base/fwcoredump.c b/drivers/base/fwcoredump.c > new file mode 100644 > index 000000000000..f70bef0727a9 > --- /dev/null > +++ b/drivers/base/fwcoredump.c > @@ -0,0 +1,222 @@ > > +/****************************************************************************** > + * > + * This file is provided under the GPLv2 license. > + * > + * GPL LICENSE SUMMARY > + * > + * Copyright(c) 2014 Intel Mobile Communications GmbH > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of version 2 of the GNU General Public License as > + * published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, but > + * WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * General Public License for more details. > + * > + * The full GNU General Public License is included in this distribution > + * in the file called COPYING. > + * > + * Contact Information: > + * Intel Linux Wireless <ilw(a)linux.intel.com> > + * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR > 97124-6497 > + */ > +#include <linux/module.h> > +#include <linux/device.h> > +#include <linux/fwcoredump.h> > +#include <linux/list.h> > +#include <linux/slab.h> > +#include <linux/fs.h> > +#include <linux/workqueue.h> > + > +MODULE_AUTHOR("Johannes Berg <johannes(a)sipsolutions.net>"); > +MODULE_DESCRIPTION("Firmware Coredump support"); > +MODULE_LICENSE("GPL"); > + > +/* if data isn't read by userspace after 5 minutes delete it */ > +#define FWC_TIMEOUT (HZ * 60 * 5) > + > +struct fwc_entry { > + struct device fwc_dev; > + const void *data; > + size_t datalen; > + struct module *owner; > + ssize_t (*read)(char *buffer, loff_t offset, size_t count, > + const void *data, size_t datalen); > + void (*free)(const void *data); > + struct delayed_work del_wk; > +}; > + > +static struct fwc_entry *dev_to_fwc(struct device *dev) > +{ > + return container_of(dev, struct fwc_entry, fwc_dev); > +} > + > +static void fwc_dev_release(struct device *dev) > +{ > + struct fwc_entry *fwc = dev_to_fwc(dev); > + > + fwc->free(fwc->data); > + kfree(fwc); > +} > + > +static void fwc_del(struct work_struct *wk) > +{ > + struct fwc_entry *fwc; > + > + fwc = container_of(wk, struct fwc_entry, del_wk.work); > + > + device_del(&fwc->fwc_dev); > + put_device(&fwc->fwc_dev); > +} > + > +static ssize_t fwc_data_read(struct file *filp, struct kobject *kobj, > + struct bin_attribute *bin_attr, > + char *buffer, loff_t offset, size_t count) > +{ > + struct device *dev = kobj_to_dev(kobj); > + struct fwc_entry *fwc = dev_to_fwc(dev); > + > + return fwc->read(buffer, offset, count, fwc->data, fwc->datalen); > +} > + > +static ssize_t fwc_data_write(struct file *filp, struct kobject *kobj, > + struct bin_attribute *bin_attr, > + char *buffer, loff_t offset, size_t count) > +{ > + struct device *dev = kobj_to_dev(kobj); > + struct fwc_entry *fwc = dev_to_fwc(dev); > + > + schedule_delayed_work(&fwc->del_wk, 0); > + > + return count; > +} > + > +static struct bin_attribute fwc_attr_data = { > + .attr = { .name = "data", .mode = S_IRUSR | S_IWUSR, }, > + .size = 0, > + .read = fwc_data_read, > + .write = fwc_data_write, > +}; > + > +static struct bin_attribute *fwc_dev_bin_attrs[] = { > + &fwc_attr_data, NULL, > +}; > + > +static const struct attribute_group fwc_dev_group = { > + .bin_attrs = fwc_dev_bin_attrs, > +}; > + > +static const struct attribute_group *fwc_dev_groups[] = { > + &fwc_dev_group, NULL, > +}; > + > +static struct class fwc_class = { > + .name = "fwcoredump", > + .dev_release = fwc_dev_release, > + .dev_groups = fwc_dev_groups, > +}; > + > +static ssize_t fwc_readv(char *buffer, loff_t offset, size_t count, > + const void *data, size_t datalen) > +{ > + if (offset > datalen) > + return -EINVAL; > + > + if (offset + count > datalen) > + count = datalen - offset; > + > + if (count) > + memcpy(buffer, ((u8 *)data) + offset, count); > + > + return count; > +} > + > +/** > + * fw_coredumpv - create firmware coredump with vmalloc data > + * @dev: the struct device for the crashed device > + * @data: vmalloc data containing the firmware coredump > + * @datalen: length of the data > + * @gfp: allocation flags > + */ > +void fw_coredumpv(struct device *dev, const void *data, size_t datalen, > + gfp_t gfp) > +{ > + fw_coredumpm(dev, NULL, data, datalen, gfp, fwc_readv, vfree); > +} > +EXPORT_SYMBOL(fw_coredumpv); > + > +/** > + * fw_coredumpm - create firmware coredump with read/free methods > + * @dev: the struct device for the crashed device > + * @data: data cookie for the @read/@free functions > + * @datalen: length of the data > + * @gfp: allocation flags > + * @read: function to read from the given buffer > + * @free: function to free the given buffer > + */ > +void fw_coredumpm(struct device *dev, struct module *owner, > + const void *data, size_t datalen, gfp_t gfp, > + ssize_t (*read)(char *buffer, loff_t offset, size_t > count, > + const void *data, size_t datalen), > + void (*free)(const void *data)) > +{ > + static atomic_t fwc_count = ATOMIC_INIT(0); > + struct fwc_entry *fwc; > + > + if (!try_module_get(owner)) > + return; > + > + fwc = kzalloc(sizeof(*fwc), gfp); > + if (!fwc) > + goto put_module; > + > + fwc->owner = owner; > + fwc->data = data; > + fwc->datalen = datalen; > + fwc->read = read; > + fwc->free = free; > + > + device_initialize(&fwc->fwc_dev); > + > + dev_set_name(&fwc->fwc_dev, "fwc%d", > atomic_inc_return(&fwc_count)); > + fwc->fwc_dev.class = &fwc_class; > + > + if (device_add(&fwc->fwc_dev)) > + goto put_device; > + > + if (sysfs_create_link(&fwc->fwc_dev.kobj, &dev->kobj, > "failing_device")) > + /* nothing - symlink will be missing but that's ok */; > + > + INIT_DELAYED_WORK(&fwc->del_wk, fwc_del); > + schedule_delayed_work(&fwc->del_wk, FWC_TIMEOUT); > + > + return; > + put_device: > + put_device(&fwc->fwc_dev); > + put_module: > + module_put(owner); > +} > +EXPORT_SYMBOL(fw_coredumpm); > + > +static int __init fwcoredump_init(void) > +{ > + return class_register(&fwc_class); > +} > +module_init(fwcoredump_init); > + > +static int fwc_free(struct device *dev, void *data) > +{ > + struct fwc_entry *fwc = dev_to_fwc(dev); > + > + flush_delayed_work(&fwc->del_wk); > + return 0; > +} > + > +static void __exit fwcoredump_exit(void) > +{ > + class_for_each_device(&fwc_class, NULL, NULL, fwc_free); > + class_unregister(&fwc_class); > +} > +module_exit(fwcoredump_exit); > diff --git a/include/linux/fwcoredump.h b/include/linux/fwcoredump.h > new file mode 100644 > index 000000000000..168f2d6abfc0 > --- /dev/null > +++ b/include/linux/fwcoredump.h > @@ -0,0 +1,35 @@ > +#ifndef __FWCOREDUMP_H > +#define __FWCOREDUMP_H > + > +#include <linux/device.h> > +#include <linux/module.h> > +#include <linux/vmalloc.h> > + > +#ifdef CONFIG_FW_COREDUMP > +void fw_coredumpv(struct device *dev, const void *data, size_t datalen, > + gfp_t gfp); > + > +void fw_coredumpm(struct device *dev, struct module *owner, > + const void *data, size_t datalen, gfp_t gfp, > + ssize_t (*read)(char *buffer, loff_t offset, size_t > count, > + const void *data, size_t datalen), > + void (*free)(const void *data)); > +#else > +static inline void fw_coredumpv(struct device *dev, const void *data, > + size_t datalen, gfp_t gfp) > +{ > + vfree(data); > +} > + > +static inline void > +fw_coredumpm(struct device *dev, struct module *owner, > + const void *data, size_t datalen, gfp_t gfp, > + ssize_t (*read)(char *buffer, loff_t offset, size_t count, > + const void *data, size_t datalen), > + void (*free)(const void *data)) > +{ > + free(data); > +} > +#endif /* CONFIG_FW_COREDUMP */ > + > +#endif /* __FWCOREDUMP_H */ > -- > 2.1.0 > > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

1 0

[PATCH -v2 1/4] drm/i915: init sprites with univeral plane init function
by Gustavo Padovan 03 Sep '14

03 Sep '14

From: Derek Foreman <derek.foreman(a)collabora.co.uk> Really just for completeness - old init function ends up making the plane exactly the same way due to the way the enums are set up. Signed-off-by: Derek Foreman <derek.foreman(a)collabora.co.uk> --- drivers/gpu/drm/i915/intel_sprite.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 0bdb00b..4cbe286 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1375,10 +1375,10 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) intel_plane->plane = plane; intel_plane->rotation = BIT(DRM_ROTATE_0); possible_crtcs = (1 << pipe); - ret = drm_plane_init(dev, &intel_plane->base, possible_crtcs, - &intel_plane_funcs, - plane_formats, num_plane_formats, - false); + ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs, + &intel_plane_funcs, + plane_formats, num_plane_formats, + DRM_PLANE_TYPE_OVERLAY); if (ret) { kfree(intel_plane); goto out; -- 1.9.3

3 11

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2014