dri-devel November 2012

dri-devel@lists.freedesktop.org

126 participants
797 discussions

[PATCH] drm/omap: fix typo
by Rob Clark 08 Nov '12

08 Nov '12

From: Rob Clark <rob(a)ti.com> The patch 'drm/omap: add support for ARCH_MULTIPLATFORM' had a small mistake, using GET_OMAP_REVISION() instead of GET_OMAP_TYPE. Signed-off-by: Rob Clark <rob(a)ti.com> --- arch/arm/mach-omap2/drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index 49a7ffb..1211790 100644 --- a/arch/arm/mach-omap2/drm.c +++ b/arch/arm/mach-omap2/drm.c @@ -57,7 +57,7 @@ static int __init omap_init_drm(void) oh->name); } - platform_data.omaprev = GET_OMAP_REVISION(); + platform_data.omaprev = GET_OMAP_TYPE; return platform_device_register(&omap_drm_device); -- 1.7.12.1

2 1

[pull] radeon drm-fixes-3.7
by alexdeucher＠gmail.com 08 Nov '12

08 Nov '12

From: Alex Deucher <alexander.deucher(a)amd.com> Hi Dave, Just one patch that fixes a display regression in certain cases. The following changes since commit 695ddeb457584a602f2ba117d08ce37cf6ec1589: drm/radeon: fix typo in evergreen_mc_resume() (2012-11-07 10:53:49 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-3.7 Alex Deucher (1): drm/radeon/dce3: switch back to old pll allocation order for discrete drivers/gpu/drm/radeon/atombios_crtc.c | 54 ++++++++++++++++++------------- 1 files changed, 31 insertions(+), 23 deletions(-)

2 1

[PATCH] drm/radeon/cayman: add some missing regs to the VM reg checker
by alexdeucher＠gmail.com 08 Nov '12

08 Nov '12

From: Alex Deucher <alexander.deucher(a)amd.com> These regs were being wronly rejected leading to rendering issues. fixes: https://bugs.freedesktop.org/show_bug.cgi?id=56876 Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/evergreen_cs.c | 3 +++ drivers/gpu/drm/radeon/evergreend.h | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 95e6318..c042e49 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -2725,6 +2725,9 @@ static bool evergreen_vm_reg_valid(u32 reg) /* check config regs */ switch (reg) { case GRBM_GFX_INDEX: + case CP_STRMOUT_CNTL: + case CP_COHER_CNTL: + case CP_COHER_SIZE: case VGT_VTX_VECT_EJECT_REG: case VGT_CACHE_INVALIDATION: case VGT_GS_VERTEX_REUSE: diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h index df542f1..2bc0f6a 100644 --- a/drivers/gpu/drm/radeon/evergreend.h +++ b/drivers/gpu/drm/radeon/evergreend.h @@ -91,6 +91,10 @@ #define FB_READ_EN (1 << 0) #define FB_WRITE_EN (1 << 1) +#define CP_STRMOUT_CNTL 0x84FC + +#define CP_COHER_CNTL 0x85F0 +#define CP_COHER_SIZE 0x85F4 #define CP_COHER_BASE 0x85F8 #define CP_STALLED_STAT1 0x8674 #define CP_STALLED_STAT2 0x8678 -- 1.7.7.5

2 2

[PATCH 1/3] scatterlist: add sg_clone_table function
by Prathyush K 08 Nov '12

08 Nov '12

This patch adds another constructor for an sg table. An sg table is created from an existing sg table. The new sg table is allocated and initialized with same data from the original sg table. The user has to call 'sg_clone_table' with the required sg table, the existing sg table and the gfp allocation mask. This function can be used in the dma-buf framework. If a buffer needs to be shared across multiple devices using the dma_buf framework, an sg table needs to be created and mapped to the target device's address space. This is done in most drivers by creating the sg table from the pages of the buffer (e.g. calling sg_alloc_table_from_pages function). In case this needs to be done frequently (e.g. a framebuffer is repeatedly shared with the GPU, video accelerator, CSC etc), it is efficient to create an sg table once during buffer allocation and then create temporary sg tables for dma mapping from the original sg table. Signed-off-by: Prathyush K <prathyush.k(a)samsung.com> --- include/linux/scatterlist.h | 1 + lib/scatterlist.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index 4bd6c06..fd12525 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h @@ -215,6 +215,7 @@ void sg_free_table(struct sg_table *); int __sg_alloc_table(struct sg_table *, unsigned int, unsigned int, gfp_t, sg_alloc_fn *); int sg_alloc_table(struct sg_table *, unsigned int, gfp_t); +int sg_clone_table(struct sg_table *, struct sg_table *, gfp_t); int sg_alloc_table_from_pages(struct sg_table *sgt, struct page **pages, unsigned int n_pages, unsigned long offset, unsigned long size, diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 3675452..4f106b3 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -329,6 +329,42 @@ int sg_alloc_table(struct sg_table *table, unsigned int nents, gfp_t gfp_mask) } EXPORT_SYMBOL(sg_alloc_table); +/* + * sg_clone_table - Allocate and initialize an sg table from an existing + * sg table + * @sgt_in: The sg table to clone + * @sgt_out: The output sg table cloned from the original sg table. + * @gfp_mask: GFP allocation mask + * + * Description: + * Allocate and initialize an sg table from an existing sg table. A user + * would want to create a temporary sg table which is a clone of an + * existing table. This cloned sg table is released by sg_free_table. + * + * Returns: + * 0 on success, negative error on failure + */ +int sg_clone_table(struct sg_table *sgt_in, struct sg_table *sgt_out, + gfp_t gfp_mask) +{ + struct scatterlist *s, *s_out; + unsigned int i; + int ret; + + ret = sg_alloc_table(sgt_out, sgt_in->orig_nents, gfp_mask); + if (unlikely(ret)) + return ret; + + s_out = sgt_out->sgl; + for_each_sg(sgt_in->sgl, s, sgt_in->orig_nents, i) { + sg_set_page(s_out, sg_page(s), s->length, s->offset); + s_out = sg_next(s_out); + } + + return 0; +} +EXPORT_SYMBOL(sg_clone_table); + /** * sg_alloc_table_from_pages - Allocate and initialize an sg table from * an array of pages -- 1.7.0.4

2 5

[PATCH] drm: Reject addfb2 with undefined flag bits set
by ville.syrjala＠linux.intel.com 08 Nov '12

08 Nov '12

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- drivers/gpu/drm/drm_crtc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index ef1b221..25bd64f 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2323,6 +2323,11 @@ int drm_mode_addfb2(struct drm_device *dev, if (!drm_core_check_feature(dev, DRIVER_MODESET)) return -EINVAL; + if (r->flags & ~DRM_MODE_FB_INTERLACED) { + DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags); + return -EINVAL; + } + if ((config->min_width > r->width) || (r->width > config->max_width)) { DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n", r->width, config->min_width, config->max_width); -- 1.7.8.6

1 0

Re: [PATCH 12/12] OMAPDSS: DPI: always use DSI PLL if available
by Rob Clark 08 Nov '12

08 Nov '12

On 11/05/2012 02:55 AM, Tomi Valkeinen wrote: >>> But even then, choosing the manager is not easy, as whoever chooses the >>> >>manager needs to observe all the possible displays used at the same >>> >>time... >> > >> >Right. I was wondering if omapfb/omapdrm could understand the 'all >> >possible displays information' better compared to a panel's probe. >> > >> >Even omapdrm/omafb can't be perfect because we could insert a panel >> >driver module at any time, and omapfb/omapdrm may miss that out. > True, omapdrm/fb may have a better idea. It's still unclear though. > Currently we have quite strict order in the sequence the modules need to > be loaded, which is quite bad and causes issues. We should make things > more dynamic, so that the initialization of the drivers could happen > more freely. > > But that creates more problems: when booting up, omapfb starts. But > omapfb can't know if all the panel drivers have already been loaded. > omapfb may see that DVI is the default display, but what should it do if > DVI doesn't have a driver yet? It could wait, but perhaps the driver for > DVI will never even be loaded. The encoder which is connected to the crtc (manager) is picked by combination of encoder->possible_crtcs bitmask and connector->best_encoder(). We could keep things limited so that the association of crtc to encoder (manager to output, roughly) never changes, but this isn't really the right thing to do. It is better that the dssdev not rely on knowing the manager it is attached to at probe time, but instead grab resources more dynamically. Also, at the moment we don't really have any notification to userspace about new encoders/connectors showing up (or conversely, being removed). Only about existing connectors being plugged/unplugged. The closest analogy is perhaps the USB display devices, but even there it is only the entire drm device that is plugged/unplugged. And TBH I don't really see the point in supporting panel drivers being dynamically loaded. It isn't like someone is dynamically soldering on a new display connector to some board that is running. I think omapfb or omapdrm probe should trigger registering the compiled-in panel drivers, so that it can be sure that the dssdev's pop up before it goes and creates drm connector objects. Currently we have to hack around this in omapdrm with late_initcall() to ensure the panel drivers are probed first, but that is an ugly hack that I'd like to get rid of. BR, -R

4 7

[PATCH] nouveau: Fix crash after D3
by Daniel J Blueman 07 Nov '12

07 Nov '12

In 3.7-rc4, when starting X with the integrated GPU and suspending the discrete GPU, after one or more 32-bit applications are used (eg Skype) and X is stopped, we hit a panic. Prevent this by testing if the fini function is valid. Full panic bootlog is at: http://quora.org/2012/nouveau/dmesg-crash.txt Xorg.log is at: http://quora.org/2012/nouveau/Xorg.0.log-crash.txt Kernel log after fix is at: http://quora.org/2012/nouveau/dmesg-fix.txt Signed-off-by: Daniel J Blueman <daniel(a)quora.org> --- drivers/gpu/drm/nouveau/core/core/object.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/core/core/object.c b/drivers/gpu/drm/nouveau/core/core/object.c index 0daab62..3da3525 100644 --- a/drivers/gpu/drm/nouveau/core/core/object.c +++ b/drivers/gpu/drm/nouveau/core/core/object.c @@ -354,12 +354,16 @@ static int nouveau_object_decf(struct nouveau_object *object) { int ret; + struct nouveau_ofuncs *pfuncs; nv_trace(object, "stopping...\n"); - ret = nv_ofuncs(object)->fini(object, false); - if (ret) - nv_warn(object, "failed fini, %d\n", ret); + pfuncs = nv_ofuncs(object); + if (pfuncs->fini) { + ret = nv_ofuncs(object)->fini(object, false); + if (ret) + nv_warn(object, "failed fini, %d\n", ret); + } if (object->engine) { mutex_lock(&nv_subdev(object->engine)->mutex); -- 1.7.10.4

2 1

[PATCH 1/2] drm: fix order of event_lock wrt. vblank_time_clock
by Imre Deak 07 Nov '12

07 Nov '12

drm_vblank_off() requires callers to hold the event_lock, while itself locking vbl_time and vblank_time_lock. This defines a dependency chain that conflicts with the one in drm_handle_vblank() where we first lock vblank_time_lock and then the event_lock. Fix this by reversing the locking order in drm_handle_vblank(). This should've triggered a lockdep warning in the exynos driver, the rest of the drivers were ok, since they are not using drm_vblank_off(), or as in the case of the intel driver were not holding the event_lock when calling drm_vblank_off(). This latter issue is addressed in the next patch. Signed-off-by: Imre Deak <imre.deak(a)intel.com> --- drivers/gpu/drm/drm_irq.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) Tested with i915, the rest of the drivers should be checked with lockdep enabled. diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 3a3d0ce..2193d4a 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1236,17 +1236,21 @@ done: return ret; } +/** + * drm_handle_vblank_events - send pending vblank events + * @dev: DRM device + * @crtc: crtc where the vblank(s) happened + * + * Must be called with @dev->event_lock held. + */ static void drm_handle_vblank_events(struct drm_device *dev, int crtc) { struct drm_pending_vblank_event *e, *t; struct timeval now; - unsigned long flags; unsigned int seq; seq = drm_vblank_count_and_time(dev, crtc, &now); - spin_lock_irqsave(&dev->event_lock, flags); - list_for_each_entry_safe(e, t, &dev->vblank_event_list, base.link) { if (e->pipe != crtc) continue; @@ -1266,8 +1270,6 @@ static void drm_handle_vblank_events(struct drm_device *dev, int crtc) e->event.sequence); } - spin_unlock_irqrestore(&dev->event_lock, flags); - trace_drm_vblank_event(crtc, seq); } @@ -1285,21 +1287,22 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc) s64 diff_ns; struct timeval tvblank; unsigned long irqflags; + bool ret = false; if (!dev->num_crtcs) return false; + spin_lock_irqsave(&dev->event_lock, irqflags); + /* Need timestamp lock to prevent concurrent execution with * vblank enable/disable, as this would cause inconsistent * or corrupted timestamps and vblank counts. */ - spin_lock_irqsave(&dev->vblank_time_lock, irqflags); + spin_lock(&dev->vblank_time_lock); /* Vblank irq handling disabled. Nothing to do. */ - if (!dev->vblank_enabled[crtc]) { - spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags); - return false; - } + if (!dev->vblank_enabled[crtc]) + goto unlock_ret; /* Fetch corresponding timestamp for this vblank interval from * driver and store it in proper slot of timestamp ringbuffer. @@ -1340,7 +1343,12 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc) DRM_WAKEUP(&dev->vbl_queue[crtc]); drm_handle_vblank_events(dev, crtc); - spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags); - return true; + ret = true; + +unlock_ret: + spin_unlock(&dev->vblank_time_lock); + spin_unlock_irqrestore(&dev->event_lock, irqflags); + + return ret; } EXPORT_SYMBOL(drm_handle_vblank); -- 1.7.9.5

4 14

[PATCH, RESEND] nouveau: Prevent kernel log mangling
by Daniel J Blueman 07 Nov '12

07 Nov '12

On 3.7-rc4, add missing newline to to prevent the following kernel log line getting appended to the current one after switching the integrated GPU and suspending the discrete GPU. Signed-off-by: Daniel J Blueman <daniel(a)quora.org> --- drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c index fe1ebf1..dc27e79 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c +++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c @@ -50,7 +50,7 @@ auxch_init(struct nouveau_i2c *aux, int ch) ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); udelay(1); if (!timeout--) { - AUX_ERR("begin idle timeout 0x%08x", ctrl); + AUX_ERR("begin idle timeout 0x%08x\n", ctrl); return -EBUSY; } } while (ctrl & 0x03010000); -- 1.7.10.4

1 0

[PATCH] drm: exynos: add iommu support in hdmi driver with dt enabled
by Rahul Sharma 07 Nov '12

07 Nov '12

This patch adds iommu support for hdmi driver with device tree based search. It searches for sysmmu property in hdmi dt node to get tv iommu device pointer which will be used to configure iommu hw interface. This patch is based on "exynos-drm-next-iommu" branch at http://git.kernel.org/?p=linux/kernel/git/daeinki/drm-exynos.git This patch is having dependency on linux-samsung-soc patchset named "add dt based support for iommu for hdmi" Signed-off-by: Rahul Sharma <rahul.sharma(a)samsung.com> Signed-off-by: Prathyush K <prathyush.k(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_hdmi.c | 35 ++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index d1a1d71..ee110c9 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -34,7 +34,9 @@ #include <linux/regulator/consumer.h> #include <linux/io.h> #include <linux/of_gpio.h> +#include <linux/of_platform.h> #include <plat/gpio-cfg.h> +#include <mach/sysmmu.h> #include <drm/exynos_drm.h> @@ -2275,6 +2277,34 @@ void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy) } #ifdef CONFIG_OF + +static int drm_hdmi_dt_init_iommu(struct device *dev) +{ + struct platform_device *pds; + struct device_node *dn, *dns; + const __be32 *parp; + + dn = dev->of_node; + parp = of_get_property(dn, "sysmmu", NULL); + if (parp == NULL) { + dev_err(dev, "failed to find sysmmu property\n"); + return -EINVAL; + } + dns = of_find_node_by_phandle(be32_to_cpup(parp)); + if (dns == NULL) { + dev_err(dev, "failed to find sysmmu node\n"); + return -EINVAL; + } + pds = of_find_device_by_node(dns); + if (pds == NULL) { + dev_err(dev, "failed to find sysmmu platform device\n"); + return -EINVAL; + } + + platform_set_sysmmu(&pds->dev, dev); + return 0; +} + static struct s5p_hdmi_platform_data *drm_hdmi_dt_parse_pdata (struct device *dev) { @@ -2294,6 +2324,11 @@ static struct s5p_hdmi_platform_data *drm_hdmi_dt_parse_pdata goto err_data; } + if (drm_hdmi_dt_init_iommu(dev)){ + DRM_ERROR("no sysmmu property found\n"); + goto err_data; + } + pd->hpd_gpio = of_get_named_gpio_flags(np, "hpd-gpio", 0, &flags); return pd; -- 1.7.0.4

4 4

← Newer
1
...
67
68
69
70
71
72
73
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2012