dri-devel June 2012

dri-devel@lists.freedesktop.org

125 participants
696 discussions

[PATCH v3] scatterlist: add sg_alloc_table_from_pages function
by Tomasz Stanislawski 06 Jun '12

06 Jun '12

This patch adds a new constructor for an sg table. The table is constructed from an array of struct pages. All contiguous chunks of the pages are merged into a single sg nodes. A user may provide an offset and a size of a buffer if the buffer is not page-aligned. The function is dedicated for DMABUF exporters which often perform conversion from an page array to a scatterlist. Moreover the scatterlist should be squashed in order to save memory and to speed-up the process of DMA mapping using dma_map_sg. The code is based on the patch 'v4l: vb2-dma-contig: add support for scatterlist in userptr mode' and hints from Laurent Pinchart. Signed-off-by: Tomasz Stanislawski <t.stanislaws(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- include/linux/scatterlist.h | 4 +++ lib/scatterlist.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index ac9586d..7b600da 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h @@ -214,6 +214,10 @@ 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_alloc_table_from_pages(struct sg_table *sgt, + struct page **pages, unsigned int n_pages, + unsigned long offset, unsigned long size, + gfp_t gfp_mask); size_t sg_copy_from_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, size_t buflen); diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 6096e89..85868a1 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -319,6 +319,70 @@ int sg_alloc_table(struct sg_table *table, unsigned int nents, gfp_t gfp_mask) EXPORT_SYMBOL(sg_alloc_table); /** + * sg_alloc_table_from_pages - Allocate and initialize an sg table from + * an array of pages + * @sgt: The sg table header to use + * @pages: Pointer to an array of page pointers + * @n_pages: Number of pages in the pages array + * @offset: Offset from start of the first page to the start of a buffer + * @size: Number of valid bytes in the buffer (after offset) + * @gfp_mask: GFP allocation mask + * + * Description: + * Allocate and initialize an sg table from a list of pages. Continuous + * ranges of the pages are squashed into a single scatterlist node. A user + * may provide an offset at a start and a size of valid data in a buffer + * specified by the page array. The returned sg table is released by + * sg_free_table. + * + * Returns: + * 0 on success, negative error on failure + **/ +int sg_alloc_table_from_pages(struct sg_table *sgt, + struct page **pages, unsigned int n_pages, + unsigned long offset, unsigned long size, + gfp_t gfp_mask) +{ + unsigned int chunks; + unsigned int i; + unsigned int cur_page; + int ret; + struct scatterlist *s; + + /* compute number of contiguous chunks */ + chunks = 1; + for (i = 1; i < n_pages; ++i) + if (page_to_pfn(pages[i]) != page_to_pfn(pages[i - 1]) + 1) + ++chunks; + + ret = sg_alloc_table(sgt, chunks, gfp_mask); + if (unlikely(ret)) + return ret; + + /* merging chunks and putting them into the scatterlist */ + cur_page = 0; + for_each_sg(sgt->sgl, s, sgt->orig_nents, i) { + unsigned long chunk_size; + unsigned int j; + + /* looking for the end of the current chunk */ + for (j = cur_page + 1; j < n_pages; ++j) + if (page_to_pfn(pages[j]) != + page_to_pfn(pages[j - 1]) + 1) + break; + + chunk_size = ((j - cur_page) << PAGE_SHIFT) - offset; + sg_set_page(s, pages[cur_page], min(size, chunk_size), offset); + size -= chunk_size; + offset = 0; + cur_page = j; + } + + return 0; +} +EXPORT_SYMBOL(sg_alloc_table_from_pages); + +/** * sg_miter_start - start mapping iteration over a sg list * @miter: sg mapping iter to be started * @sgl: sg list to iterate over -- 1.7.5.4

4 6

[Bug 50616] New: glClear occasionally taking >60ms
by bugzilla-daemon＠freedesktop.org 06 Jun '12

06 Jun '12

https://bugs.freedesktop.org/show_bug.cgi?id=50616 Bug #: 50616 Summary: glClear occasionally taking >60ms Classification: Unclassified Product: Mesa Version: 8.0 Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: minor Priority: medium Component: Drivers/Gallium/r600 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: curaga(a)operamail.com I have a test app that draws 65k point sprites, apitrace: http://kiwi6.com/file/0c0512r1no (980kb). Apitrace says that on average glClear takes 28ms, and many clear calls take over 60ms. Surely it shouldn't take that long? If it were because of tearing prevention, it should take at most 16ms (1/60Hz). -- vblank_mode=0 had no change, oprofile says Mesa takes less than 2% cpu. Latencytop shows radeon_fence_wait taking between 3 and 5ms during rendering. -- Mesa 8.0.3 Linux 3.2.17 HD4350 / r600g -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 7

Re: psb_gfx removal
by Greg KH 06 Jun '12

06 Jun '12

On Tue, Jun 05, 2012 at 03:01:06PM +0200, Jan Engelhardt wrote: > [fixed up gregkh's address] > > Hi, > > > I have here a "Wortmann AG terra Pad 1051", which has a GMA500-like > device (PCI ID 8086:4102). Using Linux 3.1.x (openSUSE 12.1's default), > loading psb_gfx.ko crashed the machine. I therefore tried Linux 3.4.0, > where this crash does not occur thankfully. > > According to your commit b7cdd9e6323af368e26121c5b791eddc78e79fea, > GMA500 is now available through the DRM tree. I take it you mean > kernel/drivers/gpu/drm/gma500/gma500_gfx.ko by that. However, > gma500_gfx.ko does not provide support for 8086:4102, i.e. modinfo does > not show the alias. > > So, am I correct in the assumption that the 4102 code never really > worked, and deletion of psb_gfx was therefore ok without having 4102 > support in gma500_gfx? I have no idea at all, that would be up to Alan to answer, not me. greg k-h

1 0

Re: [PULL] drm-intel-fixes
by Daniel Vetter 05 Jun '12

05 Jun '12

Meh, I've forgotten to cc the appropriate set of lists. -Daniel On Tue, Jun 5, 2012 at 9:18 PM, Daniel Vetter <daniel(a)ffwll.ch> wrote: > Hi Dave > > A few fixes for 3.5. Most of them make corner-cases a bit more robust > (hotplug for b0rked kvm switches, driver init/reset/resume), almost all of > them are cc stable. The tip patch fixes up pageflip on the 3rd crtc for > ivb. No, don't ask how much our QA and testing needs to suck so that we > happily ship with totally broken pageflip. And to add insult to injury > pageflip was broken across much many machines :( > > On the upside we now have an automated i-g-t test for this and pageflips > should really work everywhere now ... > > Yours, Daniel > > The following changes since commit 1c780f2cfec8b533b9cfda77209b4e3e7adaddbf: > > drm/udl: remove unused variables. (2012-05-29 13:47:59 +0100) > > are available in the git repository at: > > git://people.freedesktop.org/~danvet/drm-intel drm-intel-fixes > > for you to fetch changes up to cb05d8dedefa3066bf5d74ef88c6ca6cf4bd1c87: > > drm/i915: fix up ivb plane 3 pageflips (2012-06-05 21:05:21 +0200) > > ---------------------------------------------------------------- > Chris Wilson (3): > drm/i915: Reset last_retired_head when resetting ring > drm/i915/crt: Do not rely upon the HPD presence pin > drm/i915: Mark the ringbuffers as being in the GTT domain > > Daniel Vetter (2): > drm/i915: hold forcewake around ring hw init > drm/i915: fix up ivb plane 3 pageflips > > drivers/gpu/drm/i915/i915_drv.c | 13 +++++++++---- > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++ > drivers/gpu/drm/i915/intel_crt.c | 8 +++++--- > drivers/gpu/drm/i915/intel_display.c | 19 ++++++++++++++++++- > drivers/gpu/drm/i915/intel_ringbuffer.c | 21 ++++++++++++++++++--- > 6 files changed, 61 insertions(+), 11 deletions(-) -- Daniel Vetter daniel.vetter(a)ffwll.ch - +41 (0) 79 364 57 48 - http://blog.ffwll.ch

1 0

[PATCH] drm: Skip too big EDID extensions
by Takashi Iwai 05 Jun '12

05 Jun '12

When the number of extension blocks in EDID is too big, it's more likely a broken data, thus better to skip them. We've got a bug report that a machine spews "invalid block EDID" errors at boot for 400 times which delays the boot very much, and this patch fixes it. Certainly it's a hardware-specific problem, but it's anyway safer to avoid such almost unrealistic setups. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- drivers/gpu/drm/drm_edid.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index eb92fe2..61e4cf1 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -321,6 +321,13 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) if (i == 4) goto carp; + if (block[0x7e] > 20) { + /* too many extensions -- something is wrong */ + DRM_DEBUG_KMS("drm: %s: ignoring too many extensions %d\n", + adapter->name, block[0x7e]); + block[0x7e] = 0; + } + /* if there's no extensions, we're done */ if (block[0x7e] == 0) return block; -- 1.7.10.3

1 0

[PATCH] drm/i2c/ch7006: Convert to dev_pm_ops
by Mark Brown 05 Jun '12

05 Jun '12

The I2C specific suspend and resume functions have been deprecated and printing a warning on boot for over a year, dev_pm_ops should be used instead so convert to that. Also remove the suspend function since all it does is log. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Acked-by: Francisco Jerez <currojerez(a)riseup.net> --- drivers/gpu/drm/i2c/ch7006_drv.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c index d3f2e87..74ad254 100644 --- a/drivers/gpu/drm/i2c/ch7006_drv.c +++ b/drivers/gpu/drm/i2c/ch7006_drv.c @@ -427,15 +427,10 @@ static int ch7006_remove(struct i2c_client *client) return 0; } -static int ch7006_suspend(struct i2c_client *client, pm_message_t mesg) +static int ch7006_resume(struct device *dev) { - ch7006_dbg(client, "\n"); - - return 0; -} + struct i2c_client *client = to_i2c_device(dev); -static int ch7006_resume(struct i2c_client *client) -{ ch7006_dbg(client, "\n"); ch7006_write(client, 0x3d, 0x0); @@ -499,15 +494,18 @@ static struct i2c_device_id ch7006_ids[] = { }; MODULE_DEVICE_TABLE(i2c, ch7006_ids); +static const struct dev_pm_ops ch7006_pm_ops = { + .resume = ch7006_resume, +}; + static struct drm_i2c_encoder_driver ch7006_driver = { .i2c_driver = { .probe = ch7006_probe, .remove = ch7006_remove, - .suspend = ch7006_suspend, - .resume = ch7006_resume, .driver = { .name = "ch7006", + .pm = &ch7006_pm_ops, }, .id_table = ch7006_ids, -- 1.7.10

1 0

[git pull] drm radeon fixes + new pci ids.
by Dave Airlie 05 Jun '12

05 Jun '12

Hi Linus, this is just radeon fixes and a bunch of new PCI ids. The fixes are for a deadlock, an audio regression, and a couple of audio fixes. Dave. The following changes since commit 99becf1328d8d71dd6f4480e3591d7dcdb389e57: Pull 'for-linus' branches of git://git.kernel.org/pub/scm/linux/kernel/git/viro/{signal,vfs} (2012-06-04 15:09:08 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to 7aaa61b3476462b69f1ac7669fcca8d608ce3cb5: drm/radeon/kms: add new SI PCI ids (2012-06-05 15:11:12 +0100) ---------------------------------------------------------------- Alex Deucher (6): drm/radeon: make audio_init consistent across asics drm/radeon: fix gpu_init on si drm/radeon/kms: add new Trinity PCI ids drm/radeon/kms: add new Palm, Sumo PCI ids drm/radeon/kms: add new BTC PCI ids drm/radeon/kms: add new SI PCI ids Christian König (1): drm/radeon: fix vm deadlocks on cayman Rafał Miłecki (2): drm/radeon/audio: don't hardcode CRTC id drm/radeon/hdmi: don't set SEND_MAX_PACKETS bit drivers/gpu/drm/radeon/ni.c | 21 +- drivers/gpu/drm/radeon/r600.c | 15 +- drivers/gpu/drm/radeon/r600_audio.c | 5 +- drivers/gpu/drm/radeon/r600_hdmi.c | 1 - drivers/gpu/drm/radeon/radeon.h | 5 +- drivers/gpu/drm/radeon/radeon_gart.c | 19 +- drivers/gpu/drm/radeon/radeon_kms.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 12 +- drivers/gpu/drm/radeon/rs690.c | 12 +- drivers/gpu/drm/radeon/rv770.c | 18 +- drivers/gpu/drm/radeon/si.c | 477 ++++++++++++---------------------- drivers/gpu/drm/radeon/sid.h | 19 ++ include/drm/drm_pciids.h | 17 +- 13 files changed, 255 insertions(+), 368 deletions(-)

1 0

[PATCH 1/4] drm/radeon/kms: add new Trinity PCI ids
by alexdeucher＠gmail.com 05 Jun '12

05 Jun '12

From: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/ni.c | 21 +++++++++++++++++---- include/drm/drm_pciids.h | 8 ++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 98b409f..28d9810 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -460,15 +460,28 @@ static void cayman_gpu_init(struct radeon_device *rdev) rdev->config.cayman.max_pipes_per_simd = 4; rdev->config.cayman.max_tile_pipes = 2; if ((rdev->pdev->device == 0x9900) || - (rdev->pdev->device == 0x9901)) { + (rdev->pdev->device == 0x9901) || + (rdev->pdev->device == 0x9905) || + (rdev->pdev->device == 0x9906) || + (rdev->pdev->device == 0x9907) || + (rdev->pdev->device == 0x9908) || + (rdev->pdev->device == 0x9909) || + (rdev->pdev->device == 0x9910) || + (rdev->pdev->device == 0x9917)) { rdev->config.cayman.max_simds_per_se = 6; rdev->config.cayman.max_backends_per_se = 2; } else if ((rdev->pdev->device == 0x9903) || - (rdev->pdev->device == 0x9904)) { + (rdev->pdev->device == 0x9904) || + (rdev->pdev->device == 0x990A) || + (rdev->pdev->device == 0x9913) || + (rdev->pdev->device == 0x9918)) { rdev->config.cayman.max_simds_per_se = 4; rdev->config.cayman.max_backends_per_se = 2; - } else if ((rdev->pdev->device == 0x9990) || - (rdev->pdev->device == 0x9991)) { + } else if ((rdev->pdev->device == 0x9919) || + (rdev->pdev->device == 0x9990) || + (rdev->pdev->device == 0x9991) || + (rdev->pdev->device == 0x9994) || + (rdev->pdev->device == 0x99A0)) { rdev->config.cayman.max_simds_per_se = 3; rdev->config.cayman.max_backends_per_se = 1; } else { diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h index 58d0bda..961dae0 100644 --- a/include/drm/drm_pciids.h +++ b/include/drm/drm_pciids.h @@ -561,11 +561,19 @@ {0x1002, 0x9909, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x990A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x990F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9910, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9913, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9917, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9918, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9919, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9990, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9991, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9993, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9994, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0, 0, 0} #define r128_PCI_IDS \ -- 1.7.7.5

1 3

[FIX][STABLE 3.3+][PATCH] drm/radeon/audio: don't hardcode CRTC id
by Rafał Miłecki 05 Jun '12

05 Jun '12

This is based on info released by AMD, should allow using audio in much more cases. Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com> Cc: <stable(a)vger.kernel.org> --- drivers/gpu/drm/radeon/r600_audio.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c index 7c4fa77..7479a5c 100644 --- a/drivers/gpu/drm/radeon/r600_audio.c +++ b/drivers/gpu/drm/radeon/r600_audio.c @@ -192,6 +192,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) struct radeon_device *rdev = dev->dev_private; struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; + struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); int base_rate = 48000; switch (radeon_encoder->encoder_id) { @@ -217,8 +218,8 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10); WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071); - /* Some magic trigger or src sel? */ - WREG32_P(0x5ac, 0x01, ~0x77); + /* Select DTO source */ + WREG32(0x5ac, radeon_crtc->crtc_id); } else { switch (dig->dig_encoder) { case 0: -- 1.7.7

3 3

[PATCH] radeon: Make PM info available to all, not just debug users
by Lauri Kasanen 05 Jun '12

05 Jun '12

Hi all This moves the pm_info file from debugfs to next to the other two power files. Requested by several users at Phoronix. PS: Please CC me. Also please be gentle, it's my first step in kernel-land ;) Signed-off-by: Lauri Kasanen <cand(a)gmx.com> --- drivers/gpu/drm/radeon/radeon_pm.c | 86 ++++++++++++++++++----------------- 1 files changed, 44 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 0882554..7aab18f 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -45,7 +45,6 @@ static const char *radeon_pm_state_type_name[5] = { }; static void radeon_dynpm_idle_work_handler(struct work_struct *work); -static int radeon_debugfs_pm_init(struct radeon_device *rdev); static bool radeon_pm_in_vbl(struct radeon_device *rdev); static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish); static void radeon_pm_update_profile(struct radeon_device *rdev); @@ -437,8 +436,49 @@ fail: return count; } +static ssize_t radeon_get_pm_info(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct radeon_device *rdev = ddev->dev_private; + + ssize_t curpos, len = PAGE_SIZE; + char *tmp; + + curpos = snprintf(buf, len, + "default engine clock: %u0 kHz\n" + "current engine clock: %u0 kHz\n" + "default memory clock: %u0 kHz\n", + rdev->pm.default_sclk, + radeon_get_engine_clock(rdev), + rdev->pm.default_mclk); + len -= curpos; + + if (rdev->asic->get_memory_clock) { + tmp = buf + curpos; + curpos += snprintf(tmp, len, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev)); + len = PAGE_SIZE - curpos; + } + + if (rdev->pm.current_vddc) { + tmp = buf + curpos; + curpos += snprintf(tmp, len, "voltage: %u mV\n", rdev->pm.current_vddc); + len = PAGE_SIZE - curpos; + } + + if (rdev->asic->get_pcie_lanes) { + tmp = buf + curpos; + curpos += snprintf(tmp, len, "PCIE lanes: %d\n", radeon_get_pcie_lanes(rdev)); + len = PAGE_SIZE - curpos; + } + + return curpos; +} + static DEVICE_ATTR(power_profile, S_IRUGO | S_IWUSR, radeon_get_pm_profile, radeon_set_pm_profile); static DEVICE_ATTR(power_method, S_IRUGO | S_IWUSR, radeon_get_pm_method, radeon_set_pm_method); +static DEVICE_ATTR(power_info, S_IRUGO, radeon_get_pm_info, NULL); static ssize_t radeon_hwmon_show_temp(struct device *dev, struct device_attribute *attr, @@ -639,14 +679,14 @@ int radeon_pm_init(struct radeon_device *rdev) ret = device_create_file(rdev->dev, &dev_attr_power_method); if (ret) DRM_ERROR("failed to create device file for power method\n"); + ret = device_create_file(rdev->dev, &dev_attr_power_info); + if (ret) + DRM_ERROR("failed to create device file for power info\n"); #ifdef CONFIG_ACPI rdev->acpi_nb.notifier_call = radeon_acpi_event; register_acpi_notifier(&rdev->acpi_nb); #endif - if (radeon_debugfs_pm_init(rdev)) { - DRM_ERROR("Failed to register debugfs file for PM!\n"); - } DRM_INFO("radeon: power management initialized\n"); } @@ -843,41 +883,3 @@ static void radeon_dynpm_idle_work_handler(struct work_struct *work) mutex_unlock(&rdev->pm.mutex); ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched); } - -/* - * Debugfs info - */ -#if defined(CONFIG_DEBUG_FS) - -static int radeon_debugfs_pm_info(struct seq_file *m, void *data) -{ - struct drm_info_node *node = (struct drm_info_node *) m->private; - struct drm_device *dev = node->minor->dev; - struct radeon_device *rdev = dev->dev_private; - - seq_printf(m, "default engine clock: %u0 kHz\n", rdev->pm.default_sclk); - seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev)); - seq_printf(m, "default memory clock: %u0 kHz\n", rdev->pm.default_mclk); - if (rdev->asic->pm.get_memory_clock) - seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev)); - if (rdev->pm.current_vddc) - seq_printf(m, "voltage: %u mV\n", rdev->pm.current_vddc); - if (rdev->asic->pm.get_pcie_lanes) - seq_printf(m, "PCIE lanes: %d\n", radeon_get_pcie_lanes(rdev)); - - return 0; -} - -static struct drm_info_list radeon_pm_info_list[] = { - {"radeon_pm_info", radeon_debugfs_pm_info, 0, NULL}, -}; -#endif - -static int radeon_debugfs_pm_init(struct radeon_device *rdev) -{ -#if defined(CONFIG_DEBUG_FS) - return radeon_debugfs_add_files(rdev, radeon_pm_info_list, ARRAY_SIZE(radeon_pm_info_list)); -#else - return 0; -#endif -} -- 1.7.2.1

6 20

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2012