dri-devel September 2012

dri-devel@lists.freedesktop.org

134 participants
706 discussions

[Bug 43360] nouveau on "NVce" 560 Ti: Failed to idle channel 1
by bugzilla-daemon＠bugzilla.kernel.org 06 Sep '12

06 Sep '12

https://bugzilla.kernel.org/show_bug.cgi?id=43360 Marcin Slusarz <marcin.slusarz(a)gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |marcin.slusarz(a)gmail.com --- Comment #4 from Marcin Slusarz <marcin.slusarz(a)gmail.com> 2012-09-06 17:54:55 --- Can you test 3.6-rc4? It's probably fixed in this version. -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug.

1 0

[Bug 43360] nouveau on "NVce" 560 Ti: Failed to idle channel 1
by bugzilla-daemon＠bugzilla.kernel.org 06 Sep '12

06 Sep '12

https://bugzilla.kernel.org/show_bug.cgi?id=43360 Alan <alan(a)lxorguk.ukuu.org.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |alan(a)lxorguk.ukuu.org.uk Component|Staging |Video(DRI - non Intel) AssignedTo|drivers_staging@kernel-bugs |drivers_video-dri@kernel-bu |.osdl.org |gs.osdl.org -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug.

1 0

[PATCH] drm/radeon: fix VM syncing with multiple rings
by Christian König 06 Sep '12

06 Sep '12

When a VM is used on more than one ring we need to sync to the last user. Signed-off-by: Christian König <deathsimple(a)vodafone.de> --- drivers/gpu/drm/radeon/radeon_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index e241506..d59eb59 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -463,7 +463,7 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev, goto out; } radeon_cs_sync_rings(parser); - radeon_cs_sync_to(parser, vm->last_flush); + radeon_cs_sync_to(parser, vm->fence); radeon_cs_sync_to(parser, radeon_vm_grab_id(rdev, vm, parser->ring)); if ((rdev->family >= CHIP_TAHITI) && -- 1.7.9.5

2 1

drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at boot
by Tim Gardner 06 Sep '12

06 Sep '12

Dave - I couldn't find this patch in your git repo at git://people.freedesktop.org/~airlied/linux in the drm-next or drm-fixes branches. https://patchwork.kernel.org/patch/1379071/ It appears to fix a real problem for Mac users - http://bugs.launchpad.net/bugs/1039157. See https://bugs.launchpad.net/ubuntu/oneiric/+source/linux/+bug/1039157/commen… for confirmation. I think it should also be 'Cc: stable(a)vger.kernel.org'. It applies as far back as 2.6.32 with minor context differences. rtg -- Tim Gardner tim.gardner(a)canonical.com

2 1

[PATCH libdrm 1/3] radeon: Fix layout of linear aligned mipmaps on SI.
by Michel Dänzer 06 Sep '12

06 Sep '12

From: Michel Dänzer <michel.daenzer(a)amd.com> Signed-off-by: Michel Dänzer <michel.daenzer(a)amd.com> --- radeon/radeon_surface.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c index 4118a37..593c51c 100644 --- a/radeon/radeon_surface.c +++ b/radeon/radeon_surface.c @@ -952,6 +952,124 @@ static int eg_surface_best(struct radeon_surface_manager *surf_man, /* =========================================================================== + * Southern Islands family + */ + +static void si_surf_minify_linear_aligned(struct radeon_surface *surf, + unsigned level, + uint32_t xalign, uint32_t yalign, uint32_t zalign, uint32_t slice_align, + unsigned offset) +{ + surf->level[level].npix_x = mip_minify(surf->npix_x, level); + surf->level[level].npix_y = mip_minify(surf->npix_y, level); + surf->level[level].npix_z = mip_minify(surf->npix_z, level); + surf->level[level].nblk_x = (surf->level[level].npix_x + surf->blk_w - 1) / surf->blk_w; + surf->level[level].nblk_y = (surf->level[level].npix_y + surf->blk_h - 1) / surf->blk_h; + surf->level[level].nblk_z = (surf->level[level].npix_z + surf->blk_d - 1) / surf->blk_d; + + /* XXX: Second smallest level uses larger pitch, not sure of the real reason, + * my best guess so far: rows evenly distributed across slice + */ + xalign = MAX2(xalign, slice_align / surf->bpe / surf->level[level].npix_y); + + surf->level[level].nblk_x = ALIGN(surf->level[level].nblk_x, xalign); + surf->level[level].nblk_y = ALIGN(surf->level[level].nblk_y, yalign); + surf->level[level].nblk_z = ALIGN(surf->level[level].nblk_z, zalign); + + surf->level[level].offset = offset; + surf->level[level].pitch_bytes = surf->level[level].nblk_x * surf->bpe * surf->nsamples; + surf->level[level].slice_size = ALIGN(surf->level[level].pitch_bytes * surf->level[level].nblk_y, slice_align); + + surf->bo_size = offset + surf->level[level].slice_size * surf->level[level].nblk_z * surf->array_size; +} + +static int si_surface_init_linear_aligned(struct radeon_surface_manager *surf_man, + struct radeon_surface *surf, + uint64_t offset, unsigned start_level) +{ + uint32_t xalign, yalign, zalign, slice_align; + unsigned i; + + /* compute alignment */ + if (!start_level) { + surf->bo_alignment = MAX2(256, surf_man->hw_info.group_bytes); + } + xalign = MAX2(8, 64 / surf->bpe); + yalign = 1; + zalign = 1; + slice_align = MAX2(64 * surf->bpe, surf_man->hw_info.group_bytes); + + /* build mipmap tree */ + for (i = start_level; i <= surf->last_level; i++) { + surf->level[i].mode = RADEON_SURF_MODE_LINEAR_ALIGNED; + si_surf_minify_linear_aligned(surf, i, xalign, yalign, zalign, slice_align, offset); + /* level0 and first mipmap need to have alignment */ + offset = surf->bo_size; + if ((i == 0)) { + offset = ALIGN(offset, surf->bo_alignment); + } + } + return 0; +} + +static int si_surface_init(struct radeon_surface_manager *surf_man, + struct radeon_surface *surf) +{ + unsigned mode; + int r; + + /* MSAA surfaces support the 2D mode only. */ + if (surf->nsamples > 1) { + surf->flags = RADEON_SURF_CLR(surf->flags, MODE); + surf->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE); + } + + /* tiling mode */ + mode = (surf->flags >> RADEON_SURF_MODE_SHIFT) & RADEON_SURF_MODE_MASK; + + if (surf->flags & (RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER)) { + /* zbuffer only support 1D or 2D tiled surface */ + switch (mode) { + case RADEON_SURF_MODE_1D: + case RADEON_SURF_MODE_2D: + break; + default: + mode = RADEON_SURF_MODE_1D; + surf->flags = RADEON_SURF_CLR(surf->flags, MODE); + surf->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE); + break; + } + } + + r = eg_surface_sanity(surf_man, surf, mode); + if (r) { + return r; + } + + surf->stencil_offset = 0; + surf->stencil_tile_split = 0; + + /* check tiling mode */ + switch (mode) { + case RADEON_SURF_MODE_LINEAR: + r = r6_surface_init_linear(surf_man, surf, 0, 0); + break; + case RADEON_SURF_MODE_LINEAR_ALIGNED: + r = si_surface_init_linear_aligned(surf_man, surf, 0, 0); + break; + case RADEON_SURF_MODE_1D: + r = eg_surface_init_1d(surf_man, surf, 0, 0); + break; + case RADEON_SURF_MODE_2D: + r = eg_surface_init_2d(surf_man, surf, 0, 0); + break; + default: + return -EINVAL; + } + return r; +} + +/* =========================================================================== * public API */ struct radeon_surface_manager *radeon_surface_manager_new(int fd) @@ -980,7 +1098,11 @@ struct radeon_surface_manager *radeon_surface_manager_new(int fd) if (eg_init_hw_info(surf_man)) { goto out_err; } - surf_man->surface_init = &eg_surface_init; + if (surf_man->family <= CHIP_ARUBA) { + surf_man->surface_init = &eg_surface_init; + } else { + surf_man->surface_init = &si_surface_init; + } surf_man->surface_best = &eg_surface_best; } -- 1.7.10.4

3 6

radeon power management issues on a 12,2 iMac
by Brad Campbell 06 Sep '12

06 Sep '12

I've posted this here simply as google bait for the next poor sod suffering with radeon power management issues. Why does the in-kernel radeon driver try and cook my machine by default? Since I bought this machine, I've run with a hard-coded hack to keep the card in low power mode. This has not previously had any issues, even to being able to watch three full screen HD streams (one on each head). A recent change to the radeon driver left me with noise on the right hand side of all three heads, and a plea for assistance was me with a response that multiple heads are not supported in low-power mode (thus my hack in the first place). The issue here is that all the multi-head profiles run the card in the highest power profile, and the machine ends up sounding like a 747 trying to keep the card cool. Poking into radeon_asic.c tells me my cards power profiles are setup in : r600_pm_init_profile Time to have a look at what profiles the card actually has. Enabling dri debugging and booting up leaves this in my log Sep 6 13:47:37 localhost kernel: [ 3.919380] [drm:radeon_pm_print_states], 5 Power State(s) Sep 6 13:47:37 localhost kernel: [ 3.919381] [drm:radeon_pm_print_states], State 0: Default Sep 6 13:47:37 localhost kernel: [ 3.919382] [drm:radeon_pm_print_states], Default Sep 6 13:47:37 localhost kernel: [ 3.919383] [drm:radeon_pm_print_states], 16 PCIE Lanes Sep 6 13:47:37 localhost kernel: [ 3.919384] [drm:radeon_pm_print_states], 3 Clock Mode(s) Sep 6 13:47:37 localhost kernel: [ 3.919385] [drm:radeon_pm_print_states], 0 e: 680000 m: 900000 v: 1100 No display only Sep 6 13:47:37 localhost kernel: [ 3.919386] [drm:radeon_pm_print_states], 1 e: 680000 m: 900000 v: 1100 Sep 6 13:47:37 localhost kernel: [ 3.919387] [drm:radeon_pm_print_states], 2 e: 680000 m: 900000 v: 1100 Sep 6 13:47:37 localhost kernel: [ 3.919388] [drm:radeon_pm_print_states], State 1: Performance Sep 6 13:47:37 localhost kernel: [ 3.919389] [drm:radeon_pm_print_states], 16 PCIE Lanes Sep 6 13:47:37 localhost kernel: [ 3.919390] [drm:radeon_pm_print_states], 3 Clock Mode(s) Sep 6 13:47:37 localhost kernel: [ 3.919391] [drm:radeon_pm_print_states], 0 e: 100000 m: 149000 v: 900 No display only Sep 6 13:47:37 localhost kernel: [ 3.919392] [drm:radeon_pm_print_states], 1 e: 398000 m: 900000 v: 1000 Sep 6 13:47:37 localhost kernel: [ 3.919393] [drm:radeon_pm_print_states], 2 e: 680000 m: 900000 v: 1100 Sep 6 13:47:37 localhost kernel: [ 3.919395] [drm:radeon_pm_print_states], State 2: Default Sep 6 13:47:37 localhost kernel: [ 3.919395] [drm:radeon_pm_print_states], 16 PCIE Lanes Sep 6 13:47:37 localhost kernel: [ 3.919396] [drm:radeon_pm_print_states], 3 Clock Mode(s) Sep 6 13:47:37 localhost kernel: [ 3.919397] [drm:radeon_pm_print_states], 0 e: 298000 m: 900000 v: 950 No display only Sep 6 13:47:37 localhost kernel: [ 3.919398] [drm:radeon_pm_print_states], 1 e: 298000 m: 900000 v: 950 Sep 6 13:47:37 localhost kernel: [ 3.919399] [drm:radeon_pm_print_states], 2 e: 680000 m: 900000 v: 1100 Sep 6 13:47:37 localhost kernel: [ 3.919400] [drm:radeon_pm_print_states], State 3: Default Sep 6 13:47:37 localhost kernel: [ 3.919401] [drm:radeon_pm_print_states], 16 PCIE Lanes Sep 6 13:47:37 localhost kernel: [ 3.919402] [drm:radeon_pm_print_states], 3 Clock Mode(s) Sep 6 13:47:37 localhost kernel: [ 3.919403] [drm:radeon_pm_print_states], 0 e: 502000 m: 900000 v: 1050 No display only Sep 6 13:47:37 localhost kernel: [ 3.919404] [drm:radeon_pm_print_states], 1 e: 502000 m: 900000 v: 1050 Sep 6 13:47:37 localhost kernel: [ 3.919405] [drm:radeon_pm_print_states], 2 e: 680000 m: 900000 v: 1100 Sep 6 13:47:37 localhost kernel: [ 3.919406] [drm:radeon_pm_print_states], State 4: Battery Sep 6 13:47:37 localhost kernel: [ 3.919407] [drm:radeon_pm_print_states], 16 PCIE Lanes Sep 6 13:47:37 localhost kernel: [ 3.919408] [drm:radeon_pm_print_states], 3 Clock Mode(s) Sep 6 13:47:37 localhost kernel: [ 3.919409] [drm:radeon_pm_print_states], 0 e: 100000 m: 149000 v: 900 No display only Sep 6 13:47:37 localhost kernel: [ 3.919410] [drm:radeon_pm_print_states], 1 e: 100000 m: 149000 v: 900 Sep 6 13:47:37 localhost kernel: [ 3.919411] [drm:radeon_pm_print_states], 2 e: 100000 m: 149000 v: 900 Sep 6 13:47:37 localhost kernel: [ 3.920559] [drm] radeon: power management initialized So, because my GPU is a mobile device (rdev->flags & RADEON_IS_MOBILITY is true), then my single head profiles are selected from the Battery profile, and because there is not a second Battery profile the multi-head profiles come from profile 0 (default). This card actually has 3 profiles called default, and interestingly the second one looks almost sane. Hard coding the profile indexes works, however even with the low profile there (Profile 2, clock mode 0) the RAM is running flat out and it still generates some not insignificant heat. So, ultimately I came up with the following hack : diff -u temp/linux-3.4.4/drivers/gpu/drm/radeon/radeon_drv.c linux-3.4.4/drivers/gpu/drm/radeon/radeon_drv.c --- temp/linux-3.4.4/drivers/gpu/drm/radeon/radeon_drv.c 2012-09-06 15:27:18.337696944 +0800 +++ linux-3.4.4/drivers/gpu/drm/radeon/radeon_drv.c 2012-09-06 16:06:05.252394033 +0800 @@ -137,6 +137,8 @@ int radeon_pcie_gen2 = 0; int radeon_msi = -1; int radeon_lockup_timeout = 10000; +int radeon_minsclk = 0; +int radeon_minmclk = 0; MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); module_param_named(no_wb, radeon_no_wb, int, 0444); @@ -189,6 +191,12 @@ MODULE_PARM_DESC(lockup_timeout, "GPU lockup timeout in ms (defaul 10000 = 10 seconds, 0 = disable)"); module_param_named(lockup_timeout, radeon_lockup_timeout, int, 0444); +MODULE_PARM_DESC(minsclk, "Minimum GPU clock speed"); +module_param_named(minsclk, radeon_minsclk, int, 0644); + +MODULE_PARM_DESC(minmclk, "Minimum Memory clock speed"); +module_param_named(minmclk, radeon_minmclk, int, 0644); + static int radeon_suspend(struct drm_device *dev, pm_message_t state) { drm_radeon_private_t *dev_priv = dev->dev_private; diff -u temp/linux-3.4.4/drivers/gpu/drm/radeon/radeon.h linux-3.4.4/drivers/gpu/drm/radeon/radeon.h --- temp/linux-3.4.4/drivers/gpu/drm/radeon/radeon.h 2012-09-06 15:27:13.733803910 +0800 +++ linux-3.4.4/drivers/gpu/drm/radeon/radeon.h 2012-09-06 15:45:06.678661305 +0800 @@ -95,6 +95,8 @@ extern int radeon_pcie_gen2; extern int radeon_msi; extern int radeon_lockup_timeout; +extern int radeon_minsclk; +extern int radeon_minmclk; /* * Copy from radeon_drv.h so we don't have to include both and have conflicting diff -u temp/linux-3.4.4/drivers/gpu/drm/radeon/radeon_pm.c linux-3.4.4/drivers/gpu/drm/radeon/radeon_pm.c --- temp/linux-3.4.4/drivers/gpu/drm/radeon/radeon_pm.c 2012-09-06 15:27:13.739803773 +0800 +++ linux-3.4.4/drivers/gpu/drm/radeon/radeon_pm.c 2012-09-06 15:43:13.115341210 +0800 @@ -120,7 +120,7 @@ break; case PM_PROFILE_LOW: if (rdev->pm.active_crtc_count > 1) - rdev->pm.profile_index = PM_PROFILE_LOW_MH_IDX; + rdev->pm.profile_index = PM_PROFILE_LOW_SH_IDX; else rdev->pm.profile_index = PM_PROFILE_LOW_SH_IDX; break; @@ -193,7 +193,10 @@ clock_info[rdev->pm.requested_clock_mode_index].mclk; if (mclk > rdev->pm.default_mclk) mclk = rdev->pm.default_mclk; - + if (mclk < radeon_minmclk) + mclk = radeon_minmclk; + if (sclk < radeon_minsclk) + sclk = radeon_minsclk; /* upvolt before raising clocks, downvolt after lowering clocks */ if (sclk < rdev->pm.current_sclk) misc_after = true; I can now set a minimum clock speed for both the GPU and RAM and activate it by switching profiles. Turning the GPU clock up to the same speed as the RAM in the lowest profile (150000) and running Clock mode 0 in Profile 5 sees all my visual artefacts go away, and I can resume using the machine without screaming fans. Obviously the selection of correct default power profiles is a difficult issue and subject to the vagaries of the lunatic who wrote the cards BIOS. I don't pretend to have the answer, but I do have a hack that works for me (ugly as it may be). I'm happy to work on a fix for this (it's not like I'm an isolated case here, a quick google search turns up plenty of hits) if someone can help me understand the right way to fix it properly. Regards, Brad

1 0

[PATCH] drm/omap: update for interlaced
by Rob Clark 06 Sep '12

06 Sep '12

From: Rob Clark <rob(a)ti.com> 'struct omap_video_timings' was updated w/ a 'bool interlaced'. Without a matching update in omap_connector, this field could have undefined values from the stack, which isn't quite ideal. Update the fxns to convert omapdss<->drm timings structs, and zero-init 'struct omap_video_timings' when it is declared on stack to avoid issues like this in the future. Signed-off-by: Rob Clark <rob(a)ti.com> --- drivers/staging/omapdrm/omap_connector.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c index 5e2856c..5f4a89b 100644 --- a/drivers/staging/omapdrm/omap_connector.c +++ b/drivers/staging/omapdrm/omap_connector.c @@ -48,13 +48,10 @@ static inline void copy_timings_omap_to_drm(struct drm_display_mode *mode, mode->vsync_end = mode->vsync_start + timings->vsw; mode->vtotal = mode->vsync_end + timings->vbp; - /* note: whether or not it is interlaced, +/- h/vsync, etc, - * which should be set in the mode flags, is not exposed in - * the omap_video_timings struct.. but hdmi driver tracks - * those separately so all we have to have to set the mode - * is the way to recover these timings values, and the - * omap_dss_driver would do the rest. - */ + mode->flags = 0; + + if (timings->interlace) + mode->flags |= DRM_MODE_FLAG_INTERLACE; } static inline void copy_timings_drm_to_omap(struct omap_video_timings *timings, @@ -71,6 +68,8 @@ static inline void copy_timings_drm_to_omap(struct omap_video_timings *timings, timings->vfp = mode->vsync_start - mode->vdisplay; timings->vsw = mode->vsync_end - mode->vsync_start; timings->vbp = mode->vtotal - mode->vsync_end; + + timings->interlace = !!(mode->flags & DRM_MODE_FLAG_INTERLACE); } static void omap_connector_dpms(struct drm_connector *connector, int mode) @@ -187,7 +186,7 @@ static int omap_connector_get_modes(struct drm_connector *connector) } } else { struct drm_display_mode *mode = drm_mode_create(dev); - struct omap_video_timings timings; + struct omap_video_timings timings = {0}; dssdrv->get_timings(dssdev, &timings); @@ -291,7 +290,7 @@ void omap_connector_mode_set(struct drm_connector *connector, struct omap_connector *omap_connector = to_omap_connector(connector); struct omap_dss_device *dssdev = omap_connector->dssdev; struct omap_dss_driver *dssdrv = dssdev->driver; - struct omap_video_timings timings; + struct omap_video_timings timings = {0}; copy_timings_drm_to_omap(&timings, mode); -- 1.7.9.5

2 1

[PATCH] gma500: Remove unused variable
by Emil Goode 05 Sep '12

05 Sep '12

This patch removes a unused struct psb_intel_connector Sparse gives a warning: drivers/gpu/drm/gma500/cdv_intel_hdmi.c:142:30: warning: unused variable ‘psb_intel_connector’ [-Wunused-variable] Signed-off-by: Emil Goode <emilgoode(a)gmail.com> --- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c index b1b77bb..7272a46 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c @@ -139,8 +139,6 @@ static enum drm_connector_status cdv_hdmi_detect( { struct psb_intel_encoder *psb_intel_encoder = psb_intel_attached_encoder(connector); - struct psb_intel_connector *psb_intel_connector = - to_psb_intel_connector(connector); struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder->dev_priv; struct edid *edid = NULL; enum drm_connector_status status = connector_status_disconnected; -- 1.7.10.4

1 0

[PATCH] drm: refcnt drm_framebuffer
by Rob Clark 05 Sep '12

05 Sep '12

From: Rob Clark <rob(a)ti.com> This simplifies drm fb lifetime, and if the crtc/plane needs to hold a ref to the fb when disabling a pipe until the next vblank, this avoids the need to make disabling an overlay synchronous. This is a problem that shows up when userspace is using a drm plane to implement a hw cursor.. making overlay disable synchronous causes a performance problem when x11 is rapidly enabling/disabling the hw cursor. But not making it synchronous opens up a race condition for crashing if userspace turns around and immediately deletes the fb. Refcnt'ing the fb makes it possible to solve this problem. v1: original v2: add drm_framebuffer_remove() which is called in all paths where fb->funcs->destroy() was directly called before. This cleans up the CRTCs/planes that the fb was attached to. You should only directly use drm_framebuffer_unreference() if you are also using drm_framebuffer_reference() to keep a ref to the fb. v3: add comment explaining the fb refcount v4: remove duplicate 'list_del(&fb->filp_head)' Signed-off-by: Rob Clark <rob(a)ti.com> --- drivers/gpu/drm/drm_crtc.c | 79 ++++++++++++++++++++++++----- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/staging/omapdrm/omap_fbdev.c | 4 +- include/drm/drm_crtc.h | 14 +++++ 5 files changed, 87 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 901de9a..7552675 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -294,6 +294,8 @@ int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, { int ret; + kref_init(&fb->refcount); + ret = drm_mode_object_get(dev, &fb->base, DRM_MODE_OBJECT_FB); if (ret) return ret; @@ -307,6 +309,38 @@ int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, } EXPORT_SYMBOL(drm_framebuffer_init); +static void drm_framebuffer_free(struct kref *kref) +{ + struct drm_framebuffer *fb = + container_of(kref, struct drm_framebuffer, refcount); + fb->funcs->destroy(fb); +} + +/** + * drm_framebuffer_unreference - unref a framebuffer + * + * LOCKING: + * Caller must hold mode config lock. + */ +void drm_framebuffer_unreference(struct drm_framebuffer *fb) +{ + struct drm_device *dev = fb->dev; + DRM_DEBUG("FB ID: %d\n", fb->base.id); + WARN_ON(!mutex_is_locked(&dev->mode_config.mutex)); + kref_put(&fb->refcount, drm_framebuffer_free); +} +EXPORT_SYMBOL(drm_framebuffer_unreference); + +/** + * drm_framebuffer_reference - incr the fb refcnt + */ +void drm_framebuffer_reference(struct drm_framebuffer *fb) +{ + DRM_DEBUG("FB ID: %d\n", fb->base.id); + kref_get(&fb->refcount); +} +EXPORT_SYMBOL(drm_framebuffer_reference); + /** * drm_framebuffer_cleanup - remove a framebuffer object * @fb: framebuffer to remove @@ -320,6 +354,32 @@ EXPORT_SYMBOL(drm_framebuffer_init); void drm_framebuffer_cleanup(struct drm_framebuffer *fb) { struct drm_device *dev = fb->dev; + /* + * This could be moved to drm_framebuffer_remove(), but for + * debugging is nice to keep around the list of fb's that are + * no longer associated w/ a drm_file but are not unreferenced + * yet. (i915 and omapdrm have debugfs files which will show + * this.) + */ + drm_mode_object_put(dev, &fb->base); + list_del(&fb->head); + dev->mode_config.num_fb--; +} +EXPORT_SYMBOL(drm_framebuffer_cleanup); + +/** + * drm_framebuffer_remove - remove and unreference a framebuffer object + * @fb: framebuffer to remove + * + * LOCKING: + * Caller must hold mode config lock. + * + * Scans all the CRTCs and planes in @dev's mode_config. If they're + * using @fb, removes it, setting it to NULL. + */ +void drm_framebuffer_remove(struct drm_framebuffer *fb) +{ + struct drm_device *dev = fb->dev; struct drm_crtc *crtc; struct drm_plane *plane; struct drm_mode_set set; @@ -350,11 +410,11 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb) } } - drm_mode_object_put(dev, &fb->base); - list_del(&fb->head); - dev->mode_config.num_fb--; + list_del(&fb->filp_head); + + drm_framebuffer_unreference(fb); } -EXPORT_SYMBOL(drm_framebuffer_cleanup); +EXPORT_SYMBOL(drm_framebuffer_remove); /** * drm_crtc_init - Initialise a new CRTC object @@ -1032,7 +1092,7 @@ void drm_mode_config_cleanup(struct drm_device *dev) } list_for_each_entry_safe(fb, fbt, &dev->mode_config.fb_list, head) { - fb->funcs->destroy(fb); + drm_framebuffer_remove(fb); } list_for_each_entry_safe(crtc, ct, &dev->mode_config.crtc_list, head) { @@ -2343,11 +2403,7 @@ int drm_mode_rmfb(struct drm_device *dev, goto out; } - /* TODO release all crtc connected to the framebuffer */ - /* TODO unhock the destructor from the buffer object */ - - list_del(&fb->filp_head); - fb->funcs->destroy(fb); + drm_framebuffer_remove(fb); out: mutex_unlock(&dev->mode_config.mutex); @@ -2497,8 +2553,7 @@ void drm_fb_release(struct drm_file *priv) mutex_lock(&dev->mode_config.mutex); list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) { - list_del(&fb->filp_head); - fb->funcs->destroy(fb); + drm_framebuffer_remove(fb); } mutex_unlock(&dev->mode_config.mutex); } diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index d5586cc..f4ac433 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -266,8 +266,8 @@ static void exynos_drm_fbdev_destroy(struct drm_device *dev, /* release drm framebuffer and real buffer */ if (fb_helper->fb && fb_helper->fb->funcs) { fb = fb_helper->fb; - if (fb && fb->funcs->destroy) - fb->funcs->destroy(fb); + if (fb) + drm_framebuffer_remove(fb); } /* release linux framebuffer */ diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a69a3d0..2109c9f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5687,7 +5687,7 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, if (!drm_crtc_helper_set_mode(crtc, mode, 0, 0, old_fb)) { DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n"); if (old->release_fb) - old->release_fb->funcs->destroy(old->release_fb); + drm_framebuffer_remove(old->release_fb); crtc->fb = old_fb; return false; } @@ -5717,7 +5717,7 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, drm_helper_disable_unused_functions(dev); if (old->release_fb) - old->release_fb->funcs->destroy(old->release_fb); + drm_framebuffer_remove(old->release_fb); return; } diff --git a/drivers/staging/omapdrm/omap_fbdev.c b/drivers/staging/omapdrm/omap_fbdev.c index 8c6ed3b..8a027bb 100644 --- a/drivers/staging/omapdrm/omap_fbdev.c +++ b/drivers/staging/omapdrm/omap_fbdev.c @@ -276,7 +276,7 @@ fail: if (fbi) framebuffer_release(fbi); if (fb) - fb->funcs->destroy(fb); + drm_framebuffer_remove(fb); } return ret; @@ -401,7 +401,7 @@ void omap_fbdev_free(struct drm_device *dev) /* this will free the backing object */ if (fbdev->fb) - fbdev->fb->funcs->destroy(fbdev->fb); + drm_framebuffer_remove(fbdev->fb); kfree(fbdev); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index a82e0a2..1422b36 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -219,6 +219,7 @@ struct drm_display_info { }; struct drm_framebuffer_funcs { + /* note: use drm_framebuffer_remove() */ void (*destroy)(struct drm_framebuffer *framebuffer); int (*create_handle)(struct drm_framebuffer *fb, struct drm_file *file_priv, @@ -243,6 +244,16 @@ struct drm_framebuffer_funcs { struct drm_framebuffer { struct drm_device *dev; + /* + * Note that the fb is refcounted for the benefit of driver internals, + * for example some hw, disabling a CRTC/plane is asynchronous, and + * scanout does not actually complete until the next vblank. So some + * cleanup (like releasing the reference(s) on the backing GEM bo(s)) + * should be deferred. In cases like this, the driver would like to + * hold a ref to the fb even though it has already been removed from + * userspace perspective. + */ + struct kref refcount; struct list_head head; struct drm_mode_object base; const struct drm_framebuffer_funcs *funcs; @@ -921,6 +932,9 @@ extern int drm_object_property_get_value(struct drm_mode_object *obj, extern int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, const struct drm_framebuffer_funcs *funcs); +void drm_framebuffer_unreference(struct drm_framebuffer *fb); +void drm_framebuffer_reference(struct drm_framebuffer *fb); +void drm_framebuffer_remove(struct drm_framebuffer *fb); extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb); extern void drm_connector_attach_property(struct drm_connector *connector, -- 1.7.9.5

1 0

[PATCH] drm: refcnt drm_framebuffer
by Rob Clark 05 Sep '12

05 Sep '12

From: Rob Clark <rob(a)ti.com> This simplifies drm fb lifetime, and if the crtc/plane needs to hold a ref to the fb when disabling a pipe until the next vblank, this avoids the need to make disabling an overlay synchronous. This is a problem that shows up when userspace is using a drm plane to implement a hw cursor.. making overlay disable synchronous causes a performance problem when x11 is rapidly enabling/disabling the hw cursor. But not making it synchronous opens up a race condition for crashing if userspace turns around and immediately deletes the fb. Refcnt'ing the fb makes it possible to solve this problem. v1: original v2: add drm_framebuffer_remove() which is called in all paths where fb->funcs->destroy() was directly called before. This cleans up the CRTCs/planes that the fb was attached to. You should only directly use drm_framebuffer_unreference() if you are also using drm_framebuffer_reference() to keep a ref to the fb. v3: add comment explaining the fb refcount Signed-off-by: Rob Clark <rob(a)ti.com> Reviewed-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- drivers/gpu/drm/drm_crtc.c | 78 +++++++++++++++++++++++++---- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/staging/omapdrm/omap_fbdev.c | 4 +- include/drm/drm_crtc.h | 14 ++++++ 5 files changed, 87 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 901de9a..96e236f 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -294,6 +294,8 @@ int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, { int ret; + kref_init(&fb->refcount); + ret = drm_mode_object_get(dev, &fb->base, DRM_MODE_OBJECT_FB); if (ret) return ret; @@ -307,6 +309,38 @@ int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, } EXPORT_SYMBOL(drm_framebuffer_init); +static void drm_framebuffer_free(struct kref *kref) +{ + struct drm_framebuffer *fb = + container_of(kref, struct drm_framebuffer, refcount); + fb->funcs->destroy(fb); +} + +/** + * drm_framebuffer_unreference - unref a framebuffer + * + * LOCKING: + * Caller must hold mode config lock. + */ +void drm_framebuffer_unreference(struct drm_framebuffer *fb) +{ + struct drm_device *dev = fb->dev; + DRM_DEBUG("FB ID: %d\n", fb->base.id); + WARN_ON(!mutex_is_locked(&dev->mode_config.mutex)); + kref_put(&fb->refcount, drm_framebuffer_free); +} +EXPORT_SYMBOL(drm_framebuffer_unreference); + +/** + * drm_framebuffer_reference - incr the fb refcnt + */ +void drm_framebuffer_reference(struct drm_framebuffer *fb) +{ + DRM_DEBUG("FB ID: %d\n", fb->base.id); + kref_get(&fb->refcount); +} +EXPORT_SYMBOL(drm_framebuffer_reference); + /** * drm_framebuffer_cleanup - remove a framebuffer object * @fb: framebuffer to remove @@ -320,6 +354,32 @@ EXPORT_SYMBOL(drm_framebuffer_init); void drm_framebuffer_cleanup(struct drm_framebuffer *fb) { struct drm_device *dev = fb->dev; + /* + * This could be moved to drm_framebuffer_remove(), but for + * debugging is nice to keep around the list of fb's that are + * no longer associated w/ a drm_file but are not unreferenced + * yet. (i915 and omapdrm have debugfs files which will show + * this.) + */ + drm_mode_object_put(dev, &fb->base); + list_del(&fb->head); + dev->mode_config.num_fb--; +} +EXPORT_SYMBOL(drm_framebuffer_cleanup); + +/** + * drm_framebuffer_remove - remove and unreference a framebuffer object + * @fb: framebuffer to remove + * + * LOCKING: + * Caller must hold mode config lock. + * + * Scans all the CRTCs and planes in @dev's mode_config. If they're + * using @fb, removes it, setting it to NULL. + */ +void drm_framebuffer_remove(struct drm_framebuffer *fb) +{ + struct drm_device *dev = fb->dev; struct drm_crtc *crtc; struct drm_plane *plane; struct drm_mode_set set; @@ -350,11 +410,11 @@ void drm_framebuffer_cleanup(struct drm_framebuffer *fb) } } - drm_mode_object_put(dev, &fb->base); - list_del(&fb->head); - dev->mode_config.num_fb--; + list_del(&fb->filp_head); + + drm_framebuffer_unreference(fb); } -EXPORT_SYMBOL(drm_framebuffer_cleanup); +EXPORT_SYMBOL(drm_framebuffer_remove); /** * drm_crtc_init - Initialise a new CRTC object @@ -1032,7 +1092,7 @@ void drm_mode_config_cleanup(struct drm_device *dev) } list_for_each_entry_safe(fb, fbt, &dev->mode_config.fb_list, head) { - fb->funcs->destroy(fb); + drm_framebuffer_remove(fb); } list_for_each_entry_safe(crtc, ct, &dev->mode_config.crtc_list, head) { @@ -2343,11 +2403,8 @@ int drm_mode_rmfb(struct drm_device *dev, goto out; } - /* TODO release all crtc connected to the framebuffer */ - /* TODO unhock the destructor from the buffer object */ - list_del(&fb->filp_head); - fb->funcs->destroy(fb); + drm_framebuffer_remove(fb); out: mutex_unlock(&dev->mode_config.mutex); @@ -2497,8 +2554,7 @@ void drm_fb_release(struct drm_file *priv) mutex_lock(&dev->mode_config.mutex); list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) { - list_del(&fb->filp_head); - fb->funcs->destroy(fb); + drm_framebuffer_remove(fb); } mutex_unlock(&dev->mode_config.mutex); } diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index d5586cc..f4ac433 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -266,8 +266,8 @@ static void exynos_drm_fbdev_destroy(struct drm_device *dev, /* release drm framebuffer and real buffer */ if (fb_helper->fb && fb_helper->fb->funcs) { fb = fb_helper->fb; - if (fb && fb->funcs->destroy) - fb->funcs->destroy(fb); + if (fb) + drm_framebuffer_remove(fb); } /* release linux framebuffer */ diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a69a3d0..2109c9f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5687,7 +5687,7 @@ bool intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, if (!drm_crtc_helper_set_mode(crtc, mode, 0, 0, old_fb)) { DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n"); if (old->release_fb) - old->release_fb->funcs->destroy(old->release_fb); + drm_framebuffer_remove(old->release_fb); crtc->fb = old_fb; return false; } @@ -5717,7 +5717,7 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, drm_helper_disable_unused_functions(dev); if (old->release_fb) - old->release_fb->funcs->destroy(old->release_fb); + drm_framebuffer_remove(old->release_fb); return; } diff --git a/drivers/staging/omapdrm/omap_fbdev.c b/drivers/staging/omapdrm/omap_fbdev.c index 8c6ed3b..8a027bb 100644 --- a/drivers/staging/omapdrm/omap_fbdev.c +++ b/drivers/staging/omapdrm/omap_fbdev.c @@ -276,7 +276,7 @@ fail: if (fbi) framebuffer_release(fbi); if (fb) - fb->funcs->destroy(fb); + drm_framebuffer_remove(fb); } return ret; @@ -401,7 +401,7 @@ void omap_fbdev_free(struct drm_device *dev) /* this will free the backing object */ if (fbdev->fb) - fbdev->fb->funcs->destroy(fbdev->fb); + drm_framebuffer_remove(fbdev->fb); kfree(fbdev); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index a82e0a2..1422b36 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -219,6 +219,7 @@ struct drm_display_info { }; struct drm_framebuffer_funcs { + /* note: use drm_framebuffer_remove() */ void (*destroy)(struct drm_framebuffer *framebuffer); int (*create_handle)(struct drm_framebuffer *fb, struct drm_file *file_priv, @@ -243,6 +244,16 @@ struct drm_framebuffer_funcs { struct drm_framebuffer { struct drm_device *dev; + /* + * Note that the fb is refcounted for the benefit of driver internals, + * for example some hw, disabling a CRTC/plane is asynchronous, and + * scanout does not actually complete until the next vblank. So some + * cleanup (like releasing the reference(s) on the backing GEM bo(s)) + * should be deferred. In cases like this, the driver would like to + * hold a ref to the fb even though it has already been removed from + * userspace perspective. + */ + struct kref refcount; struct list_head head; struct drm_mode_object base; const struct drm_framebuffer_funcs *funcs; @@ -921,6 +932,9 @@ extern int drm_object_property_get_value(struct drm_mode_object *obj, extern int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, const struct drm_framebuffer_funcs *funcs); +void drm_framebuffer_unreference(struct drm_framebuffer *fb); +void drm_framebuffer_reference(struct drm_framebuffer *fb); +void drm_framebuffer_remove(struct drm_framebuffer *fb); extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb); extern void drm_connector_attach_property(struct drm_connector *connector, -- 1.7.9.5

1 1

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2012