dri-devel April 2012

dri-devel@lists.freedesktop.org

119 participants
668 discussions

Re: Linux 3.4-rc1
by Rob Clark 05 Apr '12

05 Apr '12

On Sat, Mar 31, 2012 at 6:58 PM, Linus Torvalds <torvalds(a)linux-foundation.org> wrote: > - drm dma-buf prime support. Dave Airlie sent me the pull request but > didn't push very hard for it, it's in my "ok, I can still pull it for > 3.4 if individual DRM driver people tell me that it will make their > lives easier." So this is in limbo - I have nothing against it, but I > won't pull unless I get a few people say "yes, please". yes, please :-) Note that the core … [View More]

7 6

[Bug 48228] [865] Crashes in libdrm-intel caused by KDE4 kwin
by bugzilla-daemon＠freedesktop.org 05 Apr '12

05 Apr '12

https://bugs.freedesktop.org/show_bug.cgi?id=48228 Gordon Jin <gordon.jin(a)intel.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Crashes in libdrm-intel |[865] Crashes in |caused by KDE4 kwin |libdrm-intel caused by KDE4 | |kwin -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?… [View More]

1 0

[PATCH] drm/exynos: add format list of plane
by Seung-Woo Kim 05 Apr '12

05 Apr '12

NV12, NV12M and NV12MT are added to format list of plane to use these formats for hdmi vp layer. Signed-off-by: Seung-Woo Kim <sw0312.kim(a)samsung.com> Signed-off-by: Inki Dae <inki.dae(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index … [View More]

1 0

[Bug 48228] Crashes in libdrm-intel caused by KDE4 kwin
by bugzilla-daemon＠freedesktop.org 04 Apr '12

04 Apr '12

https://bugs.freedesktop.org/show_bug.cgi?id=48228 Ian Romanick <idr(a)freedesktop.org> changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|idr(a)freedesktop.org |dri-devel(a)lists.freedesktop | |.org Component|Drivers/DRI/i915 |Drivers/DRI/i830 -- Configure bugmail: https://bugs.freedesktop.org/… [View More]

1 0

[PATCH] drm/radeon: fix error return code in TN thermal setup
by alexdeucher＠gmail.com 04 Apr '12

04 Apr '12

From: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/radeon/radeon_pm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index caa55d6..17571da 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -520,7 +520,7 @@ static int radeon_hwmon_init(struct radeon_device *rdev) … [View More]

2 1

[PATCH RFC] drm: support for rotated scanout
by Rob Clark 04 Apr '12

04 Apr '12

From: Rob Clark <rob(a)ti.com> For drivers that can support rotated scanout, the extra parameter checking in drm-core, while nice, tends to get confused. To solve this drivers can set the crtc or plane invert_dimensions field so that the dimension checking takes into account the rotation that the driver is performing. --- Note: RFC still mainly because I've only tested the CRTC rotation so far.. still need to write some test code for plane rotation. drivers/gpu/drm/drm_crtc.c | 50 ++… [View More]+++++++++++++++++++++++++++-------------- include/drm/drm_crtc.h | 9 ++++++++ 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 0dff444..261c9bd 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -375,6 +375,7 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->dev = dev; crtc->funcs = funcs; + crtc->invert_dimensions = false; mutex_lock(&dev->mode_config.mutex); @@ -609,6 +610,7 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, plane->base.properties = &plane->properties; plane->dev = dev; plane->funcs = funcs; + plane->invert_dimensions = false; plane->format_types = kmalloc(sizeof(uint32_t) * format_count, GFP_KERNEL); if (!plane->format_types) { @@ -1758,6 +1760,9 @@ int drm_mode_setplane(struct drm_device *dev, void *data, fb_width = fb->width << 16; fb_height = fb->height << 16; + if (plane->invert_dimensions) + swap(fb_width, fb_height); + /* Make sure source coordinates are inside the fb. */ if (plane_req->src_w > fb_width || plane_req->src_x > fb_width - plane_req->src_w || @@ -1856,6 +1861,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id); if (crtc_req->mode_valid) { + int hdisplay, vdisplay; /* If we have a mode we need a framebuffer. */ /* If we pass -1, set the mode with the currently bound fb */ if (crtc_req->fb_id == -1) { @@ -1891,14 +1897,20 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); - if (mode->hdisplay > fb->width || - mode->vdisplay > fb->height || - crtc_req->x > fb->width - mode->hdisplay || - crtc_req->y > fb->height - mode->vdisplay) { - DRM_DEBUG_KMS("Invalid CRTC viewport %ux%u+%u+%u for fb size %ux%u.\n", - mode->hdisplay, mode->vdisplay, - crtc_req->x, crtc_req->y, - fb->width, fb->height); + hdisplay = mode->hdisplay; + vdisplay = mode->vdisplay; + + if (crtc->invert_dimensions) + swap(hdisplay, vdisplay); + + if (hdisplay > fb->width || + vdisplay > fb->height || + crtc_req->x > fb->width - hdisplay || + crtc_req->y > fb->height - vdisplay) { + DRM_DEBUG_KMS("Invalid fb size %ux%u for CRTC viewport %ux%u+%d+%d%s.\n", + fb->width, fb->height, + hdisplay, vdisplay, crtc_req->x, crtc_req->y, + crtc->invert_dimensions ? " (inverted)" : ""); ret = -ENOSPC; goto out; } @@ -3452,6 +3464,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, struct drm_framebuffer *fb; struct drm_pending_vblank_event *e = NULL; unsigned long flags; + int hdisplay, vdisplay; int ret = -EINVAL; if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS || @@ -3481,14 +3494,19 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, goto out; fb = obj_to_fb(obj); - if (crtc->mode.hdisplay > fb->width || - crtc->mode.vdisplay > fb->height || - crtc->x > fb->width - crtc->mode.hdisplay || - crtc->y > fb->height - crtc->mode.vdisplay) { - DRM_DEBUG_KMS("Invalid fb size %ux%u for CRTC viewport %ux%u+%d+%d.\n", - fb->width, fb->height, - crtc->mode.hdisplay, crtc->mode.vdisplay, - crtc->x, crtc->y); + hdisplay = crtc->mode.hdisplay; + vdisplay = crtc->mode.vdisplay; + + if (crtc->invert_dimensions) + swap(hdisplay, vdisplay); + + if (hdisplay > fb->width || + vdisplay > fb->height || + crtc->x > fb->width - hdisplay || + crtc->y > fb->height - vdisplay) { + DRM_DEBUG_KMS("Invalid fb size %ux%u for CRTC viewport %ux%u+%d+%d%s.\n", + fb->width, fb->height, hdisplay, vdisplay, crtc->x, crtc->y, + crtc->invert_dimensions ? " (inverted)" : ""); ret = -ENOSPC; goto out; } diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index b5017c9..78dd5b5 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -364,6 +364,9 @@ struct drm_crtc_funcs { * @enabled: is this CRTC enabled? * @mode: current mode timings * @hwmode: mode timings as programmed to hw regs + * @invert_dimensions: for purposes of error checking crtc vs fb sizes, + * invert the width/height of the crtc. This is used if the driver + * is performing 90 or 270 degree rotated scanout * @x: x position on screen * @y: y position on screen * @funcs: CRTC control functions @@ -397,6 +400,8 @@ struct drm_crtc { */ struct drm_display_mode hwmode; + bool invert_dimensions; + int x, y; const struct drm_crtc_funcs *funcs; @@ -636,6 +641,9 @@ struct drm_plane_funcs { * @gamma_size: size of gamma table * @gamma_store: gamma correction table * @enabled: enabled flag + * @invert_dimensions: for purposes of error checking plane vs fb sizes, + * invert the width/height of the plane. This is used if the driver + * is performing 90 or 270 degree rotated scanout * @funcs: helper functions * @helper_private: storage for drver layer */ @@ -657,6 +665,7 @@ struct drm_plane { uint16_t *gamma_store; bool enabled; + bool invert_dimensions; const struct drm_plane_funcs *funcs; void *helper_private; -- 1.7.9.1 [View Less]

3 7

[PATCH] drm/radeon/kms: attempt to avoid copying data twice on coherent cards. (v2)
by Dave Airlie 04 Apr '12

04 Apr '12

From: Dave Airlie <airlied(a)redhat.com> On coherent systems (not-AGP) the IB should be in cached memory so should be just as fast, so we can avoid copying to temporary pages and just use it directly. provides minor speedups on rv530: gears ~1820->1860, ipers: 29.9->30.6, but always good to use less CPU if we can. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_cs.c | 46 +++++++++++++++++++… [View More]+++++---------- drivers/gpu/drm/radeon/radeon_drv.c | 4 +++ 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 138b952..5331b27 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -94,6 +94,7 @@ extern int radeon_disp_priority; extern int radeon_hw_i2c; extern int radeon_pcie_gen2; extern int radeon_msi; +extern int radeon_copy1; /* * Copy from radeon_drv.h so we don't have to include both and have conflicting diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 5cac832..1647be2 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -278,11 +278,16 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) p->chunks[p->chunk_ib_idx].length_dw); return -EINVAL; } - p->chunks[p->chunk_ib_idx].kpage[0] = kmalloc(PAGE_SIZE, GFP_KERNEL); - p->chunks[p->chunk_ib_idx].kpage[1] = kmalloc(PAGE_SIZE, GFP_KERNEL); - if (p->chunks[p->chunk_ib_idx].kpage[0] == NULL || - p->chunks[p->chunk_ib_idx].kpage[1] == NULL) - return -ENOMEM; + if ((p->rdev->flags & RADEON_IS_AGP) || !radeon_copy1) { + p->chunks[p->chunk_ib_idx].kpage[0] = kmalloc(PAGE_SIZE, GFP_KERNEL); + p->chunks[p->chunk_ib_idx].kpage[1] = kmalloc(PAGE_SIZE, GFP_KERNEL); + if (p->chunks[p->chunk_ib_idx].kpage[0] == NULL || + p->chunks[p->chunk_ib_idx].kpage[1] == NULL) { + kfree(p->chunks[i].kpage[0]); + kfree(p->chunks[i].kpage[1]); + return -ENOMEM; + } + } p->chunks[p->chunk_ib_idx].kpage_idx[0] = -1; p->chunks[p->chunk_ib_idx].kpage_idx[1] = -1; p->chunks[p->chunk_ib_idx].last_copied_page = -1; @@ -323,8 +328,10 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error) kfree(parser->relocs_ptr); for (i = 0; i < parser->nchunks; i++) { kfree(parser->chunks[i].kdata); - kfree(parser->chunks[i].kpage[0]); - kfree(parser->chunks[i].kpage[1]); + if ((parser->rdev->flags & RADEON_IS_AGP) || !radeon_copy1) { + kfree(parser->chunks[i].kpage[0]); + kfree(parser->chunks[i].kpage[1]); + } } kfree(parser->chunks); kfree(parser->chunks_array); @@ -573,6 +580,8 @@ int radeon_cs_update_pages(struct radeon_cs_parser *p, int pg_idx) struct radeon_cs_chunk *ibc = &p->chunks[p->chunk_ib_idx]; int i; int size = PAGE_SIZE; + void *ptr; + bool copy1 = (p->rdev->flags & RADEON_IS_AGP || !radeon_copy1) ? false : true; for (i = ibc->last_copied_page + 1; i < pg_idx; i++) { if (DRM_COPY_FROM_USER(p->ib->ptr + (i * (PAGE_SIZE/4)), @@ -583,23 +592,32 @@ int radeon_cs_update_pages(struct radeon_cs_parser *p, int pg_idx) } } - new_page = ibc->kpage_idx[0] < ibc->kpage_idx[1] ? 0 : 1; - if (pg_idx == ibc->last_page_index) { size = (ibc->length_dw * 4) % PAGE_SIZE; - if (size == 0) - size = PAGE_SIZE; + if (size == 0) + size = PAGE_SIZE; } - if (DRM_COPY_FROM_USER(ibc->kpage[new_page], + if (!copy1) { + new_page = ibc->kpage_idx[0] < ibc->kpage_idx[1] ? 0 : 1; + ptr = ibc->kpage[new_page]; + } else { + new_page = ibc->kpage_idx[0] < ibc->kpage_idx[1] ? 0 : 1; + ptr = p->ib->ptr + (pg_idx * (PAGE_SIZE / 4)); + ibc->kpage[new_page] = ptr; + } + + if (DRM_COPY_FROM_USER(ptr, ibc->user_ptr + (pg_idx * PAGE_SIZE), size)) { p->parser_error = -EFAULT; return 0; } - /* copy to IB here */ - memcpy((void *)(p->ib->ptr+(pg_idx*(PAGE_SIZE/4))), ibc->kpage[new_page], size); + if (!copy1) { + /* copy to IB here */ + memcpy((void *)(p->ib->ptr+(pg_idx*(PAGE_SIZE/4))), ibc->kpage[new_page], size); + } ibc->last_copied_page = pg_idx; ibc->kpage_idx[new_page] = pg_idx; diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index ef7bb3f..3ea3377 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -128,6 +128,7 @@ int radeon_disp_priority = 0; int radeon_hw_i2c = 0; int radeon_pcie_gen2 = 0; int radeon_msi = -1; +int radeon_copy1 = 0; MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); module_param_named(no_wb, radeon_no_wb, int, 0444); @@ -177,6 +178,9 @@ module_param_named(pcie_gen2, radeon_pcie_gen2, int, 0444); MODULE_PARM_DESC(msi, "MSI support (1 = enable, 0 = disable, -1 = auto)"); module_param_named(msi, radeon_msi, int, 0444); +MODULE_PARM_DESC(copy1, "One Copy test"); +module_param_named(copy1, radeon_copy1, int, 0644); + static int radeon_suspend(struct drm_device *dev, pm_message_t state) { drm_radeon_private_t *dev_priv = dev->dev_private; -- 1.7.6.5 [View Less]

2 1

[Bug 27184] Radeon, KMS, 6.12.99: Sleeping screen doesn't wake up reliably
by bugzilla-daemon＠freedesktop.org 04 Apr '12

04 Apr '12

https://bugs.freedesktop.org/show_bug.cgi?id=27184 --- Comment #26 from Alex Deucher <agd5f(a)yahoo.com> 2012-04-04 06:07:48 PDT --- (In reply to comment #25) > I just happened to test with this very same 3.3.0-rc3 kernel that while I was > in linux console ie. no X and the screen blanker got activated, the lcd display > was put into suspend mode ---> I hit the keyboard at this stage and the screen > came back without fuss. Last time when I tried all the different stages … [View More]

1 0

[Bug 27184] Radeon, KMS, 6.12.99: Sleeping screen doesn't wake up reliably
by bugzilla-daemon＠freedesktop.org 04 Apr '12

04 Apr '12

https://bugs.freedesktop.org/show_bug.cgi?id=27184 --- Comment #25 from tomi.orava(a)ncircle.nullnet.fi 2012-04-04 04:39:41 PDT --- I just happened to test with this very same 3.3.0-rc3 kernel that while I was in linux console ie. no X and the screen blanker got activated, the lcd display was put into suspend mode ---> I hit the keyboard at this stage and the screen came back without fuss. Last time when I tried all the different stages with xset, none of them worked well. Is there an easy … [View More]

1 0

[PATCH] drm/radeon/kms: fix DVO setup on some r4xx chips
by alexdeucher＠gmail.com 03 Apr '12

03 Apr '12

From: Alex Deucher <alexander.deucher(a)amd.com> Some r4xx chips have the wrong frev in the DVOEncoderControl table. It should always be 1 on r4xx. Fixes modesetting on DVO on r4xx chips with the bad frev. Reported by twied on #radeon. Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/atombios_encoders.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2012