dri-devel August 2010

dri-devel@lists.freedesktop.org

82 participants
335 discussions

[Bug 29518] New: [r300g] [regression] Depth clamping broke Regnum Online
by bugzilla-daemon＠freedesktop.org 13 Aug '10

13 Aug '10

https://bugs.freedesktop.org/show_bug.cgi?id=29518 Summary: [r300g] [regression] Depth clamping broke Regnum Online Product: Mesa Version: git Platform: Other URL: http://www.regnumonline.com.ar/ OS/Version: All Status: NEW Severity: normal Priority: medium Component: Drivers/DRI/r300 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: sa(a)whiz.se Created an attachment (id=37802) --> (https://bugs.freedesktop.org/attachment.cgi?id=37802) Screenshot of RO Lately I have noticed that the game Regnum Online have regressed, it has never worked perfectly (see bug 28847) but now it's only rendering garbage. Bisecting leads to this: ca7ead03da4481cd34933175898f4a924e588ad4 is the first bad commit commit ca7ead03da4481cd34933175898f4a924e588ad4 Author: Marek Olšák <maraeo(a)gmail.com> Date: Tue Jul 20 16:37:22 2010 +0200 r300g: implement depth clamp Depth clamping seems to be implicit if clipping is disabled. It's not perfect, but it's good enough for wine and passes the corresponding piglit tests. :040000 040000 2c23739a006e4151928169bfb4da12b323c4d2c7 bcd5168351aa7e5b75ed39bdea8e7e7eb5caf2ed M src I have confirmed the problem by reverting said commit. -- 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 1/4] drm/radeon/kms: DCE3/4 transmitter fixes
by Alex Deucher 12 Aug '10

12 Aug '10

- INIT action takes the actual connector type id, not the enum id - some evergreen cards have the ENABLE_OUTPUT/DISABLE_OUTPUT actions Signed-off-by: Alex Deucher <alexdeucher(a)gmail.com> --- drivers/gpu/drm/radeon/radeon_encoders.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 263c809..cb3c9b7 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -843,7 +843,8 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t args.v1.ucAction = action; if (action == ATOM_TRANSMITTER_ACTION_INIT) { - args.v1.usInitInfo = radeon_connector->connector_object_id; + args.v1.usInitInfo = + (radeon_connector->connector_object_id & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; } else if (action == ATOM_TRANSMITTER_ACTION_SETUP_VSEMPH) { args.v1.asMode.ucLaneSel = lane_num; args.v1.asMode.ucLaneSet = lane_set; @@ -1072,8 +1073,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) if (is_dig) { switch (mode) { case DRM_MODE_DPMS_ON: - if (!ASIC_IS_DCE4(rdev)) - atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); + atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_DP) { struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); @@ -1085,8 +1085,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) case DRM_MODE_DPMS_STANDBY: case DRM_MODE_DPMS_SUSPEND: case DRM_MODE_DPMS_OFF: - if (!ASIC_IS_DCE4(rdev)) - atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0); + atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0); if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_DP) { if (ASIC_IS_DCE4(rdev)) atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_OFF); -- 1.7.1.1

1 3

[Bug 29433] New: Mouse cursor stutter with kernel 2.6.35
by bugzilla-daemon＠freedesktop.org 12 Aug '10

12 Aug '10

https://bugs.freedesktop.org/show_bug.cgi?id=29433 Summary: Mouse cursor stutter with kernel 2.6.35 Product: DRI Version: unspecified Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: DRM/Radeon AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: mjulien.m(a)gmail.com Hi, since I upgraded to kernel 2.6.35, my mouse cursor is not fluid anymore. When I move it, it stutters sometimes (that is, it makes a small jump on the screen). According to latencytop, it seems to come from drm_mod_cursor ioctl which takes as much as 100ms when the cursor jump. I attach a screenshot of latencytop window. This issue seems to appears randomly, maybe more frequent when the cursor change (arrow to select hand etc.) but I'm not sure. I don't have this problem with 2.6.34 (nor 2.6.34.1 and 2.6.34.2 ). I'm using vanilla kernel (packaged by my distro but without any third party patch) : Linux tue-amour 2.6.35-1mdv #1 SMP Mon Aug 2 05:50:00 UTC 2010 x86_64 x86_64 x86_64 GNU/Linux Xorg 1.7.7 radeon driver 6.13.1 with KMS mesa 7.8.1 libdrm 2.4.21 radeon 4870, only one screen attached. 01:00.0 VGA compatible controller: ATI Technologies Inc RV770 [Radeon HD 4870] -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 9

[PATCH] drm/radeon/kms: don't enable MSIs on AGP boards
by Alex Deucher 12 Aug '10

12 Aug '10

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29327 Signed-off-by: Alex Deucher <alexdeucher(a)gmail.com> Cc: stable(a)kernel.org --- drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index 059bfa4..a108c7e 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -121,11 +121,12 @@ int radeon_irq_kms_init(struct radeon_device *rdev) * chips. Disable MSI on them for now. */ if ((rdev->family >= CHIP_RV380) && - (!(rdev->flags & RADEON_IS_IGP))) { + (!(rdev->flags & RADEON_IS_IGP)) && + (!(rdev->flags & RADEON_IS_AGP))) { int ret = pci_enable_msi(rdev->pdev); if (!ret) { rdev->msi_enabled = 1; - DRM_INFO("radeon: using MSI.\n"); + dev_info(rdev->dev, "radeon: using MSI.\n"); } } rdev->irq.installed = true; -- 1.7.1.1

1 0

[Bug 29444] New: OpenGL stopped working after kernel upgrade to 2.6.35
by bugzilla-daemon＠freedesktop.org 12 Aug '10

12 Aug '10

https://bugs.freedesktop.org/show_bug.cgi?id=29444 Summary: OpenGL stopped working after kernel upgrade to 2.6.35 Product: DRI Version: unspecified Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: DRM/Radeon AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: simon(a)munton.demon.co.uk After upgrading to kernel 2.6.35, I found that when using hugin, the fast OpenGL based panorama preview stopped working, and the program just froze. Same thing happens with glxgears - no gears displayed, and froze. Backtrace from glxgears: #0 0xb75606e6 in poll () from /lib/libc.so.6 #1 0xb74512eb in ?? () from /usr/lib/libxcb.so.1 #2 0xb7453955 in xcb_wait_for_reply () from /usr/lib/libxcb.so.1 #3 0xb764a078 in _XReply () from /usr/lib/libX11.so.6 #4 0xb7789cef in ?? () from /usr/lib/libGL.so.1 #5 0xb77891b8 in ?? () from /usr/lib/libGL.so.1 #6 0xb77602fd in glXSwapBuffers () from /usr/lib/libGL.so.1 #7 0x0804a548 in ?? () #8 0xb74a1b86 in __libc_start_main () from /lib/libc.so.6 #9 0x080490f1 in ?? () Backtrace from hugin: #0 0xb601d71c in poll () from /lib/libc.so.6 #1 0xb56e32eb in ?? () from /usr/lib/libxcb.so.1 #2 0xb56e5955 in xcb_wait_for_reply () from /usr/lib/libxcb.so.1 #3 0xb62a0078 in _XReply () from /usr/lib/libX11.so.6 #4 0xb63da08b in ?? () from /usr/lib/libGL.so.1 #5 0xb63d899f in ?? () from /usr/lib/libGL.so.1 #6 0xa0ca9ce7 in ?? () from /usr/lib/xorg/modules/dri/r300_dri.so #7 0xa0caa5b0 in ?? () from /usr/lib/xorg/modules/dri/r300_dri.so #8 0xa0c88b22 in ?? () from /usr/lib/xorg/modules/dri/r300_dri.so #9 0xb63d8304 in ?? () from /usr/lib/libGL.so.1 #10 0xb63b0eac in glXMakeCurrentReadSGI () from /usr/lib/libGL.so.1 #11 0xb6495367 in wxGLContext::SetCurrent(wxGLCanvas const&) const () from /usr/lib/libwx_gtk2u_gl-2.8.so.0 #12 0x0815f016 in GLViewer::SetUpContext (this=0x883ab90) at /home/simon/build/hugin-2010.0.0/src/hugin1/hugin/GLViewer.cpp:105 #13 0x0815f3e0 in GLViewer::RedrawE (this=0x883ab90, e=...) at /home/simon/build/hugin-2010.0.0/src/hugin1/hugin/GLViewer.cpp:156 Doing a bisect on the kernel showed the problem started following commit: bc35afdb182d4c48c889fe27ba7a5d7ea0c8194d drm/radeon/kms: add query for crtc hw id from crtc id to get info V2 As a test, in the X radeon dirver, I then changed drmmode_crtc_hw_id() in drmmode_display.c to ignore the value from the kernel: --- xf86-video-ati-20100804/src/drmmode_display.c.orig 2010-08-04 21:54:57.000000000 +0100 +++ xf86-video-ati-20100804/src/drmmode_display.c 2010-08-07 22:14:56.000000000 +0100 @@ -547,7 +547,7 @@ drmmode_crtc->hw_id = -1; return; } - drmmode_crtc->hw_id = tmp; + drmmode_crtc->hw_id = -1; /*tmp;*/ } static void After this change glxgears and hugin both work as before the kernel upgrade. X server 1.8.2 mesa 7.8.2 libdrm 2.4.21 radeon driver git cc0a167ff2db9b097891883ded147af1d67e4407 Sapphire X1650 pro AGP RADEON(0): Chipset: "ATI Radeon X1650" (ChipID = 0x71c6) -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 8

[PATCH] drm/radeon/kms: add back missing break in info ioctl
by Alex Deucher 12 Aug '10

12 Aug '10

This seems to have gotten lost in the hyper-z merge. Noticed by legume on IRC. Signed-off-by: Alex Deucher <alexdeucher(a)gmail.com> --- drivers/gpu/drm/radeon/radeon_kms.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index e5b7054..28d6c38 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -159,6 +159,7 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) DRM_DEBUG_KMS("tiling config is r6xx+ only!\n"); return -EINVAL; } + break; case RADEON_INFO_WANT_HYPERZ: mutex_lock(&dev->struct_mutex); if (rdev->hyperz_filp) -- 1.7.1.1

1 0

i915 kernel Oops with 2.6.35 and glxinfo (or other GL programs)
by Andreas Sundstrom 12 Aug '10

12 Aug '10

On my laptop X hangs as soon as something uses OpenGL it seems. Running for example glxinfo or glxgears causes it to freeze. I have not had any issues like this before, and 2.6.34 works ok but not 2.6.35 I have pasted the Oops here: http://codepad.org/R9Nuheug I will include it with this email too, but to avoid problems with the formatting I have provided the link above. I'm not sure what else to provide? Let me know if I can do something to test this further.. This is on a HP Compaq 6910p laptop I'm not subscribed to the list so feel free to CC me on any replies. Thanks /Andreas Oops message: Aug 9 09:51:55 asu-laptop kernel: [ 29.738192] BUG: unable to handle kernel NULL pointer dereference at (null) Aug 9 09:51:55 asu-laptop kernel: [ 29.738199] IP: [<(null)>] (null) Aug 9 09:51:55 asu-laptop kernel: [ 29.738203] PGD 128480067 PUD 12847e067 PMD 0 Aug 9 09:51:55 asu-laptop kernel: [ 29.738208] Oops: 0010 [#1] SMP Aug 9 09:51:55 asu-laptop kernel: [ 29.738211] last sysfs file: /sys/devices/virtual/backlight/acpi_video0/brightness Aug 9 09:51:55 asu-laptop kernel: [ 29.738214] CPU 0 Aug 9 09:51:55 asu-laptop kernel: [ 29.738216] Modules linked in: rfcomm l2cap twofish twofish_common serpent rmd160 af_key fus e iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi firewire_sbp2 btusb bluetooth iwlagn firewire_ohci firewire_core crc_itu_t psmouse iwlcore hp_accel lis3lv02d Aug 9 09:51:55 asu-laptop kernel: [ 29.738236] Aug 9 09:51:55 asu-laptop kernel: [ 29.738240] Pid: 4865, comm: glxinfo Not tainted 2.6.35 #1 30BE/HP Compaq 6910p (GB949ET#AK8 ) Aug 9 09:51:55 asu-laptop kernel: [ 29.738242] RIP: 0010:[<0000000000000000>] [<(null)>] (null) Aug 9 09:51:55 asu-laptop kernel: [ 29.738246] RSP: 0018:ffff8801331b7cf0 EFLAGS: 00010286 Aug 9 09:51:55 asu-laptop kernel: [ 29.738248] RAX: ffff88013be1c028 RBX: 0000000000000000 RCX: 000000000000c3ec Aug 9 09:51:55 asu-laptop kernel: [ 29.738251] RDX: 000000000000c3f0 RSI: ffff88013be1c028 RDI: ffff88013be77000 Aug 9 09:51:55 asu-laptop kernel: [ 29.738254] RBP: ffff8801331b7cf8 R08: 00000000000000d0 R09: ffff88013be77000 Aug 9 09:51:55 asu-laptop kernel: [ 29.738256] R10: ffff8801331b7cf8 R11: 0000000000000000 R12: ffff88013be77000 Aug 9 09:51:55 asu-laptop kernel: [ 29.738259] R13: ffff8801331b7dc8 R14: 0000000000000002 R15: 0000000000000000 Aug 9 09:51:55 asu-laptop kernel: [ 29.738262] FS: 00007f42d3e8c6e0(0000) GS:ffff880001e00000(0000) knlGS:0000000000000000 Aug 9 09:51:55 asu-laptop kernel: [ 29.738265] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b Aug 9 09:51:55 asu-laptop kernel: [ 29.738268] CR2: 0000000000000000 CR3: 000000012847c000 CR4: 00000000000006f0 Aug 9 09:51:55 asu-laptop kernel: [ 29.738270] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 Aug 9 09:51:55 asu-laptop kernel: [ 29.738273] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Aug 9 09:51:55 asu-laptop kernel: [ 29.738276] Process glxinfo (pid: 4865, threadinfo ffff8801331b6000, task ffff88012c51b3a0) Aug 9 09:51:55 asu-laptop kernel: [ 29.738278] Stack: Aug 9 09:51:55 asu-laptop kernel: [ 29.738280] ffffffff813058f9 ffff8801331b7d78 ffffffff812e39fe ffff880100000000 Aug 9 09:51:55 asu-laptop kernel: [ 29.738284] <0> 00000002331b7d58 ffff88013be1c000 ffff88013be77020 ffffc90004282898 Aug 9 09:51:55 asu-laptop kernel: [ 29.738289] <0> 0000000000000000 ffff88013a050da0 0000000000000000 0000000200000001 Aug 9 09:51:55 asu-laptop kernel: [ 29.738294] Call Trace: Aug 9 09:51:55 asu-laptop kernel: [ 29.738304] [<ffffffff813058f9>] ? intel_ring_advance+0xd/0xf Aug 9 09:51:55 asu-laptop kernel: [ 29.738310] [<ffffffff812e39fe>] i915_cmdbuffer+0x3a2/0x452 Aug 9 09:51:55 asu-laptop kernel: [ 29.738316] [<ffffffff812d1e90>] drm_ioctl+0x27a/0x338 Aug 9 09:51:55 asu-laptop kernel: [ 29.738319] [<ffffffff812e365c>] ? i915_cmdbuffer+0x0/0x452 Aug 9 09:51:55 asu-laptop kernel: [ 29.738324] [<ffffffff810ba72c>] ? __do_fault+0x341/0x378 Aug 9 09:51:55 asu-laptop kernel: [ 29.738328] [<ffffffff810e2728>] vfs_ioctl+0x2a/0x9e Aug 9 09:51:55 asu-laptop kernel: [ 29.738331] [<ffffffff810e2c8d>] do_vfs_ioctl+0x476/0x4aa Aug 9 09:51:55 asu-laptop kernel: [ 29.738335] [<ffffffff810e2d16>] sys_ioctl+0x55/0x77 Aug 9 09:51:55 asu-laptop kernel: [ 29.738340] [<ffffffff81002a2b>] system_call_fastpath+0x16/0x1b Aug 9 09:51:55 asu-laptop kernel: [ 29.738342] Code: Bad RIP value. Aug 9 09:51:55 asu-laptop kernel: [ 29.738347] RIP [<(null)>] (null) Aug 9 09:51:55 asu-laptop kernel: [ 29.738349] RSP <ffff8801331b7cf0> Aug 9 09:51:55 asu-laptop kernel: [ 29.738351] CR2: 0000000000000000 Aug 9 09:51:55 asu-laptop kernel: [ 29.738354] ---[ end trace 29d634c2bb639d07 ]---

1 2

[PATCH] DRM: Replace kmalloc/memset combos with kzalloc
by Davidlohr Bueso 12 Aug '10

12 Aug '10

Currently most, if not all, memory allocation in drm_bufs.c is followed by initializing the memory with 0. Replace the use of kmalloc+memset with kzalloc. Signed-off-by: Davidlohr Bueso <dave(a)gnu.org> --- drivers/gpu/drm/drm_bufs.c | 33 +++++++++++---------------------- 1 files changed, 11 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index a5c9ce9..3e257a5 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -328,14 +328,13 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, return -EINVAL; } - list = kmalloc(sizeof(*list), GFP_KERNEL); + list = kzalloc(sizeof(*list), GFP_KERNEL); if (!list) { if (map->type == _DRM_REGISTERS) iounmap(map->handle); kfree(map); return -EINVAL; } - memset(list, 0, sizeof(*list)); list->map = map; mutex_lock(&dev->struct_mutex); @@ -678,13 +677,12 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) return -EINVAL; } - entry->buflist = kmalloc(count * sizeof(*entry->buflist), GFP_KERNEL); + entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL); if (!entry->buflist) { mutex_unlock(&dev->struct_mutex); atomic_dec(&dev->buf_alloc); return -ENOMEM; } - memset(entry->buflist, 0, count * sizeof(*entry->buflist)); entry->buf_size = size; entry->page_order = page_order; @@ -708,7 +706,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) buf->file_priv = NULL; buf->dev_priv_size = dev->driver->dev_priv_size; - buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL); + buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL); if (!buf->dev_private) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; @@ -717,7 +715,6 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) atomic_dec(&dev->buf_alloc); return -ENOMEM; } - memset(buf->dev_private, 0, buf->dev_priv_size); DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address); @@ -832,22 +829,20 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) return -EINVAL; } - entry->buflist = kmalloc(count * sizeof(*entry->buflist), GFP_KERNEL); + entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL); if (!entry->buflist) { mutex_unlock(&dev->struct_mutex); atomic_dec(&dev->buf_alloc); return -ENOMEM; } - memset(entry->buflist, 0, count * sizeof(*entry->buflist)); - entry->seglist = kmalloc(count * sizeof(*entry->seglist), GFP_KERNEL); + entry->seglist = kzalloc(count * sizeof(*entry->seglist), GFP_KERNEL); if (!entry->seglist) { kfree(entry->buflist); mutex_unlock(&dev->struct_mutex); atomic_dec(&dev->buf_alloc); return -ENOMEM; } - memset(entry->seglist, 0, count * sizeof(*entry->seglist)); /* Keep the original pagelist until we know all the allocations * have succeeded @@ -911,8 +906,8 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) buf->file_priv = NULL; buf->dev_priv_size = dev->driver->dev_priv_size; - buf->dev_private = kmalloc(buf->dev_priv_size, - GFP_KERNEL); + buf->dev_private = kzalloc(buf->dev_priv_size, + GFP_KERNEL); if (!buf->dev_private) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; @@ -923,7 +918,6 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) atomic_dec(&dev->buf_alloc); return -ENOMEM; } - memset(buf->dev_private, 0, buf->dev_priv_size); DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address); @@ -1048,14 +1042,13 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request return -EINVAL; } - entry->buflist = kmalloc(count * sizeof(*entry->buflist), + entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL); if (!entry->buflist) { mutex_unlock(&dev->struct_mutex); atomic_dec(&dev->buf_alloc); return -ENOMEM; } - memset(entry->buflist, 0, count * sizeof(*entry->buflist)); entry->buf_size = size; entry->page_order = page_order; @@ -1080,7 +1073,7 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request buf->file_priv = NULL; buf->dev_priv_size = dev->driver->dev_priv_size; - buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL); + buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL); if (!buf->dev_private) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; @@ -1090,8 +1083,6 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request return -ENOMEM; } - memset(buf->dev_private, 0, buf->dev_priv_size); - DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address); offset += alignment; @@ -1209,14 +1200,13 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request return -EINVAL; } - entry->buflist = kmalloc(count * sizeof(*entry->buflist), + entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL); if (!entry->buflist) { mutex_unlock(&dev->struct_mutex); atomic_dec(&dev->buf_alloc); return -ENOMEM; } - memset(entry->buflist, 0, count * sizeof(*entry->buflist)); entry->buf_size = size; entry->page_order = page_order; @@ -1240,7 +1230,7 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request buf->file_priv = NULL; buf->dev_priv_size = dev->driver->dev_priv_size; - buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL); + buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL); if (!buf->dev_private) { /* Set count correctly so we free the proper amount. */ entry->buf_count = count; @@ -1249,7 +1239,6 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request atomic_dec(&dev->buf_alloc); return -ENOMEM; } - memset(buf->dev_private, 0, buf->dev_priv_size); DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address); -- 1.7.0.4

3 3

[git pull] drm fixes + nouveau update
by Dave Airlie 12 Aug '10

12 Aug '10

Hi Linus, repeat request with some additional fixes, nouveau started using io-mapping and this made ppc64 build unhappy, and also make the m68k build happier by dropping unneeded vga.h from vgaarb. Two powerpc radeon kms fixes, and two radeon command checker fixes. The optimist in me is saying you just missed the previous pull req, the realist is saying I should drop the nouveau Fermi updates, but since its a staging driver I don't think it should block this pull. I can drop the edid cleanups but they looked nice and not too damaging. So summary highlights from previous: nouveau: add GTX4xx (Fermi) KMS support radeon: i2c rework to fix problems on r600/700 cards that require i2c routing support. core: fixed pci domain support that doesn't break userspace API lots of misc fixes. Dave. The following changes since commit 96576a9e1a0cdb8a43d3af5846be0948f52b4460: agp: intel-agp: do not use PCI resources before pci_enable_device() (2010-08-05 12:28:25 +1000) are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-core-next Adam Jackson (5): drm: Remove unused fields from drm_display_info drm/edid: Add detailed block walk for CEA extensions drm/edid: Add detailed block walk for VTB extensions drm/edid: Rewrite mode parse to use the generic detailed block walk drm/edid: Split mode lists out to their own header for readability Alex Deucher (7): drm/radeon/kms: r600 CS parser fixes drm/radeon/kms: unify i2c handling drm/radeon/kms: rework combios i2c handling drm/radeon/kms: add support for router objects drm/radeon/kms: add additional quirk for Acer rv620 laptop drm/radeon/kms: mark 3D power states as performance drm/radeon/kms: another r6xx/r7xx CS checker fix Ben Skeggs (11): drm/nv50: use custom i2c algo for dp auxch drm/nouveau: remove unused ttm bo list drm/nvc0: starting point for GF100 support, everything stubbed drm/nvc0: allow INIT_GPIO drm/nvc0: implement memory detection drm/nvc0: rudimentary instmem support drm/nvc0: fix evo dma object so we display something drm/nvc0: implement crtc pll setting drm/nvc0: backup bar3 channel on suspend drm/nouveau: reduce severity of some "error" messages drm/nvc0: fix typo in PRAMIN flush Benjamin Herrenschmidt (3): drm: Fix support for PCI domains drm/radeon: Fix pci_map_page() error checking drm/radeon: Add probing of clocks from device-tree Chris Wilson (4): drm: Propagate error code from fb_create() drm: Only set DPMS once on the CRTC not after every encoder. drm: Use ENOENT consistently for the error return for an unmatched handle. drm: Remove count_lock for calling lastclose() after 58474713 (v2) Dan Carpenter (2): drm/nouveau: unwind on load errors radeon: handle errors in radeon_hwmon_init() Dave Airlie (4): Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-core-next drm/radeon: drop old and broken mesa warning vgaarb: drop vga.h include io-mapping: move asm include inside the config option Davidlohr Bueso (1): DRM: Replace kmalloc/memset combos with kzalloc Dr. David Alan Gilbert (1): drm/radeon/kms: add missing copy from user Francisco Jerez (13): drm/nouveau: Fix AGP reset when AGP FW is already enabled on init. drm/nouveau: Don't pass misaligned offsets to io_mapping_map_atomic_wc(). drm/nouveau: Fix the INIT_CONFIGURE_PREINIT BIOS opcode. drm/nouveau: Ack the context switch interrupt before switching contexts. drm/nv10: Fix up switching of NV10TCL_DMA_VTXBUF. drm/nv17-nv4x: Attempt to init some external TMDS transmitters. drm/nouveau: No need to set slave TV encoder configs explicitly. drm/nv30: Workaround dual TMDS brain damage. drm/nouveau: Init dcb->or on cards that have no usable DCB table. drm/i2c/ch7006: Don't use POWER_LEVEL_FULL_POWER_OFF on early chip versions. drm/nv04: Fix up SGRAM density detection. drm/nv30: Fix PFB init for nv31. drm/nouveau: Fix DCB TMDS config parsing. James Simmons (1): drm: expand gamma_set Marcin Kościelnicki (2): drm/nouveau: implement init table op 0x57, INIT_LTIME drm/nouveau: implement init table opcodex 0x5e and 0x9a Marek Olšák (2): drm/radeon: add a way to revoke hyper-z access drm/radeon/kms: allow FG_ALPHA_VALUE on r5xx drivers/gpu/drm/ati_pcigart.c | 2 +- drivers/gpu/drm/drm_bufs.c | 33 +- drivers/gpu/drm/drm_crtc.c | 6 +- drivers/gpu/drm/drm_crtc_helper.c | 10 +- drivers/gpu/drm/drm_edid.c | 841 +++++++++------------------ drivers/gpu/drm/drm_edid_modes.h | 380 ++++++++++++ drivers/gpu/drm/drm_fops.c | 16 +- drivers/gpu/drm/drm_gem.c | 2 +- drivers/gpu/drm/drm_ioctl.c | 1 + drivers/gpu/drm/i2c/ch7006_drv.c | 1 + drivers/gpu/drm/i2c/ch7006_mode.c | 5 +- drivers/gpu/drm/i2c/ch7006_priv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 26 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 15 +- drivers/gpu/drm/i915/intel_fb.c | 4 +- drivers/gpu/drm/nouveau/Makefile | 8 +- drivers/gpu/drm/nouveau/nouveau_bios.c | 194 ++++++- drivers/gpu/drm/nouveau/nouveau_bios.h | 1 + drivers/gpu/drm/nouveau/nouveau_bo.c | 6 - drivers/gpu/drm/nouveau/nouveau_connector.c | 19 +- drivers/gpu/drm/nouveau/nouveau_display.c | 6 +- drivers/gpu/drm/nouveau/nouveau_dp.c | 87 ++-- drivers/gpu/drm/nouveau/nouveau_drv.h | 45 ++- drivers/gpu/drm/nouveau/nouveau_encoder.h | 6 + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 + drivers/gpu/drm/nouveau/nouveau_gem.c | 8 +- drivers/gpu/drm/nouveau/nouveau_hw.c | 11 +- drivers/gpu/drm/nouveau/nouveau_i2c.c | 41 +- drivers/gpu/drm/nouveau/nouveau_i2c.h | 8 +- drivers/gpu/drm/nouveau/nouveau_irq.c | 6 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 15 +- drivers/gpu/drm/nouveau/nouveau_reg.h | 18 +- drivers/gpu/drm/nouveau/nouveau_state.c | 91 +++- drivers/gpu/drm/nouveau/nv04_crtc.c | 15 +- drivers/gpu/drm/nouveau/nv04_dfp.c | 73 +++ drivers/gpu/drm/nouveau/nv04_tv.c | 10 +- drivers/gpu/drm/nouveau/nv10_graph.c | 175 ++++-- drivers/gpu/drm/nouveau/nv30_fb.c | 24 +- drivers/gpu/drm/nouveau/nv50_crtc.c | 34 +- drivers/gpu/drm/nouveau/nv50_display.c | 5 +- drivers/gpu/drm/nouveau/nvc0_fb.c | 38 ++ drivers/gpu/drm/nouveau/nvc0_fifo.c | 96 +++ drivers/gpu/drm/nouveau/nvc0_graph.c | 75 +++ drivers/gpu/drm/nouveau/nvc0_instmem.c | 232 ++++++++ drivers/gpu/drm/radeon/r600_cp.c | 2 +- drivers/gpu/drm/radeon/r600_cs.c | 33 +- drivers/gpu/drm/radeon/radeon.h | 2 + drivers/gpu/drm/radeon/radeon_atombios.c | 180 +++++- drivers/gpu/drm/radeon/radeon_clocks.c | 81 +++ drivers/gpu/drm/radeon/radeon_combios.c | 388 ++++++------- drivers/gpu/drm/radeon/radeon_connectors.c | 45 +- drivers/gpu/drm/radeon/radeon_cs.c | 2 +- drivers/gpu/drm/radeon/radeon_cursor.c | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 3 +- drivers/gpu/drm/radeon/radeon_display.c | 34 +- drivers/gpu/drm/radeon/radeon_gem.c | 12 +- drivers/gpu/drm/radeon/radeon_i2c.c | 82 +++ drivers/gpu/drm/radeon/radeon_kms.c | 28 +- drivers/gpu/drm/radeon/radeon_mode.h | 24 + drivers/gpu/drm/radeon/radeon_pm.c | 24 +- drivers/gpu/drm/radeon/reg_srcs/rv515 | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- include/drm/drmP.h | 22 +- include/drm/drm_core.h | 2 +- include/drm/drm_crtc.h | 37 +-- include/drm/drm_edid.h | 6 + include/linux/io-mapping.h | 3 +- include/linux/vgaarb.h | 1 - 70 files changed, 2518 insertions(+), 1202 deletions(-) create mode 100644 drivers/gpu/drm/drm_edid_modes.h create mode 100644 drivers/gpu/drm/nouveau/nvc0_fb.c create mode 100644 drivers/gpu/drm/nouveau/nvc0_fifo.c create mode 100644 drivers/gpu/drm/nouveau/nvc0_graph.c create mode 100644 drivers/gpu/drm/nouveau/nvc0_instmem.c

1 0

asm/vga.h (was: Re: drm: Add support for platform devices to register as DRM devices)
by Geert Uytterhoeven 11 Aug '10

11 Aug '10

On Fri, Aug 6, 2010 at 01:59, Linux Kernel Mailing List <linux-kernel(a)vger.kernel.org> wrote: > Gitweb: http://git.kernel.org/linus/dcdb167402cbdca1d021bdfa5f63995ee0a79317 > Commit: dcdb167402cbdca1d021bdfa5f63995ee0a79317 > Parent: 01d73a6967f12fe6c4bbde1834a9fe662264a2eb > Author: Jordan Crouse <jcrouse(a)codeaurora.org> > AuthorDate: Thu May 27 13:40:25 2010 -0600 > Committer: Dave Airlie <airlied(a)redhat.com> > CommitDate: Tue Jun 1 10:07:39 2010 +1000 > > drm: Add support for platform devices to register as DRM devices > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -6,7 +6,7 @@ > # > menuconfig DRM > tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" > - depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU > + depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU Since this change, I can enable DRM on m68k, but it fails with: | In file included from drivers/gpu/drm/drm_irq.c:42: | include/linux/vgaarb.h:34:21: error: asm/vga.h: No such file or directory Now, do we really need <asm/vga.h>? It seems I can make it build and boot using: --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h @@ -31,7 +31,9 @@ #ifndef LINUX_VGA_H #define LINUX_VGA_H +#ifdef CONFIG_VGA_ARB #include <asm/vga.h> +#endif /* Legacy VGA regions */ #define VGA_RSRC_NONE 0x00 Alternatively, I can provide an empty <asm/vga.h> (cfr. frv, mn10300, parisc, sh) or a simple (probably incorrect) one that includes <asm-generic/vga.h> (cfr. microblaze). But so far we never needed <asm/vga.h> on m68k. For the record, this "problem" has been visible in linux-next (see m68k/allmodconfig) since July 9... Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

3 2

← Newer
1
...
21
22
23
24
25
26
27
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2010