dri-devel June 2013

dri-devel@lists.freedesktop.org

132 participants
727 discussions

[RFC 0/6] SimpleDRM Driver (was: dvbe driver)
by David Herrmann 01 Jul '13

01 Jul '13

Hi This is my second revision of the dvbe driver. I renamed it to SimpleDRM to show the resemblence with the recently introduced simplefb.c fbdev driver. The driver is supposed to be the most basic DRM driver similar to efifb.c, vesafb.c, offb.c, simplefb.c, ... It provides a single virtual CRTC+encoder+connector and allows user-space to create one dumb-buffer at a time and attach it. The setup changed slightly. It no longer uses shadow buffers but instead maps the framebuffer directly into userspace. Furthermore, a new infrastructure is used to unload firmware drivers during real hardware drivers probe cycles. Only nouveau was changed to use it, yet. I still have an odd problem when unloading DRM drivers (not just SimpleDRM) with an fbdev fallback. If I call printk() directly after unregister_framebufer(), I get a NULL-deref somewhere in the VT layer (most times hide_cursor()). I haven't figured out exactly where that happens, but I am also very reluctant to spend more time debugging the VT layer. Anyhow, comments welcome. If someone wants to test it, you probably need to add a line to ./include/linux/platform_data/simplefb.h and add the modeline of your VESA/EFI framebuffer. Cheers David David Herrmann (6): fbdev: simplefb: add init through platform_data x86: provide platform-devices for boot-framebuffers drm: add SimpleDRM driver drm: simpledrm: add fbdev fallback support drm: add helpers to kick out firmware drivers drm: nouveau: kick out firmware drivers during probe MAINTAINERS | 8 + arch/x86/Kconfig | 18 ++ arch/x86/kernel/Makefile | 1 + arch/x86/kernel/sysfb.c | 157 ++++++++++++ drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_pci.c | 1 + drivers/gpu/drm/drm_platform.c | 1 + drivers/gpu/drm/drm_stub.c | 107 ++++++++ drivers/gpu/drm/drm_usb.c | 1 + drivers/gpu/drm/nouveau/nouveau_drm.c | 29 ++- drivers/gpu/drm/simpledrm/Kconfig | 29 +++ drivers/gpu/drm/simpledrm/Makefile | 9 + drivers/gpu/drm/simpledrm/simpledrm.h | 114 +++++++++ drivers/gpu/drm/simpledrm/simpledrm_drv.c | 231 ++++++++++++++++++ drivers/gpu/drm/simpledrm/simpledrm_fbdev.c | 180 ++++++++++++++ drivers/gpu/drm/simpledrm/simpledrm_main.c | 366 ++++++++++++++++++++++++++++ drivers/gpu/drm/simpledrm/simpledrm_mem.c | 254 +++++++++++++++++++ drivers/video/Kconfig | 5 +- drivers/video/simplefb.c | 45 +++- include/drm/drmP.h | 26 ++ include/linux/platform_data/simplefb.h | 40 +++ 22 files changed, 1604 insertions(+), 21 deletions(-) create mode 100644 arch/x86/kernel/sysfb.c create mode 100644 drivers/gpu/drm/simpledrm/Kconfig create mode 100644 drivers/gpu/drm/simpledrm/Makefile create mode 100644 drivers/gpu/drm/simpledrm/simpledrm.h create mode 100644 drivers/gpu/drm/simpledrm/simpledrm_drv.c create mode 100644 drivers/gpu/drm/simpledrm/simpledrm_fbdev.c create mode 100644 drivers/gpu/drm/simpledrm/simpledrm_main.c create mode 100644 drivers/gpu/drm/simpledrm/simpledrm_mem.c create mode 100644 include/linux/platform_data/simplefb.h -- 1.8.3.1

3 19

[Bug 63520] New: r300g regression (RV380): Strange rendering of light sources in Penumbra (bisected)
by bugzilla-daemon＠freedesktop.org 01 Jul '13

01 Jul '13

https://bugs.freedesktop.org/show_bug.cgi?id=63520 Priority: medium Bug ID: 63520 Assignee: dri-devel(a)lists.freedesktop.org Summary: r300g regression (RV380): Strange rendering of light sources in Penumbra (bisected) Severity: normal Classification: Unclassified OS: Linux (All) Reporter: pj_beers(a)hotmail.com Hardware: x86 (IA32) Status: NEW Version: 9.0 Component: Drivers/Gallium/r300 Product: Mesa Created attachment 77936 --> https://bugs.freedesktop.org/attachment.cgi?id=77936&action=edit Bad rendering screen 1 Since mesa-9.0, light is rendered incorrectly in the Penumbra games (Overture, Black Plague, Requiem). I find it hard to describe so I've included two good and two bad screenshots from two scenes to illustrate the problem. For, fixing this bug would mean rendering of light sources as in the "good" screenshots. I've bisected (between mesa-8.0 and mesa-9.0) and the first bad commit is 134a0a5ff88851c971fb95863317f640b5b9fa3a , r300/compiler: Use the smart scheduler for r300 cards. I then checked out current master and reverting this commit fixes the problem in master. I compiled mesa with the following options: --with-dri-drivers="radeon,swrast" --with-gallium-drivers="r300,swrast" --enable-gallium-llvm --enable-texture-float --enable-gallium-g3dvl --enable-glx-tls --enable-motif --enable-xvmc My system is Slackware 14.0 with kernel 3.7.6, libdrm-2.4.42 and xf86-video-ati-7.1.0. -- You are receiving this mail because: You are the assignee for the bug.

1 26

[PATCH 00/24] R-Car DU DRM support for R8A7790
by Laurent Pinchart 01 Jul '13

01 Jul '13

Hello, Here's a set of patches that adds support for the DU found in the R8A7790 SoC. Compared to the R8A7779 DU, the R8A7790 has a third CRTC, internal LVDS encoders and different output routing options. These patches are targetted at v3.12 so there's no rush (but please don't take that as an excuse to skip reviewing them :-)). Laurent Pinchart (24): drm/rcar-du: Add missing alpha plane register definitions drm/rcar-du: Use devm_ioremap_resource() drm/rcar-du: Add platform module device table drm/rcar-du: Don't ignore rcar_du_crtc_create() return value drm/rcar-du: Support per-CRTC clock and IRQ drm/rcar-du: Fix buffer pitch alignment drm/rcar-du: Clarify comment regarding plane Y source coordinate drm/rcar-du: Split LVDS encoder and connector drm/rcar-du: Split VGA encoder and connector drm/rcar-du: Merge LVDS and VGA encoder code drm/rcar-du: Rename platform data fields to match what they describe drm/rcar-du: Create rcar_du_planes structure drm/rcar-du: Rename rcar_du_plane_(init|register) to rcar_du_planes_* drm/rcar-du: Introduce CRTCs groups drm/rcar-du: Use dynamic number of CRTCs instead of CRTCs array size drm/rcar-du: Remove register definitions for the second channel drm/rcar-du: Move output routing configuration to group drm/rcar-du: Add support for the R8A7790 DU drm/rcar-du: Fix buffer pitch alignment for R8A7790 DU drm/rcar-du: Add support for multiple groups drm/rcar-du: Add support for DEFR8 register drm/rcar-du: Rework output routing support drm/rcar-du: Configure RGB output routing to DPAD0 drm/rcar-du: Add internal LVDS encoder support drivers/gpu/drm/rcar-du/Kconfig | 7 + drivers/gpu/drm/rcar-du/Makefile | 10 +- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 255 ++++++++++++++++-------------- drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 13 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 169 ++++++++------------ drivers/gpu/drm/rcar-du/rcar_du_drv.h | 61 +++++-- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 202 +++++++++++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 49 ++++++ drivers/gpu/drm/rcar-du/rcar_du_group.c | 187 ++++++++++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_group.h | 50 ++++++ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 135 +++++++++------- drivers/gpu/drm/rcar-du/rcar_du_kms.h | 32 +--- drivers/gpu/drm/rcar-du/rcar_du_lvds.c | 216 ------------------------- drivers/gpu/drm/rcar-du/rcar_du_lvds.h | 24 --- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 130 +++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h | 25 +++ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 194 +++++++++++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 46 ++++++ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 170 ++++++++++---------- drivers/gpu/drm/rcar-du/rcar_du_plane.h | 26 ++- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 94 +++++++++-- drivers/gpu/drm/rcar-du/rcar_du_vga.c | 149 ----------------- drivers/gpu/drm/rcar-du/rcar_du_vga.h | 24 --- drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 96 +++++++++++ drivers/gpu/drm/rcar-du/rcar_du_vgacon.h | 23 +++ drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 69 ++++++++ include/linux/platform_data/rcar-du.h | 34 +++- 27 files changed, 1639 insertions(+), 851 deletions(-) create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_encoder.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_encoder.h create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_group.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_group.h delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvds.c delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvds.h create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vga.c delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vga.h create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vgacon.h create mode 100644 drivers/gpu/drm/rcar-du/rcar_lvds_regs.h -- Regards, Laurent Pinchart

3 26

[Bug 66337] New: evergreen_compute.c:559:26: error: 'kernel' undeclared (first use in this function) shader->active_kernel = kernel;
by bugzilla-daemon＠freedesktop.org 01 Jul '13

01 Jul '13

https://bugs.freedesktop.org/show_bug.cgi?id=66337 Priority: medium Bug ID: 66337 Keywords: regression CC: tstellar(a)gmail.com Assignee: dri-devel(a)lists.freedesktop.org Summary: evergreen_compute.c:559:26: error: 'kernel' undeclared (first use in this function) shader->active_kernel = kernel; Severity: blocker Classification: Unclassified OS: Linux (All) Reporter: vlee(a)freedesktop.org Hardware: x86-64 (AMD64) Status: NEW Version: git Component: Drivers/Gallium/r600 Product: Mesa mesa: bee49cb0ecbacb9fbc9dddc5e560874adacc518e (master) $ make [...] CC evergreen_compute.lo evergreen_compute.c: In function 'evergreen_launch_grid': evergreen_compute.c:559:2: error: 'shader' undeclared (first use in this function) shader->active_kernel = kernel; ^ evergreen_compute.c:559:2: note: each undeclared identifier is reported only once for each function it appears in evergreen_compute.c:559:26: error: 'kernel' undeclared (first use in this function) shader->active_kernel = kernel; ^ gmake[3]: *** [evergreen_compute.lo] Error 1 2840bec56f79347b95dec5458b20d4a46d1aa445 is the first bad commit commit 2840bec56f79347b95dec5458b20d4a46d1aa445 Author: Tom Stellard <thomas.stellard(a)amd.com> Date: Wed Jun 12 14:38:59 2013 -0700 r600g/compute: Accept LDS size from the LLVM backend And allocate the correct amount before dispatching the kernel. Tested-by: Aaron Watry <awatry(a)gmail.com> :040000 040000 ba0cd9cb41e0e221dd98beb00d24839f6ff41ac8 de853158383dd5f5349af59$ bisect run success -- You are receiving this mail because: You are the assignee for the bug.

1 1

drm-next status
by Dave Airlie 30 Jun '13

30 Jun '13

Okay drm-next is pretty big, possibly the biggest ever. Outstanding things I know about, and will merge, if they arrive soon: exynos -next nouveau -next Big things I've merged: new rcar driver intel next radeon next tegra next shmob next core/mutexes ttm -> reservation conversion tilcdc patches acked by Rob mtrr reworking prime + gem patches from samsung Laurent's documentation updates various mgag200 patches Otherwise I'm sure I've missed some changes, please let me know of anything you think has fallen down the cracks asap. Slow down people :-P Dave.

4 3

[RFC 1/21] Add VIA DRM driver
by James Simmons 30 Jun '13

30 Jun '13

commit 1fcf23d361375645d586756d126b436796ba4fba Author: James Simmons <jsimmons(a)infradead.org> Date: Sat Jun 8 09:31:57 2013 -0400 via: New KMS ioctls and hardware to support. Add new VIA pci ids to support newer hardware. Cleanup userspace api structs to remove kernel types and add the new KMS ioctls we will be supporting. Signed-Off-by: James Simmons <jsimmons(a)infradead.org> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c129162..5a33334 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1370,8 +1370,11 @@ #define PCI_DEVICE_ID_VIA_VT3324 0x0324 #define PCI_DEVICE_ID_VIA_VT3336 0x0336 #define PCI_DEVICE_ID_VIA_VT3351 0x0351 +#define PCI_DEVICE_ID_VIA_VT3353 0x0353 #define PCI_DEVICE_ID_VIA_VT3364 0x0364 #define PCI_DEVICE_ID_VIA_8371_0 0x0391 +#define PCI_DEVICE_ID_VIA_VT3409 0x0409 +#define PCI_DEVICE_ID_VIA_VT3410 0x0410 #define PCI_DEVICE_ID_VIA_6415 0x0415 #define PCI_DEVICE_ID_VIA_8501_0 0x0501 #define PCI_DEVICE_ID_VIA_82C561 0x0561 @@ -1385,6 +1388,7 @@ #define PCI_DEVICE_ID_VIA_8605_0 0x0605 #define PCI_DEVICE_ID_VIA_82C686 0x0686 #define PCI_DEVICE_ID_VIA_82C691_0 0x0691 +#define PCI_DEVICE_ID_VIA_VT1122 0x1122 #define PCI_DEVICE_ID_VIA_82C576_1 0x1571 #define PCI_DEVICE_ID_VIA_82C586_2 0x3038 #define PCI_DEVICE_ID_VIA_82C586_3 0x3040 @@ -1399,16 +1403,20 @@ #define PCI_DEVICE_ID_VIA_8653_0 0x3101 #define PCI_DEVICE_ID_VIA_8622 0x3102 #define PCI_DEVICE_ID_VIA_8235_USB_2 0x3104 +#define PCI_DEVICE_ID_VIA_K8M800 0x3108 #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 #define PCI_DEVICE_ID_VIA_8361 0x3112 #define PCI_DEVICE_ID_VIA_XM266 0x3116 +#define PCI_DEVICE_ID_VIA_PM800 0x3118 #define PCI_DEVICE_ID_VIA_612X 0x3119 +#define PCI_DEVICE_ID_VIA_CLE266 0x3122 #define PCI_DEVICE_ID_VIA_862X_0 0x3123 #define PCI_DEVICE_ID_VIA_8753_0 0x3128 #define PCI_DEVICE_ID_VIA_8233A 0x3147 #define PCI_DEVICE_ID_VIA_8703_51_0 0x3148 #define PCI_DEVICE_ID_VIA_8237_SATA 0x3149 #define PCI_DEVICE_ID_VIA_XN266 0x3156 +#define PCI_DEVICE_ID_VIA_VT3157 0x3157 #define PCI_DEVICE_ID_VIA_6410 0x3164 #define PCI_DEVICE_ID_VIA_8754C_0 0x3168 #define PCI_DEVICE_ID_VIA_8235 0x3177 @@ -1416,12 +1424,20 @@ #define PCI_DEVICE_ID_VIA_8377_0 0x3189 #define PCI_DEVICE_ID_VIA_8378_0 0x3205 #define PCI_DEVICE_ID_VIA_8783_0 0x3208 +#define PCI_DEVICE_ID_VIA_CN750 0x3225 #define PCI_DEVICE_ID_VIA_8237 0x3227 +#define PCI_DEVICE_ID_VIA_K8M890 0x3230 #define PCI_DEVICE_ID_VIA_8251 0x3287 #define PCI_DEVICE_ID_VIA_8261 0x3402 #define PCI_DEVICE_ID_VIA_8237A 0x3337 +#define PCI_DEVICE_ID_VIA_VT3343 0x3343 +#define PCI_DEVICE_ID_VIA_CN700 0x3344 +#define PCI_DEVICE_ID_VIA_P4M900 0x3371 #define PCI_DEVICE_ID_VIA_8237S 0x3372 +#define PCI_DEVICE_ID_VIA_VX875 0x5122 #define PCI_DEVICE_ID_VIA_SATA_EIDE 0x5324 +#define PCI_DEVICE_ID_VIA_KM400 0x7205 +#define PCI_DEVICE_ID_VIA_VX900 0x7122 #define PCI_DEVICE_ID_VIA_8231 0x8231 #define PCI_DEVICE_ID_VIA_8231_4 0x8235 #define PCI_DEVICE_ID_VIA_8365_1 0x8305 @@ -1429,7 +1445,7 @@ #define PCI_DEVICE_ID_VIA_CX700_IDE 0x0581 #define PCI_DEVICE_ID_VIA_VX800 0x8353 #define PCI_DEVICE_ID_VIA_VX855 0x8409 -#define PCI_DEVICE_ID_VIA_VX900 0x8410 +#define PCI_DEVICE_ID_VIA_8410 0x8410 #define PCI_DEVICE_ID_VIA_8371_1 0x8391 #define PCI_DEVICE_ID_VIA_82C598_1 0x8598 #define PCI_DEVICE_ID_VIA_838X_1 0xB188 diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h index 8b0533c..73ccb10 100644 --- a/include/uapi/drm/via_drm.h +++ b/include/uapi/drm/via_drm.h @@ -16,7 +16,7 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. @@ -33,14 +33,10 @@ #ifndef _VIA_DEFINES_ #define _VIA_DEFINES_ -#ifndef __KERNEL__ -#include "via_drmclient.h" -#endif - #define VIA_NR_SAREA_CLIPRECTS 8 -#define VIA_NR_XVMC_PORTS 10 -#define VIA_NR_XVMC_LOCKS 5 -#define VIA_MAX_CACHELINE_SIZE 64 +#define VIA_NR_XVMC_PORTS 10 +#define VIA_NR_XVMC_LOCKS 5 +#define VIA_MAX_CACHELINE_SIZE 64 #define XVMCLOCKPTR(saPriv,lockNo) \ ((volatile struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \ (VIA_MAX_CACHELINE_SIZE - 1)) & \ @@ -64,21 +60,28 @@ /* VIA specific ioctls */ #define DRM_VIA_ALLOCMEM 0x00 -#define DRM_VIA_FREEMEM 0x01 +#define DRM_VIA_FREEMEM 0x01 #define DRM_VIA_AGP_INIT 0x02 -#define DRM_VIA_FB_INIT 0x03 +#define DRM_VIA_FB_INIT 0x03 #define DRM_VIA_MAP_INIT 0x04 -#define DRM_VIA_DEC_FUTEX 0x05 -#define NOT_USED +#define DRM_VIA_DEC_FUTEX 0x05 +#define DRM_VIA_OLD_GEM_CREATE 0x06 #define DRM_VIA_DMA_INIT 0x07 #define DRM_VIA_CMDBUFFER 0x08 -#define DRM_VIA_FLUSH 0x09 -#define DRM_VIA_PCICMD 0x0a +#define DRM_VIA_FLUSH 0x09 +#define DRM_VIA_PCICMD 0x0a #define DRM_VIA_CMDBUF_SIZE 0x0b #define NOT_USED -#define DRM_VIA_WAIT_IRQ 0x0d -#define DRM_VIA_DMA_BLIT 0x0e -#define DRM_VIA_BLIT_SYNC 0x0f +#define DRM_VIA_WAIT_IRQ 0x0d +#define DRM_VIA_DMA_BLIT 0x0e +#define DRM_VIA_BLIT_SYNC 0x0f + +/* KMS ioctls */ +#define DRM_VIA_GETPARAM 0x10 +#define DRM_VIA_SETPARAM 0x11 +#define DRM_VIA_GEM_CREATE 0x12 +#define DRM_VIA_GEM_WAIT 0x13 +#define DRM_VIA_GEM_STATE 0x14 #define DRM_IOCTL_VIA_ALLOCMEM DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_ALLOCMEM, drm_via_mem_t) #define DRM_IOCTL_VIA_FREEMEM DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_FREEMEM, drm_via_mem_t) @@ -86,6 +89,7 @@ #define DRM_IOCTL_VIA_FB_INIT DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_FB_INIT, drm_via_fb_t) #define DRM_IOCTL_VIA_MAP_INIT DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_MAP_INIT, drm_via_init_t) #define DRM_IOCTL_VIA_DEC_FUTEX DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_DEC_FUTEX, drm_via_futex_t) +#define DRM_IOCTL_VIA_OLD_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_OLD_GEM_CREATE, struct drm_via_gem_create) #define DRM_IOCTL_VIA_DMA_INIT DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_DMA_INIT, drm_via_dma_init_t) #define DRM_IOCTL_VIA_CMDBUFFER DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_CMDBUFFER, drm_via_cmdbuffer_t) #define DRM_IOCTL_VIA_FLUSH DRM_IO( DRM_COMMAND_BASE + DRM_VIA_FLUSH) @@ -96,6 +100,13 @@ #define DRM_IOCTL_VIA_DMA_BLIT DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_DMA_BLIT, drm_via_dmablit_t) #define DRM_IOCTL_VIA_BLIT_SYNC DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_BLIT_SYNC, drm_via_blitsync_t) +/* KMS ioctls */ +#define DRM_IOCTL_VIA_GETPARAM DRM_IOR(DRM_COMMAND_BASE + DRM_VIA_GETPARAM, struct drm_via_param) +#define DRM_IOCTL_VIA_SETPARAM DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_SETPARAM, struct drm_via_param) +#define DRM_IOCTL_VIA_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_GEM_CREATE, struct drm_via_gem_create) +#define DRM_IOCTL_VIA_GEM_WAIT DRM_IOW(DRM_COMMAND_BASE + DRM_VIA_GEM_WAIT, struct drm_via_gem_wait) +#define DRM_IOCTL_VIA_GEM_STATE DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_GEM_STATE, struct drm_via_gem_create) + /* Indices into buf.Setup where various bits of state are mirrored per * context and per buffer. These can be fired at the card as a unit, * or in a piecewise fashion as required. @@ -109,6 +120,7 @@ #define VIA_BACK 0x2 #define VIA_DEPTH 0x4 #define VIA_STENCIL 0x8 + #define VIA_MEM_VIDEO 0 /* matches drm constant */ #define VIA_MEM_AGP 1 /* matches drm constant */ #define VIA_MEM_SYSTEM 2 @@ -116,19 +128,19 @@ #define VIA_MEM_UNKNOWN 4 typedef struct { - __u32 offset; - __u32 size; + uint32_t offset; + uint32_t size; } drm_via_agp_t; typedef struct { - __u32 offset; - __u32 size; + uint32_t offset; + uint32_t size; } drm_via_fb_t; typedef struct { - __u32 context; - __u32 type; - __u32 size; + uint32_t context; + uint32_t type; + uint32_t size; unsigned long index; unsigned long offset; } drm_via_mem_t; @@ -150,9 +162,9 @@ typedef struct _drm_via_futex { VIA_FUTEX_WAIT = 0x00, VIA_FUTEX_WAKE = 0X01 } func; - __u32 ms; - __u32 lock; - __u32 val; + uint32_t ms; + uint32_t lock; + uint32_t val; } drm_via_futex_t; typedef struct _drm_via_dma_init { @@ -213,7 +225,7 @@ typedef struct _drm_via_cmdbuf_size { VIA_CMDBUF_LAG = 0x02 } func; int wait; - __u32 size; + uint32_t size; } drm_via_cmdbuf_size_t; typedef enum { @@ -238,8 +250,8 @@ enum drm_via_irqs { struct drm_via_wait_irq_request { unsigned irq; via_irq_seq_type_t type; - __u32 sequence; - __u32 signal; + uint32_t sequence; + uint32_t signal; }; typedef union drm_via_irqwait { @@ -248,7 +260,7 @@ typedef union drm_via_irqwait { } drm_via_irqwait_t; typedef struct drm_via_blitsync { - __u32 sync_handle; + uint32_t sync_handle; unsigned engine; } drm_via_blitsync_t; @@ -259,23 +271,89 @@ typedef struct drm_via_blitsync { */ typedef struct drm_via_dmablit { - __u32 num_lines; - __u32 line_length; + uint32_t num_lines; + uint32_t line_length; - __u32 fb_addr; - __u32 fb_stride; + uint32_t fb_addr; + uint32_t fb_stride; unsigned char *mem_addr; - __u32 mem_stride; + uint32_t mem_stride; - __u32 flags; + int bounce_buffer; int to_fb; drm_via_blitsync_t sync; } drm_via_dmablit_t; -struct via_file_private { - struct list_head obj_list; +/* Ioctl to query kernel params: + */ +#define VIA_PARAM_CHIPSET_ID 0 +#define VIA_PARAM_REVISION_ID 1 + +struct drm_via_param { + uint64_t param; + uint64_t value; +}; + +struct drm_via_gem_create { + /** + * Requested size for the object. + * + * The (page-aligned) allocated size for the object will be returned. + */ + uint64_t size; + + /* + * Place the memory at the proper byte alignment. + */ + uint32_t alignment; + + /** + * Format of data i.e tile pitch, for linear it is zero + */ + uint32_t pitch; + + /** + * Give hints where to allocate this object. + */ + uint32_t domains; + + /** + * chmod values applied to a buffer. + */ + uint32_t mode_t; + + /** + * Offset to start of memory region. + */ + uint64_t offset; + + /** + * Returned handle need to mmap the buffer. + */ + uint64_t map_handle; + + /** + * Returned handle for the object. + * + * Object handles are nonzero. + */ + uint32_t handle; + + /** + * Padding for future expansion. + */ + uint32_t pad1; + uint64_t pad2; + uint64_t pad3; + uint64_t pad4; +}; + +struct drm_via_gem_wait { + /* the buffer object handle */ + uint32_t handle; + uint32_t no_wait; }; #endif /* _VIA_DRM_H_ */

2 2

[drm] WARNING: at kernel/workqueue.c:1432 __queue_delayed_work()
by Fengguang Wu 30 Jun '13

30 Jun '13

Greetings, I got the below warning and the first bad commit is commit be37835619fce22d3f46c5a591bbf0bbcb2288e4 Author: Daniel Vetter <daniel.vetter(a)ffwll.ch> Date: Thu Jun 6 00:17:25 2013 +0200 drm: kms_helper: don't lose hotplug event There's a race window (small for hpd, 10s large for polled outputs) where userspace could sneak in with an unrelated connnector probe ioctl call and eat the hotplug event (since neither the hpd nor the poll code see a state change). To avoid this, check whether the connector state changes in all other ->detect calls (in the current helper code that's only probe_single) and if that's the case, fire off a hotplug event. Note that we can't directly call the hotplug event handler, since that expects that no locks are held (due to reentrancy with the fb code to update the kms console). Also, this requires that drivers using the probe_single helper function set up the poll work. All current drivers do that already, and with the reworked hpd handling there'll be no downside to unconditionally setting up the poll work any more. Reviewed-by: Chris Wilson <chris(a)chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Signed-off-by: Dave Airlie <airlied(a)redhat.com> [ 3.829957] [TTM] Initializing pool allocator [ 3.830706] ------------[ cut here ]------------ [ 3.831240] WARNING: at /c/kernel-tests/src/linux/kernel/workqueue.c:1432 __queue_delayed_work+0x81/0x247() [ 3.832303] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.0-rc7-wl-01596-gb53e037 #1 [ 3.833158] 00000000 00000000 85429d24 798531bf 85429d3c 7906c42f 790831cf 00000201 [ 3.834185] 00000001 7ea3ec14 85429d4c 7906c4d7 00000009 00000000 85429d70 790831cf [ 3.835827] 8542b770 7ea3ec34 00000020 00000001 00000246 00000000 00000020 85429d90 [ 3.836829] Call Trace: [ 3.837115] [<798531bf>] dump_stack+0x16/0x18 [ 3.837597] [<7906c42f>] warn_slowpath_common+0x48/0x5f [ 3.838154] [<790831cf>] ? __queue_delayed_work+0x81/0x247 [ 3.838740] [<7906c4d7>] warn_slowpath_null+0x14/0x18 [ 3.839278] [<790831cf>] __queue_delayed_work+0x81/0x247 [ 3.839849] [<79084358>] queue_delayed_work_on+0x42/0x59 [ 3.840437] [<792d944c>] schedule_delayed_work+0x16/0x18 [ 3.840453] [<792da72b>] drm_helper_probe_single_connector_modes+0xf5/0x2be [ 3.840453] [<792d7821>] drm_fb_helper_probe_connector_modes+0x3a/0x4e [ 3.840453] [<792d8fdc>] drm_fb_helper_initial_config+0x14d/0x3ae [ 3.840453] [<79110996>] ? __kmalloc_node+0x6a/0xd6 [ 3.840453] [<792d9641>] ? drm_helper_disable_unused_functions+0xc3/0xdc [ 3.840453] [<7934cd7c>] cirrus_fbdev_init+0x7c/0x8d [ 3.840453] [<7934c623>] cirrus_modeset_init+0x145/0x186 [ 3.840453] [<7934b925>] cirrus_driver_load+0x88/0xce [ 3.840453] [<792e4321>] drm_get_pci_dev+0x136/0x214 [ 3.840453] [<7934c724>] cirrus_pci_probe+0x85/0x91 [ 3.840453] [<791fbcfa>] pci_device_probe+0x5c/0x94 [ 3.840453] [<793e4586>] driver_probe_device+0x97/0x1b1 [ 3.840453] [<793e4724>] __driver_attach+0x53/0x6f [ 3.840453] [<793e31d4>] bus_for_each_dev+0x3e/0x69 [ 3.840453] [<793e44a6>] driver_attach+0x19/0x1b [ 3.840453] [<793e46d1>] ? __device_attach+0x31/0x31 [ 3.840453] [<793e382e>] bus_add_driver+0xb4/0x1bd [ 3.840453] [<793e4ef3>] driver_register+0x8c/0xe9 [ 3.840453] [<791fbb2d>] __pci_register_driver+0x4a/0x4d [ 3.840453] [<792e4470>] drm_pci_init+0x71/0xc9 [ 3.840453] [<79df7f16>] ? ftrace_define_fields_intel_gpu_freq_change+0x1c/0x1c [ 3.840453] [<79df7f31>] cirrus_init+0x1b/0x25 [ 3.840453] [<79dcaa28>] do_one_initcall+0x6b/0x119 [ 3.840453] [<79dcabc7>] kernel_init_freeable+0xf1/0x171 [ 3.840453] [<7984161e>] kernel_init+0xd/0xb9 [ 3.840453] [<79860cf7>] ret_from_kernel_thread+0x1b/0x28 [ 3.840453] [<79841611>] ? rest_init+0xb1/0xb1 [ 3.840453] ---[ end trace 4a7136f8b8f4ca4a ]--- git bisect start b53e037930134d11fa6307162b41fb19b6c43643 9e895ace5d82df8929b16f58e9f515f6d54ab82d -- git bisect bad 3ef6fb0acbf846ec267c86b4b7841ca7cc1fd636 # 09:34 0- Merge remote-tracking branch 'vireshk/cpufreq-fix-notification' into devel-snb-i386-201306280352 git bisect bad e26e8115c78ca2f7e104ad085343e37c544033ae # 09:51 0- alx builtin HACK git bisect good 40ccc72b84a848e6fcbdb38fe716f0ac6939609e # 12:39 20+ drm/i915: release cursor when crtc is destroyed git bisect good d5cfba1b9ce6f1f4add8f3c67fde5243e5549bbd # 12:45 20+ drm/ast: do not attempt to acquire a reservation while in an interrupt handler git bisect bad 395ba7ac59ac1aa4bb07c21e3211c2af04719f0a # 12:50 0- drm/ttm: get rid of ttm_bo_is_reserved git bisect good 1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82 # 12:55 20+ Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux git bisect bad 1fb4883ad4ae880d2ef100f00624ec7660018186 # 12:59 0- reservation: cross-device reservation support, v4 git bisect good f3cf139efa4bc0fe4f032af6ca3e49e38a5d9ae5 # 13:04 20+ mutex: Add more w/w tests to test EDEADLK path handling git bisect good 76ceded51787729bea28ab8cf986b23ffd8e3533 # 13:08 20+ Merge branch 'core/mutexes' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into drm-next git bisect bad 3839e7f1cf063d9bae9406e8d9a0c64645ea21b2 # 13:13 0- Merge branch 'for-airlied-next' into for-airlied git bisect bad be37835619fce22d3f46c5a591bbf0bbcb2288e4 # 13:17 0- drm: kms_helper: don't lose hotplug event git bisect good 76ceded51787729bea28ab8cf986b23ffd8e3533 # 15:50 60+ Merge branch 'core/mutexes' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into drm-next git bisect bad b53e037930134d11fa6307162b41fb19b6c43643 # 15:50 0- Merge remote-tracking branch 'xlnx/zynq/clk' into devel-snb-i386-201306280352 git bisect good c13737291d08634b4e7e59862ea3ae2a7dbfb36d # 15:56 60+ Revert "drm: kms_helper: don't lose hotplug event" git bisect good 98b6ed0f2bf4abfb759206aa70690636372bdee7 # 15:58 60+ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net git bisect bad 4ad125f98662b3226daaea1a277a5936006c10d7 # 16:03 0- Add linux-next specific files for 20130628 Thanks, Fengguang

1 0

[Bug 60251] New: Resume after suspend-to-RAM crashes in kernel module radeon
by bugzilla-daemon＠bugzilla.kernel.org 30 Jun '13

30 Jun '13

https://bugzilla.kernel.org/show_bug.cgi?id=60251 Summary: Resume after suspend-to-RAM crashes in kernel module radeon Product: Drivers Version: 2.5 Kernel Version: 3.8.8, 3.9.8, drm-next from 2013-06-29 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: birger.retterstol.olaisen(a)gmail.com Regression: No I have an older HP Compaq dc5750 Microtower with an ATI Radeon XPRESS 1150 chipset and an integrated ATI Radeon X300 graphic card (RS482/RS485 [Radeon Xpress 1100/1150]). For more detailed info on the system see http://h10010.www1.hp.com/wwpc/us/en/sm/WF06a/12454-12454-64287-321860-3328… . This is an x86_64 machine. When doing suspend-to-RAM with pm-suspend, the system suspends nicely (screen and fan turns off, and the power led starts pulsing) but when I try to resume the system, it stops after just a couple of seconds, and I have to do a hard reboot to start the system. /var/log/pm-suspend.log contains no lines from the resume, only from the suspend. The distribution I'm using is Linux Mint 15, based on Ubuntu 13.04, and I've used DebuggingKernelSuspend from the Ubuntu Wiki (https://wiki.ubuntu.com/DebuggingKernelSuspend) to try to debug the problem. After recompiling the kernel with CONFIG_PM_TRACE, /sys/power/pm_trace pointed to radeon kernel module as the source of the problem. As suggested on the Ubuntu Wiki page, I also tested two mainline kernels (drm-next from 2013-06-29 and v3.9.8) from http://kernel.ubuntu.com/~kernel-ppa/, and they cashed on resume the same way as the Ubuntu 3.8 kernel. I attach the pm-suspend.log. With regards, Birger Retterstøl Olaisen -- 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 1

Re: [Intel-gfx] [PATCH 04/66] drm: Optionally create mm blocks from top-to-bottom
by Daniel Vetter 30 Jun '13

30 Jun '13

On Thu, Jun 27, 2013 at 04:30:05PM -0700, Ben Widawsky wrote: > From: Chris Wilson <chris(a)chris-wilson.co.uk> > > Clients like i915 needs to segregate cache domains within the GTT which > can lead to small amounts of fragmentation. By allocating the uncached > buffers from the bottom and the cacheable buffers from the top, we can > reduce the amount of wasted space and also optimize allocation of the > mappable portion of the GTT to only those buffers that require CPU > access through the GTT. > > v2 by Ben: > Update callers in i915_gem_object_bind_to_gtt() > Turn search flags and allocation flags into separate enums > Make checkpatch happy where logical/easy > > Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> > Signed-off-by: Ben Widawsky <ben(a)bwidawsk.net> Since this is a core drm patch it must be cc'ed to dri-devel (and acked by Dave) before I can merge it. Can you please resend? -Daniel > --- > drivers/gpu/drm/drm_mm.c | 122 ++++++++++++++++++--------------- > drivers/gpu/drm/i915/i915_gem.c | 4 +- > include/drm/drm_mm.h | 148 ++++++++++++++++++++++++---------------- > 3 files changed, 161 insertions(+), 113 deletions(-) > > diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c > index 07cf99c..7095328 100644 > --- a/drivers/gpu/drm/drm_mm.c > +++ b/drivers/gpu/drm/drm_mm.c > @@ -49,7 +49,7 @@ > > #define MM_UNUSED_TARGET 4 > > -static struct drm_mm_node *drm_mm_kmalloc(struct drm_mm *mm, int atomic) > +static struct drm_mm_node *drm_mm_kmalloc(struct drm_mm *mm, bool atomic) > { > struct drm_mm_node *child; > > @@ -105,7 +105,8 @@ EXPORT_SYMBOL(drm_mm_pre_get); > static void drm_mm_insert_helper(struct drm_mm_node *hole_node, > struct drm_mm_node *node, > unsigned long size, unsigned alignment, > - unsigned long color) > + unsigned long color, > + enum drm_mm_allocator_flags flags) > { > struct drm_mm *mm = hole_node->mm; > unsigned long hole_start = drm_mm_hole_node_start(hole_node); > @@ -118,12 +119,22 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node, > if (mm->color_adjust) > mm->color_adjust(hole_node, color, &adj_start, &adj_end); > > + if (flags & DRM_MM_CREATE_TOP) > + adj_start = adj_end - size; > + > if (alignment) { > unsigned tmp = adj_start % alignment; > - if (tmp) > - adj_start += alignment - tmp; > + if (tmp) { > + if (flags & DRM_MM_CREATE_TOP) > + adj_start -= tmp; > + else > + adj_start += alignment - tmp; > + } > } > > + BUG_ON(adj_start < hole_start); > + BUG_ON(adj_end > hole_end); > + > if (adj_start == hole_start) { > hole_node->hole_follows = 0; > list_del(&hole_node->hole_stack); > @@ -150,7 +161,7 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node, > struct drm_mm_node *drm_mm_create_block(struct drm_mm *mm, > unsigned long start, > unsigned long size, > - bool atomic) > + enum drm_mm_allocator_flags flags) > { > struct drm_mm_node *hole, *node; > unsigned long end = start + size; > @@ -161,7 +172,7 @@ struct drm_mm_node *drm_mm_create_block(struct drm_mm *mm, > if (hole_start > start || hole_end < end) > continue; > > - node = drm_mm_kmalloc(mm, atomic); > + node = drm_mm_kmalloc(mm, flags & DRM_MM_CREATE_ATOMIC); > if (unlikely(node == NULL)) > return NULL; > > @@ -196,15 +207,15 @@ struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *hole_node, > unsigned long size, > unsigned alignment, > unsigned long color, > - int atomic) > + enum drm_mm_allocator_flags flags) > { > struct drm_mm_node *node; > > - node = drm_mm_kmalloc(hole_node->mm, atomic); > + node = drm_mm_kmalloc(hole_node->mm, flags & DRM_MM_CREATE_ATOMIC); > if (unlikely(node == NULL)) > return NULL; > > - drm_mm_insert_helper(hole_node, node, size, alignment, color); > + drm_mm_insert_helper(hole_node, node, size, alignment, color, flags); > > return node; > } > @@ -217,32 +228,28 @@ EXPORT_SYMBOL(drm_mm_get_block_generic); > */ > int drm_mm_insert_node_generic(struct drm_mm *mm, struct drm_mm_node *node, > unsigned long size, unsigned alignment, > - unsigned long color) > + unsigned long color, > + enum drm_mm_allocator_flags aflags, > + enum drm_mm_search_flags sflags) > { > struct drm_mm_node *hole_node; > > hole_node = drm_mm_search_free_generic(mm, size, alignment, > - color, 0); > + color, sflags); > if (!hole_node) > return -ENOSPC; > > - drm_mm_insert_helper(hole_node, node, size, alignment, color); > + drm_mm_insert_helper(hole_node, node, size, alignment, color, aflags); > return 0; > } > EXPORT_SYMBOL(drm_mm_insert_node_generic); > > -int drm_mm_insert_node(struct drm_mm *mm, struct drm_mm_node *node, > - unsigned long size, unsigned alignment) > -{ > - return drm_mm_insert_node_generic(mm, node, size, alignment, 0); > -} > -EXPORT_SYMBOL(drm_mm_insert_node); > - > static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, > struct drm_mm_node *node, > unsigned long size, unsigned alignment, > unsigned long color, > - unsigned long start, unsigned long end) > + unsigned long start, unsigned long end, > + enum drm_mm_search_flags flags) > { > struct drm_mm *mm = hole_node->mm; > unsigned long hole_start = drm_mm_hole_node_start(hole_node); > @@ -257,13 +264,20 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, > if (adj_end > end) > adj_end = end; > > + if (flags & DRM_MM_CREATE_TOP) > + adj_start = adj_end - size; > + > if (mm->color_adjust) > mm->color_adjust(hole_node, color, &adj_start, &adj_end); > > if (alignment) { > unsigned tmp = adj_start % alignment; > - if (tmp) > - adj_start += alignment - tmp; > + if (tmp) { > + if (flags & DRM_MM_CREATE_TOP) > + adj_start -= tmp; > + else > + adj_start += alignment - tmp; > + } > } > > if (adj_start == hole_start) { > @@ -280,6 +294,8 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, > INIT_LIST_HEAD(&node->hole_stack); > list_add(&node->node_list, &hole_node->node_list); > > + BUG_ON(node->start < start); > + BUG_ON(node->start < adj_start); > BUG_ON(node->start + node->size > adj_end); > BUG_ON(node->start + node->size > end); > > @@ -290,22 +306,23 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, > } > } > > -struct drm_mm_node *drm_mm_get_block_range_generic(struct drm_mm_node *hole_node, > - unsigned long size, > - unsigned alignment, > - unsigned long color, > - unsigned long start, > - unsigned long end, > - int atomic) > +struct drm_mm_node * > +drm_mm_get_block_range_generic(struct drm_mm_node *hole_node, > + unsigned long size, > + unsigned alignment, > + unsigned long color, > + unsigned long start, > + unsigned long end, > + enum drm_mm_allocator_flags flags) > { > struct drm_mm_node *node; > > - node = drm_mm_kmalloc(hole_node->mm, atomic); > + node = drm_mm_kmalloc(hole_node->mm, flags & DRM_MM_CREATE_ATOMIC); > if (unlikely(node == NULL)) > return NULL; > > drm_mm_insert_helper_range(hole_node, node, size, alignment, color, > - start, end); > + start, end, flags); > > return node; > } > @@ -318,31 +335,25 @@ EXPORT_SYMBOL(drm_mm_get_block_range_generic); > */ > int drm_mm_insert_node_in_range_generic(struct drm_mm *mm, struct drm_mm_node *node, > unsigned long size, unsigned alignment, unsigned long color, > - unsigned long start, unsigned long end) > + unsigned long start, unsigned long end, > + enum drm_mm_allocator_flags aflags, > + enum drm_mm_search_flags sflags) > { > struct drm_mm_node *hole_node; > > hole_node = drm_mm_search_free_in_range_generic(mm, > size, alignment, color, > - start, end, 0); > + start, end, sflags); > if (!hole_node) > return -ENOSPC; > > drm_mm_insert_helper_range(hole_node, node, > size, alignment, color, > - start, end); > + start, end, aflags); > return 0; > } > EXPORT_SYMBOL(drm_mm_insert_node_in_range_generic); > > -int drm_mm_insert_node_in_range(struct drm_mm *mm, struct drm_mm_node *node, > - unsigned long size, unsigned alignment, > - unsigned long start, unsigned long end) > -{ > - return drm_mm_insert_node_in_range_generic(mm, node, size, alignment, 0, start, end); > -} > -EXPORT_SYMBOL(drm_mm_insert_node_in_range); > - > /** > * Remove a memory node from the allocator. > */ > @@ -418,7 +429,7 @@ struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm, > unsigned long size, > unsigned alignment, > unsigned long color, > - bool best_match) > + enum drm_mm_search_flags flags) > { > struct drm_mm_node *entry; > struct drm_mm_node *best; > @@ -431,7 +442,8 @@ struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm, > best = NULL; > best_size = ~0UL; > > - drm_mm_for_each_hole(entry, mm, adj_start, adj_end) { > + __drm_mm_for_each_hole(entry, mm, adj_start, adj_end, > + flags & DRM_MM_SEARCH_BELOW) { > if (mm->color_adjust) { > mm->color_adjust(entry, color, &adj_start, &adj_end); > if (adj_end <= adj_start) > @@ -441,7 +453,7 @@ struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm, > if (!check_free_hole(adj_start, adj_end, size, alignment)) > continue; > > - if (!best_match) > + if ((flags & DRM_MM_SEARCH_BEST) == 0) > return entry; > > if (entry->size < best_size) { > @@ -454,13 +466,14 @@ struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm, > } > EXPORT_SYMBOL(drm_mm_search_free_generic); > > -struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm, > - unsigned long size, > - unsigned alignment, > - unsigned long color, > - unsigned long start, > - unsigned long end, > - bool best_match) > +struct drm_mm_node * > +drm_mm_search_free_in_range_generic(const struct drm_mm *mm, > + unsigned long size, > + unsigned alignment, > + unsigned long color, > + unsigned long start, > + unsigned long end, > + enum drm_mm_search_flags flags) > { > struct drm_mm_node *entry; > struct drm_mm_node *best; > @@ -473,7 +486,8 @@ struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm, > best = NULL; > best_size = ~0UL; > > - drm_mm_for_each_hole(entry, mm, adj_start, adj_end) { > + __drm_mm_for_each_hole(entry, mm, adj_start, adj_end, > + flags & DRM_MM_SEARCH_BELOW) { > if (adj_start < start) > adj_start = start; > if (adj_end > end) > @@ -488,7 +502,7 @@ struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm, > if (!check_free_hole(adj_start, adj_end, size, alignment)) > continue; > > - if (!best_match) > + if ((flags & DRM_MM_SEARCH_BEST) == 0) > return entry; > > if (entry->size < best_size) { > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index bbc3beb..6806bb9 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -3131,7 +3131,9 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj, > search_free: > ret = drm_mm_insert_node_in_range_generic(&dev_priv->mm.gtt_space, node, > size, alignment, > - obj->cache_level, 0, gtt_max); > + obj->cache_level, 0, gtt_max, > + DRM_MM_CREATE_DEFAULT, > + DRM_MM_SEARCH_DEFAULT); > if (ret) { > ret = i915_gem_evict_something(dev, size, alignment, > obj->cache_level, > diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h > index 88591ef..8935710 100644 > --- a/include/drm/drm_mm.h > +++ b/include/drm/drm_mm.h > @@ -41,6 +41,21 @@ > #include <linux/seq_file.h> > #endif > > +enum drm_mm_allocator_flags { > + DRM_MM_CREATE_DEFAULT = 0, > + DRM_MM_CREATE_ATOMIC = 1<<0, > + DRM_MM_CREATE_TOP = 1<<1, > +}; > + > +enum drm_mm_search_flags { > + DRM_MM_SEARCH_DEFAULT = 0, > + DRM_MM_SEARCH_BEST = 1<<0, > + DRM_MM_SEARCH_BELOW = 1<<1, > +}; > + > +#define DRM_MM_BOTTOMUP DRM_MM_CREATE_DEFAULT, DRM_MM_SEARCH_DEFAULT > +#define DRM_MM_TOPDOWN DRM_MM_CREATE_TOP, DRM_MM_SEARCH_BELOW > + > struct drm_mm_node { > struct list_head node_list; > struct list_head hole_stack; > @@ -135,26 +150,37 @@ static inline unsigned long drm_mm_hole_node_end(struct drm_mm_node *hole_node) > 1 : 0; \ > entry = list_entry(entry->hole_stack.next, struct drm_mm_node, hole_stack)) > > +#define __drm_mm_for_each_hole(entry, mm, hole_start, hole_end, backwards) \ > + for (entry = list_entry((backwards) ? (mm)->hole_stack.prev : (mm)->hole_stack.next, struct drm_mm_node, hole_stack); \ > + &entry->hole_stack != &(mm)->hole_stack ? \ > + hole_start = drm_mm_hole_node_start(entry), \ > + hole_end = drm_mm_hole_node_end(entry), \ > + 1 : 0; \ > + entry = list_entry((backwards) ? entry->hole_stack.prev : entry->hole_stack.next, struct drm_mm_node, hole_stack)) > + > /* > * Basic range manager support (drm_mm.c) > */ > -extern struct drm_mm_node *drm_mm_create_block(struct drm_mm *mm, > - unsigned long start, > - unsigned long size, > - bool atomic); > -extern struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *node, > - unsigned long size, > - unsigned alignment, > - unsigned long color, > - int atomic); > -extern struct drm_mm_node *drm_mm_get_block_range_generic( > - struct drm_mm_node *node, > - unsigned long size, > - unsigned alignment, > - unsigned long color, > - unsigned long start, > - unsigned long end, > - int atomic); > +extern struct drm_mm_node * > +drm_mm_create_block(struct drm_mm *mm, > + unsigned long start, > + unsigned long size, > + enum drm_mm_allocator_flags flags); > +extern struct drm_mm_node * > +drm_mm_get_block_generic(struct drm_mm_node *node, > + unsigned long size, > + unsigned alignment, > + unsigned long color, > + enum drm_mm_allocator_flags flags); > +extern struct drm_mm_node * > +drm_mm_get_block_range_generic(struct drm_mm_node *node, > + unsigned long size, > + unsigned alignment, > + unsigned long color, > + unsigned long start, > + unsigned long end, > + enum drm_mm_allocator_flags flags); > + > static inline struct drm_mm_node *drm_mm_get_block(struct drm_mm_node *parent, > unsigned long size, > unsigned alignment) > @@ -165,7 +191,8 @@ static inline struct drm_mm_node *drm_mm_get_block_atomic(struct drm_mm_node *pa > unsigned long size, > unsigned alignment) > { > - return drm_mm_get_block_generic(parent, size, alignment, 0, 1); > + return drm_mm_get_block_generic(parent, size, alignment, 0, > + DRM_MM_CREATE_ATOMIC); > } > static inline struct drm_mm_node *drm_mm_get_block_range( > struct drm_mm_node *parent, > @@ -196,39 +223,41 @@ static inline struct drm_mm_node *drm_mm_get_block_atomic_range( > unsigned long end) > { > return drm_mm_get_block_range_generic(parent, size, alignment, 0, > - start, end, 1); > + start, end, > + DRM_MM_CREATE_ATOMIC); > } > > -extern int drm_mm_insert_node(struct drm_mm *mm, > - struct drm_mm_node *node, > - unsigned long size, > - unsigned alignment); > -extern int drm_mm_insert_node_in_range(struct drm_mm *mm, > - struct drm_mm_node *node, > - unsigned long size, > - unsigned alignment, > - unsigned long start, > - unsigned long end); > extern int drm_mm_insert_node_generic(struct drm_mm *mm, > struct drm_mm_node *node, > unsigned long size, > unsigned alignment, > - unsigned long color); > -extern int drm_mm_insert_node_in_range_generic(struct drm_mm *mm, > - struct drm_mm_node *node, > - unsigned long size, > - unsigned alignment, > - unsigned long color, > - unsigned long start, > - unsigned long end); > + unsigned long color, > + enum drm_mm_allocator_flags aflags, > + enum drm_mm_search_flags sflags); > +#define drm_mm_insert_node(mm, node, size, alignment) \ > + drm_mm_insert_node_generic(mm, node, size, alignment, 0, 0) > +extern int > +drm_mm_insert_node_in_range_generic(struct drm_mm *mm, > + struct drm_mm_node *node, > + unsigned long size, > + unsigned alignment, > + unsigned long color, > + unsigned long start, > + unsigned long end, > + enum drm_mm_allocator_flags aflags, > + enum drm_mm_search_flags sflags); > +#define drm_mm_insert_node_in_range(mm, node, size, alignment, start, end) \ > + drm_mm_insert_node_in_range_generic(mm, node, size, alignment, 0, start, end, 0) > extern void drm_mm_put_block(struct drm_mm_node *cur); > extern void drm_mm_remove_node(struct drm_mm_node *node); > extern void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new); > -extern struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm, > - unsigned long size, > - unsigned alignment, > - unsigned long color, > - bool best_match); > + > +extern struct drm_mm_node * > +drm_mm_search_free_generic(const struct drm_mm *mm, > + unsigned long size, > + unsigned alignment, > + unsigned long color, > + enum drm_mm_search_flags flags); > extern struct drm_mm_node *drm_mm_search_free_in_range_generic( > const struct drm_mm *mm, > unsigned long size, > @@ -236,13 +265,15 @@ extern struct drm_mm_node *drm_mm_search_free_in_range_generic( > unsigned long color, > unsigned long start, > unsigned long end, > - bool best_match); > -static inline struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm, > - unsigned long size, > - unsigned alignment, > - bool best_match) > + enum drm_mm_search_flags flags); > + > +static inline struct drm_mm_node * > +drm_mm_search_free(const struct drm_mm *mm, > + unsigned long size, > + unsigned alignment, > + enum drm_mm_search_flags flags) > { > - return drm_mm_search_free_generic(mm,size, alignment, 0, best_match); > + return drm_mm_search_free_generic(mm, size, alignment, 0, flags); > } > static inline struct drm_mm_node *drm_mm_search_free_in_range( > const struct drm_mm *mm, > @@ -250,18 +281,19 @@ static inline struct drm_mm_node *drm_mm_search_free_in_range( > unsigned alignment, > unsigned long start, > unsigned long end, > - bool best_match) > + enum drm_mm_search_flags flags) > { > return drm_mm_search_free_in_range_generic(mm, size, alignment, 0, > - start, end, best_match); > + start, end, flags); > } > -static inline struct drm_mm_node *drm_mm_search_free_color(const struct drm_mm *mm, > - unsigned long size, > - unsigned alignment, > - unsigned long color, > - bool best_match) > +static inline struct drm_mm_node * > +drm_mm_search_free_color(const struct drm_mm *mm, > + unsigned long size, > + unsigned alignment, > + unsigned long color, > + enum drm_mm_search_flags flags) > { > - return drm_mm_search_free_generic(mm,size, alignment, color, best_match); > + return drm_mm_search_free_generic(mm, size, alignment, color, flags); > } > static inline struct drm_mm_node *drm_mm_search_free_in_range_color( > const struct drm_mm *mm, > @@ -270,10 +302,10 @@ static inline struct drm_mm_node *drm_mm_search_free_in_range_color( > unsigned long color, > unsigned long start, > unsigned long end, > - bool best_match) > + enum drm_mm_search_flags flags) > { > return drm_mm_search_free_in_range_generic(mm, size, alignment, color, > - start, end, best_match); > + start, end, flags); > } > extern int drm_mm_init(struct drm_mm *mm, > unsigned long start, > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx(a)lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

1 1

Re: Linux 3.10-rc7
by Linus Torvalds 30 Jun '13

30 Jun '13

On Sat, Jun 29, 2013 at 2:07 PM, Sergey Meirovich <rathamahata(a)gmail.com> wrote: >> (and possibly the >> mkregtable binary) and trying again might fix it. > > Removing mkregtable has indeed the compile issue for me. Thanks! Ok, so something failed at an earlier build. That error is probably long gone, though, since the subsequent build failure ends up being just a symptom rather than the underlying cause. >> Which still leaves >> us with the question of how this happened, and a potentially fragile >> Makefile. Radeon/drm people - any ideas how that mkregtable failure happened? Linus

3 3

← Newer
1
...
48
49
50
51
52
53
54
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2013