dri-devel August 2012

dri-devel@lists.freedesktop.org

145 participants
811 discussions

[Bug 53291] New: Failed to allocate a buffer at CAYMAN
by bugzilla-daemon＠freedesktop.org 16 Aug '12

16 Aug '12

https://bugs.freedesktop.org/show_bug.cgi?id=53291 Bug #: 53291 Summary: Failed to allocate a buffer at CAYMAN Classification: Unclassified Product: DRI Version: DRI CVS Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: libdrm AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: v10lator(a)myway.de I see this error randomly with different games. Good reproducable with minecraft (appears at the first minutes of gameplay). radeon: Failed to allocate a buffer: radeon: size : 4096 bytes radeon: alignment : 4096 bytes radeon: domains : 2 This shows up in dmesg: Also (don't know if that is related or if I should open a new report for it) I randomly get a similar error. Good reproducible by playing two instances of minecraft at the same time: radeon: Failed to allocate a buffer: radeon: size : 4096 bytes radeon: alignment : 256 bytes radeon: domains : 2 EE r600_texture.c:552 r600_texture_get_transfer - failed to create temporary texture to hold untiled copy ########## GL ERROR ########## @ Pre render 1285: Out of memory Some more: radeon: Failed to allocate a buffer: radeon: size : 4096 bytes radeon: alignment : 256 bytes radeon: domains : 2 EE r600_texture.c:552 r600_texture_get_transfer - failed to create temporary texture to hold untiled copy radeon: Failed to allocate a buffer: radeon: size : 4096 bytes radeon: alignment : 256 bytes radeon: domains : 2 EE r600_texture.c:552 r600_texture_get_transfer - failed to create temporary texture to hold untiled copy radeon: Failed to allocate a buffer: radeon: size : 4096 bytes radeon: alignment : 256 bytes radeon: domains : 2 EE r600_texture.c:552 r600_texture_get_transfer - failed to create temporary texture to hold untiled copy radeon: Failed to allocate a buffer: radeon: size : 4096 bytes radeon: alignment : 256 bytes radeon: domains : 2 EE r600_texture.c:552 r600_texture_get_transfer - failed to create temporary texture to hold untiled copy radeon: Failed to allocate a buffer: radeon: size : 4096 bytes radeon: alignment : 256 bytes radeon: domains : 2 EE r600_texture.c:552 r600_texture_get_transfer - failed to create temporary texture to hold untiled copy ########## GL ERROR ########## @ Pre render 1285: Out of memory This shows up in dmesg: [ 2581.428385] radeon 0000:03:00.0: bo ffff880132b8d800 va 0x0277F000 conflict with (bo ffff880115520400 0x0277F000 0x02780000) [ 3226.086410] radeon 0000:03:00.0: bo ffff880137603800 va 0x04D20000 conflict with (bo ffff88012eba9000 0x04D20000 0x04D21000) [ 3226.087925] radeon 0000:03:00.0: bo ffff880137603800 va 0x04D20000 conflict with (bo ffff88012eba9000 0x04D20000 0x04D21000) [ 3226.092606] radeon 0000:03:00.0: bo ffff880137603800 va 0x04D20000 conflict with (bo ffff88012eba9000 0x04D20000 0x04D21000) [ 3226.093541] radeon 0000:03:00.0: bo ffff880137603800 va 0x04D20000 conflict with (bo ffff88012eba9000 0x04D20000 0x04D21000) [ 3226.094905] radeon 0000:03:00.0: bo ffff880137603800 va 0x04D20000 conflict with (bo ffff88012eba9000 0x04D20000 0x04D21000) [ 3226.448935] radeon 0000:03:00.0: bo ffff880137647400 va 0x04D4E000 conflict with (bo ffff880148407c00 0x04D4E000 0x04D4F000) [ 3278.230509] radeon 0000:03:00.0: bo ffff880149300000 va 0x148B1000 conflict with (bo ffff88012f656c00 0x148B1000 0x148B2000) [ 3759.347944] radeon 0000:03:00.0: bo ffff880113d36c00 va 0x04ED2000 conflict with (bo ffff88013d72bc00 0x04ED2000 0x04ED3000) [ 3899.333115] radeon 0000:03:00.0: bo ffff88013c35ac00 va 0x0C17B000 conflict with (bo ffff880115523800 0x0C17B000 0x0C17C000) [ 3960.510231] radeon 0000:03:00.0: bo ffff88012422bc00 va 0x05C49000 conflict with (bo ffff88014318fc00 0x05C49000 0x05C4A000) [ 3960.510673] radeon 0000:03:00.0: bo ffff88012422bc00 va 0x05C49000 conflict with (bo ffff88014318fc00 0x05C49000 0x05C4A000) [ 3960.511108] radeon 0000:03:00.0: bo ffff88012422bc00 va 0x05C49000 conflict with (bo ffff88014318fc00 0x05C49000 0x05C4A000) [ 3960.511716] radeon 0000:03:00.0: bo ffff8801374f9800 va 0x05C49000 conflict with (bo ffff88014318fc00 0x05C49000 0x05C4A000) [ 3960.512308] radeon 0000:03:00.0: bo ffff8801374f9800 va 0x05C49000 conflict with (bo ffff88014318fc00 0x05C49000 0x05C4A000) This is with the git versions of the radon driver, libdrm, mesa and the 3.5 kernel. The card beeing used is a Sapphire Radeon HD 6950 with 2GB. lspci -v: 03:00.0 VGA compatible controller: Advanced Micro Devices [AMD] nee ATI Cayman PRO [Radeon HD 6950] (prog-if 00 [VGA controller]) Subsystem: PC Partner Limited Device 186b Flags: bus master, fast devsel, latency 0, IRQ 43 Memory at d0000000 (64-bit, prefetchable) [size=256M] Memory at fe9e0000 (64-bit, non-prefetchable) [size=128K] I/O ports at d000 [size=256] Expansion ROM at fe9c0000 [disabled] [size=128K] Capabilities: [50] Power Management version 3 Capabilities: [58] Express Legacy Endpoint, MSI 00 Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 <?> Capabilities: [150] Advanced Error Reporting Kernel driver in use: radeon dmesg from booting: [ 0.570282] [drm] Initialized drm 1.1.0 20060810 [ 0.570313] [drm] radeon defaulting to kernel modesetting. [ 0.570315] [drm] radeon kernel modesetting enabled. [ 0.570597] [drm] initializing kernel modesetting (CAYMAN 0x1002:0x6719 0x174B:0x186B). [ 0.570621] [drm] register mmio base: 0xFE9E0000 [ 0.570623] [drm] register mmio size: 131072 [ 0.571137] ATOM BIOS: CAYMAN [ 0.571161] radeon 0000:03:00.0: VRAM: 2048M 0x0000000000000000 - 0x000000007FFFFFFF (2048M used) [ 0.571165] radeon 0000:03:00.0: GTT: 512M 0x0000000080000000 - 0x000000009FFFFFFF [ 0.571404] [drm] Detected VRAM RAM=2048M, BAR=256M [ 0.571410] [drm] RAM width 256bits DDR [ 0.571458] [TTM] Zone kernel: Available graphics memory: 4082246 kiB [ 0.571460] [TTM] Zone dma32: Available graphics memory: 2097152 kiB [ 0.571463] [TTM] Initializing pool allocator [ 0.571466] [TTM] Initializing DMA pool allocator [ 0.571488] [drm] radeon: 2048M of VRAM memory ready [ 0.571491] [drm] radeon: 512M of GTT memory ready. [ 0.571505] [drm] Supports vblank timestamp caching Rev 1 (10.10.2010). [ 0.571508] [drm] Driver supports precise vblank timestamp query. [ 0.571544] radeon 0000:03:00.0: irq 43 for MSI/MSI-X [ 0.571553] radeon 0000:03:00.0: radeon: using MSI. [ 0.571982] [drm] radeon: irq initialized. [ 0.571986] [drm] GART: num cpu pages 131072, num gpu pages 131072 [ 0.572985] [drm] Loading CAYMAN Microcode [ 0.574897] [drm] PCIE GART of 512M enabled (table at 0x0000000000040000). [ 0.574991] radeon 0000:03:00.0: WB enabled [ 0.574994] radeon 0000:03:00.0: fence driver on ring 0 use gpu addr 0x0000000080000c00 and cpu addr 0xffff88022ea95c00 [ 0.574998] radeon 0000:03:00.0: fence driver on ring 1 use gpu addr 0x0000000080000c04 and cpu addr 0xffff88022ea95c04 [ 0.575002] radeon 0000:03:00.0: fence driver on ring 2 use gpu addr 0x0000000080000c08 and cpu addr 0xffff88022ea95c08 [ 0.593629] [drm] ring test on 0 succeeded in 3 usecs [ 0.594103] [drm] ib test on ring 0 succeeded in 0 usecs [ 0.603990] [drm] Radeon Display Connectors [ 0.603995] [drm] Connector 0: [ 0.603997] [drm] DP-1 [ 0.603998] [drm] HPD4 [ 0.604001] [drm] DDC: 0x6430 0x6430 0x6434 0x6434 0x6438 0x6438 0x643c 0x643c [ 0.604003] [drm] Encoders: [ 0.604005] [drm] DFP1: INTERNAL_UNIPHY2 [ 0.604007] [drm] Connector 1: [ 0.604008] [drm] HDMI-A-1 [ 0.604009] [drm] HPD3 [ 0.604011] [drm] DDC: 0x6460 0x6460 0x6464 0x6464 0x6468 0x6468 0x646c 0x646c [ 0.604014] [drm] Encoders: [ 0.604015] [drm] DFP2: INTERNAL_UNIPHY2 [ 0.604017] [drm] Connector 2: [ 0.604018] [drm] DVI-D-1 [ 0.604020] [drm] HPD1 [ 0.604022] [drm] DDC: 0x6480 0x6480 0x6484 0x6484 0x6488 0x6488 0x648c 0x648c [ 0.604024] [drm] Encoders: [ 0.604025] [drm] DFP3: INTERNAL_UNIPHY1 [ 0.604027] [drm] Connector 3: [ 0.604029] [drm] DVI-I-1 [ 0.604030] [drm] HPD6 [ 0.604032] [drm] DDC: 0x6470 0x6470 0x6474 0x6474 0x6478 0x6478 0x647c 0x647c [ 0.604034] [drm] Encoders: [ 0.604036] [drm] DFP4: INTERNAL_UNIPHY [ 0.604037] [drm] CRT1: INTERNAL_KLDSCP_DAC1 [ 0.604315] [drm] Internal thermal controller with fan control [ 0.605470] [drm] radeon: power management initialized [ 0.651233] [drm] fb mappable at 0xD1142000 [ 0.651238] [drm] vram apper at 0xD0000000 [ 0.651240] [drm] size 8294400 [ 0.651242] [drm] fb depth is 24 [ 0.651243] [drm] pitch is 7680 [ 0.651378] fbcon: radeondrmfb (fb0) is primary device [ 0.862204] Console: switching to colour frame buffer device 240x67 [ 0.867946] fb0: radeondrmfb frame buffer device [ 0.867947] drm: registered panic notifier [ 0.867950] [drm] Initialized radeon 2.17.0 20080528 for 0000:03:00.0 on minor 0 uname -a: Linux horst 3.5.0 #2 SMP PREEMPT Sun Jul 29 17:30:51 CEST 2012 x86_64 AMD Athlon(tm) II X3 455 Processor AuthenticAMD GNU/Linux If you need any more information feel free to ask. :) -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 3

[Bug 50389] New: [radeonsi] Unknown type of argument: ../../../../i386-linux-gnu/egl/egl_gallium.so
by bugzilla-daemon＠freedesktop.org 16 Aug '12

16 Aug '12

https://bugs.freedesktop.org/show_bug.cgi?id=50389 Bug #: 50389 Summary: [radeonsi] Unknown type of argument: ../../../../i386-linux-gnu/egl/egl_gallium.so Classification: Unclassified Product: Mesa Version: git Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: major Priority: high Component: Drivers/Gallium/r600 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: fabio.ped(a)libero.it When enabling radeonsi building fails with: collect2: ld returned 1 exit status mklib: Installing egl_gallium.so in ../../../../i386-linux-gnu/egl mv: cannot stat `egl_gallium.so': No such file or directory /usr/bin/install -c -d /build/buildd/mesa-8.1~git1205271341.640409~gd~p/debian/tmp/dri/usr/lib/i386-linux-gnu/egl for out in ../../../../i386-linux-gnu/egl/egl_gallium.so; do \ /bin/bash ../../../../bin/minstall -m 755 "$out" /build/buildd/mesa-8.1~git1205271341.640409~gd~p/debian/tmp/dri/usr/lib/i386-linux-gnu/egl; \ done Unknown type of argument: ../../../../i386-linux-gnu/egl/egl_gallium.so make[4]: *** [install] Error 1 make[4]: Leaving directory `/build/buildd/mesa-8.1~git1205271341.640409~gd~p/build/dri/src/gallium/targets/egl-static' make[3]: *** [install] Error 1 Full compile log here: https://launchpadlibrarian.net/106246003/buildlog_ubuntu-precise-i386.mesa_… -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 3

[PATCH 0/4] Some long forgotten EDID/CEA fixes
by ville.syrjala＠linux.intel.com 16 Aug '12

16 Aug '12

I found these EDID/CEA patches sitting in a branch in my tree. I worked on them at some point, but forgot about them when something more urgent came up. They haven't been tested all that well, mainly because currently there is no way to test this code, apart from trying on real hardware. If someone is looking for a good project, this would be one: 1. Split EDID parsing from the rest of the junk in drm_edid.c 2. Make it compile in user space 3. Cook up some regression and fuzz testing framework

1 4

[REGRESSION] [KMS] [INTEL] Wrong resolution in console and XWindow
by Maciej Rutecki 16 Aug '12

16 Aug '12

Last known good: 3.4.4 First bad: 3.5.0 When booting 3.5.0 resolution (in console, and after in KDE) is set to 1024x768 (60Hz). In 3.4.4 was correct: 1440x900 (60Hz). Dmesg from 3.5.0: http://mrutecki.pl/download/kernel/3.5/swinka/dmesg-3.5.0.txt Dmesg from 3.4.4: http://mrutecki.pl/download/kernel/3.5/swinka/dmesg-3.4.4.txt Config 3.5.0: http://mrutecki.pl/download/kernel/3.5/swinka/config-3.5.0 lspci: http://mrutecki.pl/download/kernel/3.5/swinka/lspci.txt Regards -- Maciej Rutecki http://www.mrutecki.pl

3 11

[PATCH 0/2] drm/omap: properties patches
by Rob Clark 16 Aug '12

16 Aug '12

From: Rob Clark <rob(a)ti.com> Re-sending the earlier rotation property patch, plus Andre's z-order property patch rebased on latest staging-next. Andre Renaud (1): Expose the OMAP Z-Order property through DRM Rob Clark (1): staging: drm/omap: add rotation properties drivers/staging/omapdrm/omap_crtc.c | 10 +++ drivers/staging/omapdrm/omap_dmm_tiler.c | 47 +++++++++++-- drivers/staging/omapdrm/omap_dmm_tiler.h | 17 ++++- drivers/staging/omapdrm/omap_drv.c | 17 +++++ drivers/staging/omapdrm/omap_drv.h | 33 ++++++++- drivers/staging/omapdrm/omap_fb.c | 99 ++++++++++++++++++++++---- drivers/staging/omapdrm/omap_gem.c | 43 +++++++++++- drivers/staging/omapdrm/omap_plane.c | 111 ++++++++++++++++++++++++------ 8 files changed, 331 insertions(+), 46 deletions(-) -- 1.7.9.5

2 4

[Bug 29572] New: Radeon card reports wrong temperature when switched off
by bugzilla-daemon＠bugzilla.kernel.org 16 Aug '12

16 Aug '12

https://bugzilla.kernel.org/show_bug.cgi?id=29572 Summary: Radeon card reports wrong temperature when switched off Product: Drivers Version: 2.5 Kernel Version: 2.6.38-rc5 Platform: All OS/Version: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) AssignedTo: drivers_video-dri(a)kernel-bugs.osdl.org ReportedBy: mail(a)3v1n0.net CC: mail(a)3v1n0.net Regression: Yes In previous versions of the kernel (I've tested the 2.6.37 version) when the I switched off the radeon card using vga_switcheroo libsensors was correctly reporting that the radeon temperature was 0° (or invalid). This doesn't happen any more using the latest kernel, in fact (after the commit 20d391d72519527d2266a0166490118b40ff998d, I figure) when my radeon card has been switched off (or after a suspend/resume cycle) sensors indicates: radeon-pci-0100 Adapter: PCI adapter temp1: +2147355.6°C This is obiouvsly impossible. -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug. ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb -- _______________________________________________ Dri-devel mailing list Dri-devel(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel

1 13

[Bug 29372] New: KMS - radeon (Uhhuh. NMI received for unknown reason)
by bugzilla-daemon＠bugzilla.kernel.org 16 Aug '12

16 Aug '12

https://bugzilla.kernel.org/show_bug.cgi?id=29372 Summary: KMS - radeon (Uhhuh. NMI received for unknown reason) Product: Drivers Version: 2.5 Kernel Version: 2.6.37.x Platform: All OS/Version: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) AssignedTo: drivers_video-dri(a)kernel-bugs.osdl.org ReportedBy: tomasi(a)cli.di.unipi.it CC: alexdeucher(a)gmail.com Regression: No I noticed that when I run: xset dpms force standby or echo "low" > /sys/class/drm/card0/device/power_profile for my ATI Radeon Mobile X1400 (I think r5xx) I receive this advise from kernel: --- Uhhuh. NMI received for unknown reason a1 on CPU 0. You have some hardware problem, likely on the PCI bus. Dazed and confused, but trying to continue --- or something like. With latest commit on master branch of xf86-video-ati: http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/ my PC go on freeze after some stanby. Now I'm using the xf86-video-ati at latest commit at 2011-02-15 16:24:23 (4d7e1498f7d9eb50e2eddabca193fc27bde24f0e) Best regards, Emanuele -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug. ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb -- _______________________________________________ Dri-devel mailing list Dri-devel(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel

1 3

[PATCH] drm: Check for invalid cursor flags
by Jakob Bornecrantz 16 Aug '12

16 Aug '12

Signed-off-by: Jakob Bornecrantz <jakob(a)vmware.com> --- drivers/gpu/drm/drm_crtc.c | 2 +- include/drm/drm_mode.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 08a7aa7..6fbfc24 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1981,7 +1981,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev, if (!drm_core_check_feature(dev, DRIVER_MODESET)) return -EINVAL; - if (!req->flags) + if (!req->flags || (~DRM_MODE_CURSOR_FLAGS & req->flags)) return -EINVAL; mutex_lock(&dev->mode_config.mutex); diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 5581980..3d6301b 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -359,8 +359,9 @@ struct drm_mode_mode_cmd { struct drm_mode_modeinfo mode; }; -#define DRM_MODE_CURSOR_BO (1<<0) -#define DRM_MODE_CURSOR_MOVE (1<<1) +#define DRM_MODE_CURSOR_BO 0x01 +#define DRM_MODE_CURSOR_MOVE 0x02 +#define DRM_MODE_CURSOR_FLAGS 0x03 /* * depending on the value in flags different members are used. -- 1.7.9.5

1 0

[PATCH 1/3] drm/i915: implement dma buf begin_cpu_access
by Dave Airlie 16 Aug '12

16 Aug '12

From: Dave Airlie <airlied(a)redhat.com> In order for udl vmap to work properly, we need to push the object into the CPU domain before we start copying the data to the USB device. question: what is direction here in terms of read/write to the device. This along with the udl change avoids userspace explicit mapping to be used. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index cf6bdec..ee51c63 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -147,6 +147,22 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct * return -EINVAL; } +static int i915_gem_begin_cpu_access(struct dma_buf *dma_buf, size_t start, size_t length, enum dma_data_direction direction) +{ + struct drm_i915_gem_object *obj = dma_buf->priv; + struct drm_device *dev = obj->base.dev; + int ret; + bool write = (direction == DMA_BIDIRECTIONAL || direction == DMA_TO_DEVICE); + + ret = i915_mutex_lock_interruptible(dev); + if (ret) + return ret; + + ret = i915_gem_object_set_to_cpu_domain(obj, write); + mutex_unlock(&dev->struct_mutex); + return ret; +} + static const struct dma_buf_ops i915_dmabuf_ops = { .map_dma_buf = i915_gem_map_dma_buf, .unmap_dma_buf = i915_gem_unmap_dma_buf, @@ -158,6 +174,7 @@ static const struct dma_buf_ops i915_dmabuf_ops = { .mmap = i915_gem_dmabuf_mmap, .vmap = i915_gem_dmabuf_vmap, .vunmap = i915_gem_dmabuf_vunmap, + .begin_cpu_access = i915_gem_begin_cpu_access, }; struct dma_buf *i915_gem_prime_export(struct drm_device *dev, -- 1.7.10.2

2 5

[PATCH v3 1/3] Rename i2f() to int2float(), and make it global so one copy can be removed.
by Steven Fuerst 16 Aug '12

16 Aug '12

Remove the copy of i2f() in r600_blit_kms.c We rename the function to something longer now that it is a global symbol. This reduces the likelyhood of unintended clashes later. This might be a candidate for inclusion inside general drm infrastructure. However, at the moment only the radeon driver uses it. Signed-off-by: Steven Fuerst <svfuerst(a)gmail.com> --- drivers/gpu/drm/radeon/r600_blit.c | 66 ++++++++++++++-------------- drivers/gpu/drm/radeon/r600_blit_kms.c | 52 +++------------------- drivers/gpu/drm/radeon/r600_blit_shaders.h | 1 + 3 files changed, 40 insertions(+), 79 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c index 3c031a4..ee1b815 100644 --- a/drivers/gpu/drm/radeon/r600_blit.c +++ b/drivers/gpu/drm/radeon/r600_blit.c @@ -489,7 +489,7 @@ set_default_state(drm_radeon_private_t *dev_priv) ADVANCE_RING(); } -static uint32_t i2f(uint32_t input) +uint32_t int2float(uint32_t input) { u32 result, i, exponent, fraction; @@ -632,20 +632,20 @@ r600_blit_copy(struct drm_device *dev, vb = r600_nomm_get_vb_ptr(dev); } - vb[0] = i2f(dst_x); + vb[0] = int2float(dst_x); vb[1] = 0; - vb[2] = i2f(src_x); + vb[2] = int2float(src_x); vb[3] = 0; - vb[4] = i2f(dst_x); - vb[5] = i2f(h); - vb[6] = i2f(src_x); - vb[7] = i2f(h); + vb[4] = int2float(dst_x); + vb[5] = int2float(h); + vb[6] = int2float(src_x); + vb[7] = int2float(h); - vb[8] = i2f(dst_x + cur_size); - vb[9] = i2f(h); - vb[10] = i2f(src_x + cur_size); - vb[11] = i2f(h); + vb[8] = int2float(dst_x + cur_size); + vb[9] = int2float(h); + vb[10] = int2float(src_x + cur_size); + vb[11] = int2float(h); /* src */ set_tex_resource(dev_priv, FMT_8, @@ -721,20 +721,20 @@ r600_blit_copy(struct drm_device *dev, vb = r600_nomm_get_vb_ptr(dev); } - vb[0] = i2f(dst_x / 4); + vb[0] = int2float(dst_x / 4); vb[1] = 0; - vb[2] = i2f(src_x / 4); + vb[2] = int2float(src_x / 4); vb[3] = 0; - vb[4] = i2f(dst_x / 4); - vb[5] = i2f(h); - vb[6] = i2f(src_x / 4); - vb[7] = i2f(h); + vb[4] = int2float(dst_x / 4); + vb[5] = int2float(h); + vb[6] = int2float(src_x / 4); + vb[7] = int2float(h); - vb[8] = i2f((dst_x + cur_size) / 4); - vb[9] = i2f(h); - vb[10] = i2f((src_x + cur_size) / 4); - vb[11] = i2f(h); + vb[8] = int2float((dst_x + cur_size) / 4); + vb[9] = int2float(h); + vb[10] = int2float((src_x + cur_size) / 4); + vb[11] = int2float(h); /* src */ set_tex_resource(dev_priv, FMT_8_8_8_8, @@ -804,20 +804,20 @@ r600_blit_swap(struct drm_device *dev, dx2 = dx + w; dy2 = dy + h; - vb[0] = i2f(dx); - vb[1] = i2f(dy); - vb[2] = i2f(sx); - vb[3] = i2f(sy); + vb[0] = int2float(dx); + vb[1] = int2float(dy); + vb[2] = int2float(sx); + vb[3] = int2float(sy); - vb[4] = i2f(dx); - vb[5] = i2f(dy2); - vb[6] = i2f(sx); - vb[7] = i2f(sy2); + vb[4] = int2float(dx); + vb[5] = int2float(dy2); + vb[6] = int2float(sx); + vb[7] = int2float(sy2); - vb[8] = i2f(dx2); - vb[9] = i2f(dy2); - vb[10] = i2f(sx2); - vb[11] = i2f(sy2); + vb[8] = int2float(dx2); + vb[9] = int2float(dy2); + vb[10] = int2float(sx2); + vb[11] = int2float(sy2); switch(cpp) { case 4: diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index 2bef854..1c7ed3a 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c @@ -455,46 +455,6 @@ set_default_state(struct radeon_device *rdev) radeon_ring_write(ring, sq_stack_resource_mgmt_2); } -#define I2F_MAX_BITS 15 -#define I2F_MAX_INPUT ((1 << I2F_MAX_BITS) - 1) -#define I2F_SHIFT (24 - I2F_MAX_BITS) - -/* - * Converts unsigned integer into 32-bit IEEE floating point representation. - * Conversion is not universal and only works for the range from 0 - * to 2^I2F_MAX_BITS-1. Currently we only use it with inputs between - * 0 and 16384 (inclusive), so I2F_MAX_BITS=15 is enough. If necessary, - * I2F_MAX_BITS can be increased, but that will add to the loop iterations - * and slow us down. Conversion is done by shifting the input and counting - * down until the first 1 reaches bit position 23. The resulting counter - * and the shifted input are, respectively, the exponent and the fraction. - * The sign is always zero. - */ -static uint32_t i2f(uint32_t input) -{ - u32 result, i, exponent, fraction; - - WARN_ON_ONCE(input > I2F_MAX_INPUT); - - if ((input & I2F_MAX_INPUT) == 0) - result = 0; - else { - exponent = 126 + I2F_MAX_BITS; - fraction = (input & I2F_MAX_INPUT) << I2F_SHIFT; - - for (i = 0; i < I2F_MAX_BITS; i++) { - if (fraction & 0x800000) - break; - else { - fraction = fraction << 1; - exponent = exponent - 1; - } - } - result = exponent << 23 | (fraction & 0x7fffff); - } - return result; -} - int r600_blit_init(struct radeon_device *rdev) { u32 obj_size; @@ -766,14 +726,14 @@ void r600_kms_blit_copy(struct radeon_device *rdev, vb_cpu_addr[3] = 0; vb_cpu_addr[4] = 0; - vb_cpu_addr[5] = i2f(h); + vb_cpu_addr[5] = int2float(h); vb_cpu_addr[6] = 0; - vb_cpu_addr[7] = i2f(h); + vb_cpu_addr[7] = int2float(h); - vb_cpu_addr[8] = i2f(w); - vb_cpu_addr[9] = i2f(h); - vb_cpu_addr[10] = i2f(w); - vb_cpu_addr[11] = i2f(h); + vb_cpu_addr[8] = int2float(w); + vb_cpu_addr[9] = int2float(h); + vb_cpu_addr[10] = int2float(w); + vb_cpu_addr[11] = int2float(h); rdev->r600_blit.primitives.set_tex_resource(rdev, FMT_8_8_8_8, w, h, w, src_gpu_addr, size_in_bytes); diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.h b/drivers/gpu/drm/radeon/r600_blit_shaders.h index f437d36..e17c2cb 100644 --- a/drivers/gpu/drm/radeon/r600_blit_shaders.h +++ b/drivers/gpu/drm/radeon/r600_blit_shaders.h @@ -35,4 +35,5 @@ extern const u32 r6xx_default_state[]; extern const u32 r6xx_ps_size, r6xx_vs_size; extern const u32 r6xx_default_size, r7xx_default_size; +uint32_t int2float(uint32_t x); #endif -- 1.7.10.4

2 3

← Newer
1
...
61
62
63
64
65
66
67
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2012