dri-devel April 2013

dri-devel@lists.freedesktop.org

142 participants
765 discussions

[PATCH 00/15] drm/gma500: Requesting review for gma500-next
by Patrik Jakobsson 10 Apr '13

10 Apr '13

This is what's in store for gma500 and to be included in drm-next. I'd greatly appreciate review of these patches (and testing if possible). Most of them are cleanups and the rest are fixes and features for restoring our state after suspend / hibernate. There still seems to be issues with hibernating on Cedarview but hopefully no regressions. The repository can be found at: https://github.com/patjak/drm-gma500.git gma500-next Thanks Patrik Jakobsson Alexandru Gheorghiu (1): drivers: gpu: drm: gma500: Replaced calls kzalloc & memcpy with kmemdup Kero van Gelder (1): gma500: Make VGA and HDMI connector hotpluggable Patrik Jakobsson (10): drm/gma500: Remove unused i8xx clock limits drm/gma500: Calculate clock in one function instead of three identical drm/gma500: Type clock limits directly into array and remove defines drm/gma500: Remove unnecessary function exposure drm/gma500: Clean up various defines drm/gma500: Change fb name so pm-utils doesn't apply quirks drm/gma500: Add support for rebuilding the gtt drm/gma500: Activate the gtt rebuild on suspend/resume drm/gma500: Add hooks for hibernation drm/gma500: Fix hibernation problems on sdvo encoders Syam Sidhardhan (1): gma500: medfield: Fix possible NULL pointer dereference Wang YanQing (1): gma500: remove unused drm_psb_no_fb Xiong Zhou (1): gma500:fix build failure for 3.9-rc5 drivers/gpu/drm/gma500/Kconfig | 13 ++- drivers/gpu/drm/gma500/cdv_intel_crt.c | 1 + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 1 + drivers/gpu/drm/gma500/framebuffer.c | 2 +- drivers/gpu/drm/gma500/gtt.c | 45 ++++++-- drivers/gpu/drm/gma500/gtt.h | 2 +- drivers/gpu/drm/gma500/intel_bios.c | 3 +- drivers/gpu/drm/gma500/intel_bios.h | 6 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 7 +- drivers/gpu/drm/gma500/power.c | 17 +++ drivers/gpu/drm/gma500/power.h | 3 + drivers/gpu/drm/gma500/psb_drv.c | 3 + drivers/gpu/drm/gma500/psb_drv.h | 1 - drivers/gpu/drm/gma500/psb_intel_display.c | 154 ++++++---------------------- drivers/gpu/drm/gma500/psb_intel_display.h | 3 - drivers/gpu/drm/gma500/psb_intel_drv.h | 8 -- drivers/gpu/drm/gma500/psb_intel_reg.h | 1 - drivers/gpu/drm/gma500/psb_intel_sdvo.c | 34 ++++++ drivers/gpu/drm/gma500/psb_irq.h | 6 +- 19 files changed, 148 insertions(+), 162 deletions(-) -- 1.7.10.4

1 0

[PATCH v2] gma500:fix build failure for 3.9-rc5
by Xiong Zhou 10 Apr '13

10 Apr '13

From: Xiong Zhou <jencce.kernel(a)gmail.com> Last version of this patch is not clear enough and X86 duplicated. This patch fixes build failure of v3.9-rc5 and rc6. When config ACPI_VIDEO as m, DRM_GMA500 as y, here comes the failure. GMA5/600 needs acpi_video just like nouveau. And some tab type fix by the way. Failure message: drivers/built-in.o: In function `psb_driver_load': kernel-3.9-rc5/drivers/gpu/drm/gma500/psb_drv.c:340: \ undefined reference to `acpi_video_register' make: *** [vmlinux] Error 1 Signed-off-by: Xiong Zhou <jencce.kernel(a)gmail.com> --- drivers/gpu/drm/gma500/Kconfig | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig index 1188f0f..1f6e2df 100644 --- a/drivers/gpu/drm/gma500/Kconfig +++ b/drivers/gpu/drm/gma500/Kconfig @@ -2,10 +2,15 @@ config DRM_GMA500 tristate "Intel GMA5/600 KMS Framebuffer" depends on DRM && PCI && X86 select FB_CFB_COPYAREA - select FB_CFB_FILLRECT - select FB_CFB_IMAGEBLIT - select DRM_KMS_HELPER - select DRM_TTM + select FB_CFB_FILLRECT + select FB_CFB_IMAGEBLIT + select DRM_KMS_HELPER + select DRM_TTM + # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915 + select ACPI_VIDEO if ACPI + select BACKLIGHT_CLASS_DEVICE if ACPI + select VIDEO_OUTPUT_CONTROL if ACPI + select INPUT if ACPI help Say yes for an experimental 2D KMS framebuffer driver for the Intel GMA500 ('Poulsbo') and other Intel IMG based graphics

2 1

[PATCH] drivers/gpu/drm/gma500:fix build failure for 3.9-rc5
by Xiong Zhou 10 Apr '13

10 Apr '13

From: Xiong Zhou <jencce.kernel(a)gmail.com> This patch fixes build failure of v3.9-rc5. When config ACPI_VIDEO as m, DRM_GMA500 as y, here comes the failure. gma5/600 needs acpi_video just like nouveau. Failure message: drivers/built-in.o: In function `psb_driver_load': kernel-3.9-rc5/drivers/gpu/drm/gma500/psb_drv.c:340: \ undefined reference to `acpi_video_register' make: *** [vmlinux] Error 1 Signed-off-by: Xiong Zhou <jencce.kernel(a)gmail.com> --- drivers/gpu/drm/gma500/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig index 1188f0f..d64fc45 100644 --- a/drivers/gpu/drm/gma500/Kconfig +++ b/drivers/gpu/drm/gma500/Kconfig @@ -6,6 +6,7 @@ config DRM_GMA500 select FB_CFB_IMAGEBLIT select DRM_KMS_HELPER select DRM_TTM + select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT help Say yes for an experimental 2D KMS framebuffer driver for the Intel GMA500 ('Poulsbo') and other Intel IMG based graphics

2 2

[PATCH] drm: cleanup: use drm_framebuffer_reference instead of a kref_get
by Archit Taneja 10 Apr '13

10 Apr '13

drm_framebuffer_lookup() does a kref_get() for the framebuffer if it finds one corresponding to the fb id passed to it. Use drm_framebuffer_reference() instead for clarity since it's the function used in other places to take a reference. Signed-off-by: Archit Taneja <archit(a)ti.com> --- drivers/gpu/drm/drm_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index dd64a06..a3b63cf 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -412,7 +412,7 @@ struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev, mutex_lock(&dev->mode_config.fb_lock); fb = __drm_framebuffer_lookup(dev, id); if (fb) - kref_get(&fb->refcount); + drm_framebuffer_reference(fb); mutex_unlock(&dev->mode_config.fb_lock); return fb; -- 1.7.10.4

2 1

[git pull] drm nouveau fix
by Dave Airlie 09 Apr '13

09 Apr '13

Hi Linus, just a spare semicolon in nouveau that caused some issues. Dave. The following changes since commit f011a08c804d50eeff4abf2d308cdce492f015aa: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes (2013-04-08 16:10:43 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to c9cdee17653409dedeb65c0733a253f6fe3fc7d6: Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes (2013-04-09 09:28:55 +1000) ---------------------------------------------------------------- Calvin Owens (1): drm/nouveau: fix unconditional return waiting on memory Dave Airlie (1): Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes drivers/gpu/drm/nouveau/nv50_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 1

[PATCH] drm/radeon: add ring working query
by Christian König 09 Apr '13

09 Apr '13

From: Christian König <christian.koenig(a)amd.com> Add new ioctl option and bumb minor version number. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_kms.c | 17 +++++++++++++++++ include/uapi/drm/radeon_drm.h | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 66a7f0f..31b193b 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -73,7 +73,7 @@ * 2.30.0 - fix for FMASK texturing */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 30 +#define KMS_DRIVER_MINOR 31 #define KMS_DRIVER_PATCHLEVEL 0 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); int radeon_driver_unload_kms(struct drm_device *dev); diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 3019759..8cb9d12 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -376,6 +376,23 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) else return -EINVAL; break; + case RADEON_INFO_RING_WORKING: + switch (value) { + case RADEON_CS_RING_GFX: + case RADEON_CS_RING_COMPUTE: + value = rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready; + break; + case RADEON_CS_RING_DMA: + value = rdev->ring[R600_RING_TYPE_DMA_INDEX].ready; + value |= rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready; + break; + case RADEON_CS_RING_UVD: + value = rdev->ring[R600_RING_TYPE_UVD_INDEX].ready; + break; + default: + return -EINVAL; + } + break; default: DRM_DEBUG_KMS("Invalid request %d\n", info->request); return -EINVAL; diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index cd085d1..8459415 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -973,6 +973,8 @@ struct drm_radeon_cs { #define RADEON_INFO_MAX_SE 0x12 /* max SH per SE */ #define RADEON_INFO_MAX_SH_PER_SE 0x13 +/* query if a RADEON_CS_RING_* submission is supported */ +#define RADEON_INFO_RING_WORKING 0x14 struct drm_radeon_info { uint32_t request; -- 1.7.9.5

3 4

Re: Status of exporting an fbdev framebuffer with dma_buf?
by Laurent Pinchart 09 Apr '13

09 Apr '13

Hi Tom, On Tuesday 09 April 2013 12:21:08 Tom Cooksey wrote: > Hi All, > > Last year Laurent posted an RFC patch[i] to add support for exporting an > fbdev framebuffer through dma_buf. Looking through the mailing list > archives, it doesn't appear to have progressed beyond an RFC? What would be > needed to get this merged? It would be useful for our Mali T6xx driver > (which supports importing dma_buf buffers) to allow the GPU to draw > directly into the framebuffer on platforms which lack a DRM/KMS driver. The patch was pretty simple, I don't think it would take lots of efforts to get it to mainline. On the other hand, fbdev is a dying API, so I'm not sure how much energy we want to spend on upgrading it. I suppose all that would be needed is a developer with enough interest in the topic to fix the patch according to the comments. > [i] Subject: "[RFC/PATCH] fb: Add dma-buf support", sent 20/06/2012. -- Regards, Laurent Pinchart

1 0

[PATCH 1/7] drm: add unpin function to prime helpers
by Maarten Lankhorst 09 Apr '13

09 Apr '13

Prevents buffers from being pinned forever. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- drivers/gpu/drm/drm_prime.c | 13 +++++++++++-- include/drm/drmP.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 366910d..85bbc52 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -91,10 +91,13 @@ static void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach, static void drm_gem_dmabuf_release(struct dma_buf *dma_buf) { struct drm_gem_object *obj = dma_buf->priv; + struct drm_device *dev = obj->dev; if (obj->export_dma_buf == dma_buf) { /* drop the reference on the export fd holds */ obj->export_dma_buf = NULL; + if (dev->driver->gem_prime_unpin) + dev->driver->gem_prime_unpin(obj); drm_gem_object_unreference_unlocked(obj); } } @@ -184,13 +187,19 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { struct dma_buf *drm_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) { + struct dma_buf *buf; + if (dev->driver->gem_prime_pin) { int ret = dev->driver->gem_prime_pin(obj); if (ret) return ERR_PTR(ret); } - return dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size, - 0600); + buf = dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size, + 0600); + + if (IS_ERR(buf) && dev->driver->gem_prime_unpin) + dev->driver->gem_prime_unpin(obj); + return buf; } EXPORT_SYMBOL(drm_gem_prime_export); diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 2d94d74..99dc622 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -932,6 +932,7 @@ struct drm_driver { struct dma_buf *dma_buf); /* low-level interface used by drm_gem_prime_{import,export} */ int (*gem_prime_pin)(struct drm_gem_object *obj); + void (*gem_prime_unpin)(struct drm_gem_object *obj); struct sg_table *(*gem_prime_get_sg_table)(struct drm_gem_object *obj); struct drm_gem_object *(*gem_prime_import_sg_table)( struct drm_device *dev, size_t size, -- 1.8.2

4 10

[Bug 63090] New: mesa 9.2git: qvdpautest fails to work with UVD but also fails with shader decoding
by bugzilla-daemon＠freedesktop.org 09 Apr '13

09 Apr '13

https://bugs.freedesktop.org/show_bug.cgi?id=63090 Priority: medium Bug ID: 63090 Assignee: dri-devel(a)lists.freedesktop.org Summary: mesa 9.2git: qvdpautest fails to work with UVD but also fails with shader decoding Severity: normal Classification: Unclassified OS: All Reporter: arekm(a)maven.pl Hardware: Other Status: NEW Version: git Component: Drivers/Gallium/r600 Product: Mesa Tried to test vdpau using https://github.com/robertmassaioli/qvdpautest but it failed with: qvdpautest 0.5.2 AMD E-350 Processor Unknown GPU VDPAU API version : 1 VDPAU implementation : G3DVL VDPAU Driver Shared Library version 1.0 FATAL: get_bits failed : No backend implementation could be loaded.!! and very bad framerate (MPEG DECODING (1920x1080): 53 frames/s) "No backend implementation could be loaded" happened with shaders decoding and also with UVD decoding (while mplayer -vo vdpau worked fine on both cases) "No backend implementation could be loaded" is mesa VDP_STATUS_NO_IMPLEMENTATION Test environment: - kernel from drm-fixes + radeon UVD patches (http://lists.freedesktop.org/archives/dri-devel/2013-April/036766.html + http://paste.debian.net/247063/) - mesa 9.2 from master as of 302df7cc85b0e2ce47c40048f30bd116b0d692fc + patches http://comments.gmane.org/gmane.comp.video.mesa3d.devel/55622 and http://lists.freedesktop.org/archives/mesa-dev/2013-April/037089.html - E350 AMD APU with [AMD] nee ATI Wrestler [Radeon HD 6310] GPU - vdpauinfo with shaders: http://pastebin.com/UV2CAX9F - vdpauinfo with UVD working: http://pastebin.com/FjpLyMqr -- You are receiving this mail because: You are the assignee for the bug.

1 2

[PATCH] drm/omap: Take a fb reference in omap_plane_update()
by Archit Taneja 09 Apr '13

09 Apr '13

When userspace calls SET_PLANE ioctl, drm core takes a reference of the fb and passes control to the update_plane op defined by the drm driver. In omapdrm, we have a worker thread which queues framebuffers objects received from update_plane and displays them at the appropriate time. It is possible that the framebuffer is destoryed by userspace between the time of calling the ioctl and apply-worker being scheduled. If this happens, the apply-worker holds a pointer to a framebuffer which is already destroyed. Take an extra refernece/unreference of the fb in omap_plane_update() to prevent this from happening. A reference is taken of the fb passed to update_plane(), the previous framebuffer (held by plane->fb) is unreferenced. This will prevent drm from destroying the framebuffer till the time it's unreferenced by the apply-worker. This is in addition to the exisitng reference/unreference in update_pin(), which is taken for the scanout of the plane's current framebuffer, and an unreference the previous framebuffer. Signed-off-by: Archit Taneja <archit(a)ti.com> Cc: Rob Clark <robdclark(a)gmail.com> --- drivers/gpu/drm/omapdrm/omap_plane.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c index 2882cda..8d225d7 100644 --- a/drivers/gpu/drm/omapdrm/omap_plane.c +++ b/drivers/gpu/drm/omapdrm/omap_plane.c @@ -247,6 +247,12 @@ static int omap_plane_update(struct drm_plane *plane, { struct omap_plane *omap_plane = to_omap_plane(plane); omap_plane->enabled = true; + + if (plane->fb) + drm_framebuffer_unreference(plane->fb); + + drm_framebuffer_reference(fb); + return omap_plane_mode_set(plane, crtc, fb, crtc_x, crtc_y, crtc_w, crtc_h, src_x, src_y, src_w, src_h, -- 1.7.10.4

3 4

← Newer
1
...
64
65
66
67
68
69
70
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2013