* [git pull] drm fixes + agp + one fb patch
@ 2010-06-30 1:03 Dave Airlie
2010-06-30 4:42 ` Rafał Miłecki
` (2 more replies)
0 siblings, 3 replies; 19+ messages in thread
From: Dave Airlie @ 2010-06-30 1:03 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, dri-devel
Hi Linus,
one fb layer fix in a flag I introduced,
the rest are drm fixes:
radeon fixes: the larger ones in the command stream checker for older cards,
which was causing a lot of userspace apps to fail. Also some powerpc server fixes.
along with some updates to the evergreen command stream checker introduced in -rc1.
agp: fix issue with warning on memory allocation + fallback to vmalloc.
ttm: fix regression introduced in -rc1 in memory allocation paths.
The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02:
Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700)
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
Adam Jackson (1):
drm/fb: Fix video= mode computation
Alex Deucher (7):
drm/radeon/kms: fix bandwidth calculation when sideport is present
drm/radeon/kms: fix DP after DPMS cycle
drm/radeon/kms: fix typo in evergreen_gpu_init
drm/radeon/kms: disable frac fb dividers for rs6xx
drm/radeon/kms: avoid oops on mac r4xx cards
drm/radeon/kms: fix typos in evergreen command checker
drm/radeon/kms: add some missing regs to evergreen gpu init
Cedric Godin (1):
drm/radeon/kms: fix dpms state on resume
Dave Airlie (7):
drm/radeon: fix dual-head on rv250
radeon/kms: fix powerpc/rn50 untiled behaviour.
agp: drop vmalloc flag.
agp: add no warn since we have a fallback to vmalloc paths
drm/radeon: add fake RN50 table for powerpc
drm/radeon/kms: don't read attempt to read bios from VRAM on unposted GPU.
fb: fix colliding defines for fb flags.
Jerome Glisse (2):
drm/ttm: non pooled page allocation should have GFP_USER set
drm/radeon/kms: Force HDP_NONSURF to maximum size
Matt Turner (1):
drm/radeon/kms: return ret in cursor_set failure path
Roland Scheidegger (3):
drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx
drm/radeon/r200: handle more hw tex coord types
drm/radeon/r100/r200: fix calculation of compressed cube maps
drivers/char/agp/generic.c | 6 +-
drivers/gpu/drm/drm_fb_helper.c | 19 ++++--
drivers/gpu/drm/radeon/atombios_crtc.c | 2 +-
drivers/gpu/drm/radeon/evergreen.c | 35 ++++++++--
drivers/gpu/drm/radeon/evergreen_cs.c | 4 +-
drivers/gpu/drm/radeon/evergreend.h | 3 +
drivers/gpu/drm/radeon/r100.c | 81 +++++++++++++---------
drivers/gpu/drm/radeon/r200.c | 5 ++
drivers/gpu/drm/radeon/r300.c | 5 ++
drivers/gpu/drm/radeon/r600.c | 2 +-
drivers/gpu/drm/radeon/radeon_asic.c | 7 ++
drivers/gpu/drm/radeon/radeon_bios.c | 4 +
drivers/gpu/drm/radeon/radeon_combios.c | 32 +++++++++
drivers/gpu/drm/radeon/radeon_cursor.c | 2 +-
drivers/gpu/drm/radeon/radeon_device.c | 7 ++
drivers/gpu/drm/radeon/radeon_encoders.c | 4 +-
drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 22 +++----
drivers/gpu/drm/radeon/radeon_mode.h | 1 +
drivers/gpu/drm/radeon/reg_srcs/evergreen | 10 ++--
drivers/gpu/drm/radeon/rs690.c | 6 +--
drivers/gpu/drm/radeon/rv770.c | 2 +-
drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 +-
include/linux/agp_backend.h | 1 -
include/linux/fb.h | 4 +-
24 files changed, 182 insertions(+), 84 deletions(-)
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [git pull] drm fixes + agp + one fb patch 2010-06-30 1:03 [git pull] drm fixes + agp + one fb patch Dave Airlie @ 2010-06-30 4:42 ` Rafał Miłecki 2010-06-30 6:54 ` Markus Trippelsdorf 2010-06-30 10:13 ` Rafael J. Wysocki 2 siblings, 0 replies; 19+ messages in thread From: Rafał Miłecki @ 2010-06-30 4:42 UTC (permalink / raw) To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel 2010/6/30 Dave Airlie <airlied@linux.ie>: > Hi Linus, > > one fb layer fix in a flag I introduced, > > the rest are drm fixes: > radeon fixes: the larger ones in the command stream checker for older cards, > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. > along with some updates to the evergreen command stream checker introduced in -rc1. > > agp: fix issue with warning on memory allocation + fallback to vmalloc. > ttm: fix regression introduced in -rc1 in memory allocation paths. Dave, could you queue [PATCH] drm/radeon/kms/pm: fix power state indexing on igp chips in dynpm mode for next (still .35) drm pull request? It fixes FDO bug https://bugs.freedesktop.org/show_bug.cgi?id=28745 , div by zero which actually I consider a regression since: 1) In .34 I was able to use radeon.dynpm=1 2) In .35-rc div by zero + lockup on echo dynpm > /sys/devices/.../power_method -- Rafał ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch 2010-06-30 1:03 [git pull] drm fixes + agp + one fb patch Dave Airlie 2010-06-30 4:42 ` Rafał Miłecki @ 2010-06-30 6:54 ` Markus Trippelsdorf 2010-06-30 7:31 ` [git pull] drm fixes + agp + one fb patch (bisected) Markus Trippelsdorf 2010-06-30 7:57 ` [git pull] drm fixes + agp + one fb patch Dave Airlie 2010-06-30 10:13 ` Rafael J. Wysocki 2 siblings, 2 replies; 19+ messages in thread From: Markus Trippelsdorf @ 2010-06-30 6:54 UTC (permalink / raw) To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: > > Hi Linus, > > one fb layer fix in a flag I introduced, > > the rest are drm fixes: > radeon fixes: the larger ones in the command stream checker for older cards, > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. > along with some updates to the evergreen command stream checker introduced in -rc1. > > agp: fix issue with warning on memory allocation + fallback to vmalloc. > ttm: fix regression introduced in -rc1 in memory allocation paths. > > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: > > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) > I've tested these patches and they break my setup (RS780). On reboot, the monitor goes straight to powersaving mode and no framebuffer is shown. -- Markus ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 6:54 ` Markus Trippelsdorf @ 2010-06-30 7:31 ` Markus Trippelsdorf 2010-06-30 9:22 ` Dave Airlie 2010-06-30 14:49 ` Alex Deucher 2010-06-30 7:57 ` [git pull] drm fixes + agp + one fb patch Dave Airlie 1 sibling, 2 replies; 19+ messages in thread From: Markus Trippelsdorf @ 2010-06-30 7:31 UTC (permalink / raw) To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel, alexdeucher On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: > On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: > > > > one fb layer fix in a flag I introduced, > > > > the rest are drm fixes: > > radeon fixes: the larger ones in the command stream checker for older cards, > > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. > > along with some updates to the evergreen command stream checker introduced in -rc1. > > > > agp: fix issue with warning on memory allocation + fallback to vmalloc. > > ttm: fix regression introduced in -rc1 in memory allocation paths. > > > > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: > > > > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) > > > > I've tested these patches and they break my setup (RS780). On reboot, the > monitor goes straight to powersaving mode and no framebuffer is shown. This is the result of the bisection: 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 Author: Alex Deucher <alexdeucher@gmail.com> Date: Sat Jun 12 11:50:13 2010 -0400 drm/radeon/kms: fix bandwidth calculation when sideport is present Fixes fdo bug 27529: https://bugs.freedesktop.org/show_bug.cgi?id=27529 Reported-by: steckdenis@yahoo.fr Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Cc: stable <stable@kernel.org> Signed-off-by: Dave Airlie <airlied@redhat.com> -- Markus ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 7:31 ` [git pull] drm fixes + agp + one fb patch (bisected) Markus Trippelsdorf @ 2010-06-30 9:22 ` Dave Airlie 2010-06-30 14:49 ` Alex Deucher 1 sibling, 0 replies; 19+ messages in thread From: Dave Airlie @ 2010-06-30 9:22 UTC (permalink / raw) To: Markus Trippelsdorf Cc: Dave Airlie, torvalds, linux-kernel, dri-devel, alexdeucher On Wed, Jun 30, 2010 at 5:31 PM, Markus Trippelsdorf <markus@trippelsdorf.de> wrote: > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: >> > >> > one fb layer fix in a flag I introduced, >> > >> > the rest are drm fixes: >> > radeon fixes: the larger ones in the command stream checker for older cards, >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >> > along with some updates to the evergreen command stream checker introduced in -rc1. >> > >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. >> > ttm: fix regression introduced in -rc1 in memory allocation paths. >> > >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >> > >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >> > >> >> I've tested these patches and they break my setup (RS780). On reboot, the >> monitor goes straight to powersaving mode and no framebuffer is shown. > > This is the result of the bisection: > > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 > Author: Alex Deucher <alexdeucher@gmail.com> > Date: Sat Jun 12 11:50:13 2010 -0400 > > drm/radeon/kms: fix bandwidth calculation when sideport is present > > Fixes fdo bug 27529: > https://bugs.freedesktop.org/show_bug.cgi?id=27529 > > Reported-by: steckdenis@yahoo.fr > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> > Cc: stable <stable@kernel.org> > Signed-off-by: Dave Airlie <airlied@redhat.com> > Okay Linus, hold off on pulling this, and I'll revert it in the morning when I get back to my tree and resend the pull. Maybe Alex will have time to figure out whats gone wrong overnight. Dave. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 7:31 ` [git pull] drm fixes + agp + one fb patch (bisected) Markus Trippelsdorf 2010-06-30 9:22 ` Dave Airlie @ 2010-06-30 14:49 ` Alex Deucher 2010-06-30 14:58 ` Markus Trippelsdorf 1 sibling, 1 reply; 19+ messages in thread From: Alex Deucher @ 2010-06-30 14:49 UTC (permalink / raw) To: Markus Trippelsdorf; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 3:31 AM, Markus Trippelsdorf <markus@trippelsdorf.de> wrote: > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: >> > >> > one fb layer fix in a flag I introduced, >> > >> > the rest are drm fixes: >> > radeon fixes: the larger ones in the command stream checker for older cards, >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >> > along with some updates to the evergreen command stream checker introduced in -rc1. >> > >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. >> > ttm: fix regression introduced in -rc1 in memory allocation paths. >> > >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >> > >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >> > >> >> I've tested these patches and they break my setup (RS780). On reboot, the >> monitor goes straight to powersaving mode and no framebuffer is shown. > > This is the result of the bisection: > > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 > Author: Alex Deucher <alexdeucher@gmail.com> > Date: Sat Jun 12 11:50:13 2010 -0400 > > drm/radeon/kms: fix bandwidth calculation when sideport is present > > Fixes fdo bug 27529: > https://bugs.freedesktop.org/show_bug.cgi?id=27529 > > Reported-by: steckdenis@yahoo.fr > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> > Cc: stable <stable@kernel.org> > Signed-off-by: Dave Airlie <airlied@redhat.com> Markus, can you send me a copy of your vbios? as root: cd /sys/bus/pci/devices/<pci bus id of video card> echo 1 > rom cat rom ? /tmp/vbio.rom echo 0 > rom Also, when you say "on reboot" do you mean the card comes up ok initially with the new kernel and then fails after a reboot, or fails directly after booting the new kernel? Also, is there an oops or anything like that in dmesg? Thanks, Alex ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 14:49 ` Alex Deucher @ 2010-06-30 14:58 ` Markus Trippelsdorf 2010-06-30 15:03 ` Alex Deucher 0 siblings, 1 reply; 19+ messages in thread From: Markus Trippelsdorf @ 2010-06-30 14:58 UTC (permalink / raw) To: Alex Deucher; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel [-- Attachment #1: Type: text/plain, Size: 2348 bytes --] On Wed, Jun 30, 2010 at 10:49:41AM -0400, Alex Deucher wrote: > On Wed, Jun 30, 2010 at 3:31 AM, Markus Trippelsdorf > <markus@trippelsdorf.de> wrote: > > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: > >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: > >> > > >> > one fb layer fix in a flag I introduced, > >> > > >> > the rest are drm fixes: > >> > radeon fixes: the larger ones in the command stream checker for older cards, > >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. > >> > along with some updates to the evergreen command stream checker introduced in -rc1. > >> > > >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. > >> > ttm: fix regression introduced in -rc1 in memory allocation paths. > >> > > >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: > >> > > >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) > >> > > >> > >> I've tested these patches and they break my setup (RS780). On reboot, the > >> monitor goes straight to powersaving mode and no framebuffer is shown. > > > > This is the result of the bisection: > > > > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit > > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 > > Author: Alex Deucher <alexdeucher@gmail.com> > > Date: Sat Jun 12 11:50:13 2010 -0400 > > > > drm/radeon/kms: fix bandwidth calculation when sideport is present > > > > Fixes fdo bug 27529: > > https://bugs.freedesktop.org/show_bug.cgi?id=27529 > > > > Reported-by: steckdenis@yahoo.fr > > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> > > Cc: stable <stable@kernel.org> > > Signed-off-by: Dave Airlie <airlied@redhat.com> > > Markus, can you send me a copy of your vbios? as root: > cd /sys/bus/pci/devices/<pci bus id of video card> > echo 1 > rom > cat rom ? /tmp/vbio.rom > echo 0 > rom Attached. > > Also, when you say "on reboot" do you mean the card comes up ok > initially with the new kernel and then fails after a reboot, or fails > directly after booting the new kernel? Also, is there an oops or > anything like that in dmesg? It fails directly after booting the new kernel. There is no oops or anything like it in dmesg, because the kernel fails so early that it could not log anything. -- Markus [-- Attachment #2: vbio.rom --] [-- Type: application/octet-stream, Size: 59904 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 14:58 ` Markus Trippelsdorf @ 2010-06-30 15:03 ` Alex Deucher 2010-06-30 15:14 ` Markus Trippelsdorf 0 siblings, 1 reply; 19+ messages in thread From: Alex Deucher @ 2010-06-30 15:03 UTC (permalink / raw) To: Markus Trippelsdorf; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 10:58 AM, Markus Trippelsdorf <markus@trippelsdorf.de> wrote: > On Wed, Jun 30, 2010 at 10:49:41AM -0400, Alex Deucher wrote: >> On Wed, Jun 30, 2010 at 3:31 AM, Markus Trippelsdorf >> <markus@trippelsdorf.de> wrote: >> > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: >> >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: >> >> > >> >> > one fb layer fix in a flag I introduced, >> >> > >> >> > the rest are drm fixes: >> >> > radeon fixes: the larger ones in the command stream checker for older cards, >> >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >> >> > along with some updates to the evergreen command stream checker introduced in -rc1. >> >> > >> >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. >> >> > ttm: fix regression introduced in -rc1 in memory allocation paths. >> >> > >> >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >> >> > >> >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >> >> > >> >> >> >> I've tested these patches and they break my setup (RS780). On reboot, the >> >> monitor goes straight to powersaving mode and no framebuffer is shown. >> > >> > This is the result of the bisection: >> > >> > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit >> > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 >> > Author: Alex Deucher <alexdeucher@gmail.com> >> > Date: Sat Jun 12 11:50:13 2010 -0400 >> > >> > drm/radeon/kms: fix bandwidth calculation when sideport is present >> > >> > Fixes fdo bug 27529: >> > https://bugs.freedesktop.org/show_bug.cgi?id=27529 >> > >> > Reported-by: steckdenis@yahoo.fr >> > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> >> > Cc: stable <stable@kernel.org> >> > Signed-off-by: Dave Airlie <airlied@redhat.com> >> >> Markus, can you send me a copy of your vbios? as root: >> cd /sys/bus/pci/devices/<pci bus id of video card> >> echo 1 > rom >> cat rom ? /tmp/vbio.rom >> echo 0 > rom > > Attached. > >> >> Also, when you say "on reboot" do you mean the card comes up ok >> initially with the new kernel and then fails after a reboot, or fails >> directly after booting the new kernel? Also, is there an oops or >> anything like that in dmesg? > > It fails directly after booting the new kernel. There is no oops or > anything like it in dmesg, because the kernel fails so early that it > could not log anything. Is the machine still pingable? Can you ssh in? or is it completely dead? Alex ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 15:03 ` Alex Deucher @ 2010-06-30 15:14 ` Markus Trippelsdorf 2010-06-30 15:16 ` Alex Deucher 2010-06-30 15:34 ` Alex Deucher 0 siblings, 2 replies; 19+ messages in thread From: Markus Trippelsdorf @ 2010-06-30 15:14 UTC (permalink / raw) To: Alex Deucher; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 11:03:33AM -0400, Alex Deucher wrote: > On Wed, Jun 30, 2010 at 10:58 AM, Markus Trippelsdorf > <markus@trippelsdorf.de> wrote: > > On Wed, Jun 30, 2010 at 10:49:41AM -0400, Alex Deucher wrote: > >> On Wed, Jun 30, 2010 at 3:31 AM, Markus Trippelsdorf > >> <markus@trippelsdorf.de> wrote: > >> > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: > >> >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: > >> >> > > >> >> > one fb layer fix in a flag I introduced, > >> >> > > >> >> > the rest are drm fixes: > >> >> > radeon fixes: the larger ones in the command stream checker for older cards, > >> >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. > >> >> > along with some updates to the evergreen command stream checker introduced in -rc1. > >> >> > > >> >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. > >> >> > ttm: fix regression introduced in -rc1 in memory allocation paths. > >> >> > > >> >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: > >> >> > > >> >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) > >> >> > > >> >> > >> >> I've tested these patches and they break my setup (RS780). On reboot, the > >> >> monitor goes straight to powersaving mode and no framebuffer is shown. > >> > > >> > This is the result of the bisection: > >> > > >> > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit > >> > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 > >> > Author: Alex Deucher <alexdeucher@gmail.com> > >> > Date: Sat Jun 12 11:50:13 2010 -0400 > >> > > >> > drm/radeon/kms: fix bandwidth calculation when sideport is present > >> > > >> > Fixes fdo bug 27529: > >> > https://bugs.freedesktop.org/show_bug.cgi?id=27529 > >> > > >> > Reported-by: steckdenis@yahoo.fr > >> > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> > >> > Cc: stable <stable@kernel.org> > >> > Signed-off-by: Dave Airlie <airlied@redhat.com> > >> > >> Markus, can you send me a copy of your vbios? as root: > >> cd /sys/bus/pci/devices/<pci bus id of video card> > >> echo 1 > rom > >> cat rom ? /tmp/vbio.rom > >> echo 0 > rom > > > > Attached. > > > >> > >> Also, when you say "on reboot" do you mean the card comes up ok > >> initially with the new kernel and then fails after a reboot, or fails > >> directly after booting the new kernel? Also, is there an oops or > >> anything like that in dmesg? > > > > It fails directly after booting the new kernel. There is no oops or > > anything like it in dmesg, because the kernel fails so early that it > > could not log anything. > > Is the machine still pingable? Can you ssh in? or is it completely dead? I don't think so. There is no disk activivy after the hang, but maybe the kernel displays an oops, which I just can't see. -- Markus ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 15:14 ` Markus Trippelsdorf @ 2010-06-30 15:16 ` Alex Deucher 2010-06-30 15:34 ` Alex Deucher 1 sibling, 0 replies; 19+ messages in thread From: Alex Deucher @ 2010-06-30 15:16 UTC (permalink / raw) To: Markus Trippelsdorf; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 11:14 AM, Markus Trippelsdorf <markus@trippelsdorf.de> wrote: > On Wed, Jun 30, 2010 at 11:03:33AM -0400, Alex Deucher wrote: >> On Wed, Jun 30, 2010 at 10:58 AM, Markus Trippelsdorf >> <markus@trippelsdorf.de> wrote: >> > On Wed, Jun 30, 2010 at 10:49:41AM -0400, Alex Deucher wrote: >> >> On Wed, Jun 30, 2010 at 3:31 AM, Markus Trippelsdorf >> >> <markus@trippelsdorf.de> wrote: >> >> > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: >> >> >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: >> >> >> > >> >> >> > one fb layer fix in a flag I introduced, >> >> >> > >> >> >> > the rest are drm fixes: >> >> >> > radeon fixes: the larger ones in the command stream checker for older cards, >> >> >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >> >> >> > along with some updates to the evergreen command stream checker introduced in -rc1. >> >> >> > >> >> >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. >> >> >> > ttm: fix regression introduced in -rc1 in memory allocation paths. >> >> >> > >> >> >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >> >> >> > >> >> >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >> >> >> > >> >> >> >> >> >> I've tested these patches and they break my setup (RS780). On reboot, the >> >> >> monitor goes straight to powersaving mode and no framebuffer is shown. >> >> > >> >> > This is the result of the bisection: >> >> > >> >> > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit >> >> > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 >> >> > Author: Alex Deucher <alexdeucher@gmail.com> >> >> > Date: Sat Jun 12 11:50:13 2010 -0400 >> >> > >> >> > drm/radeon/kms: fix bandwidth calculation when sideport is present >> >> > >> >> > Fixes fdo bug 27529: >> >> > https://bugs.freedesktop.org/show_bug.cgi?id=27529 >> >> > >> >> > Reported-by: steckdenis@yahoo.fr >> >> > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> >> >> > Cc: stable <stable@kernel.org> >> >> > Signed-off-by: Dave Airlie <airlied@redhat.com> >> >> >> >> Markus, can you send me a copy of your vbios? as root: >> >> cd /sys/bus/pci/devices/<pci bus id of video card> >> >> echo 1 > rom >> >> cat rom ? /tmp/vbio.rom >> >> echo 0 > rom >> > >> > Attached. >> > >> >> >> >> Also, when you say "on reboot" do you mean the card comes up ok >> >> initially with the new kernel and then fails after a reboot, or fails >> >> directly after booting the new kernel? Also, is there an oops or >> >> anything like that in dmesg? >> > >> > It fails directly after booting the new kernel. There is no oops or >> > anything like it in dmesg, because the kernel fails so early that it >> > could not log anything. >> >> Is the machine still pingable? Can you ssh in? or is it completely dead? > > I don't think so. There is no disk activivy after the hang, but maybe > the kernel displays an oops, which I just can't see. I found the problem. Patch on the way. Alex ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 15:14 ` Markus Trippelsdorf 2010-06-30 15:16 ` Alex Deucher @ 2010-06-30 15:34 ` Alex Deucher 2010-06-30 15:50 ` Markus Trippelsdorf 1 sibling, 1 reply; 19+ messages in thread From: Alex Deucher @ 2010-06-30 15:34 UTC (permalink / raw) To: Markus Trippelsdorf; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel [-- Attachment #1: Type: text/plain, Size: 3142 bytes --] On Wed, Jun 30, 2010 at 11:14 AM, Markus Trippelsdorf <markus@trippelsdorf.de> wrote: > On Wed, Jun 30, 2010 at 11:03:33AM -0400, Alex Deucher wrote: >> On Wed, Jun 30, 2010 at 10:58 AM, Markus Trippelsdorf >> <markus@trippelsdorf.de> wrote: >> > On Wed, Jun 30, 2010 at 10:49:41AM -0400, Alex Deucher wrote: >> >> On Wed, Jun 30, 2010 at 3:31 AM, Markus Trippelsdorf >> >> <markus@trippelsdorf.de> wrote: >> >> > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: >> >> >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: >> >> >> > >> >> >> > one fb layer fix in a flag I introduced, >> >> >> > >> >> >> > the rest are drm fixes: >> >> >> > radeon fixes: the larger ones in the command stream checker for older cards, >> >> >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >> >> >> > along with some updates to the evergreen command stream checker introduced in -rc1. >> >> >> > >> >> >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. >> >> >> > ttm: fix regression introduced in -rc1 in memory allocation paths. >> >> >> > >> >> >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >> >> >> > >> >> >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >> >> >> > >> >> >> >> >> >> I've tested these patches and they break my setup (RS780). On reboot, the >> >> >> monitor goes straight to powersaving mode and no framebuffer is shown. >> >> > >> >> > This is the result of the bisection: >> >> > >> >> > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit >> >> > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 >> >> > Author: Alex Deucher <alexdeucher@gmail.com> >> >> > Date: Sat Jun 12 11:50:13 2010 -0400 >> >> > >> >> > drm/radeon/kms: fix bandwidth calculation when sideport is present >> >> > >> >> > Fixes fdo bug 27529: >> >> > https://bugs.freedesktop.org/show_bug.cgi?id=27529 >> >> > >> >> > Reported-by: steckdenis@yahoo.fr >> >> > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> >> >> > Cc: stable <stable@kernel.org> >> >> > Signed-off-by: Dave Airlie <airlied@redhat.com> >> >> >> >> Markus, can you send me a copy of your vbios? as root: >> >> cd /sys/bus/pci/devices/<pci bus id of video card> >> >> echo 1 > rom >> >> cat rom ? /tmp/vbio.rom >> >> echo 0 > rom >> > >> > Attached. >> > >> >> >> >> Also, when you say "on reboot" do you mean the card comes up ok >> >> initially with the new kernel and then fails after a reboot, or fails >> >> directly after booting the new kernel? Also, is there an oops or >> >> anything like that in dmesg? >> > >> > It fails directly after booting the new kernel. There is no oops or >> > anything like it in dmesg, because the kernel fails so early that it >> > could not log anything. >> >> Is the machine still pingable? Can you ssh in? or is it completely dead? > > I don't think so. There is no disk activivy after the hang, but maybe > the kernel displays an oops, which I just can't see. The attached patch should fix the issue. Alex [-- Attachment #2: 0001-drm-radeon-kms-igp-fix-possible-divide-by-0-in-bandw.patch --] [-- Type: text/x-patch, Size: 4135 bytes --] From 3b2fef39e0172099a766ce536489d008b444c48b Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexdeucher@gmail.com> Date: Wed, 30 Jun 2010 11:31:13 -0400 Subject: [PATCH] drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code Some IGP systems specify the system memory clock in the Firmware table rather than the IGP info table. Check both and make sure we have a value system memory clock value. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> --- drivers/gpu/drm/radeon/rs690.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 64b94a8..f4f0a61 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c @@ -79,7 +79,13 @@ void rs690_pm_info(struct radeon_device *rdev) tmp.full = dfixed_const(100); rdev->pm.igp_sideport_mclk.full = dfixed_const(info->info.ulBootUpMemoryClock); rdev->pm.igp_sideport_mclk.full = dfixed_div(rdev->pm.igp_sideport_mclk, tmp); - rdev->pm.igp_system_mclk.full = dfixed_const(le16_to_cpu(info->info.usK8MemoryClock)); + if (info->info.usK8MemoryClock) + rdev->pm.igp_system_mclk.full = dfixed_const(le16_to_cpu(info->info.usK8MemoryClock)); + else if (rdev->clock.default_mclk) { + rdev->pm.igp_system_mclk.full = dfixed_const(rdev->clock.default_mclk); + rdev->pm.igp_system_mclk.full = dfixed_div(rdev->pm.igp_system_mclk, tmp); + } else + rdev->pm.igp_system_mclk.full = dfixed_const(400); rdev->pm.igp_ht_link_clk.full = dfixed_const(le16_to_cpu(info->info.usFSBClock)); rdev->pm.igp_ht_link_width.full = dfixed_const(info->info.ucHTLinkWidth); break; @@ -87,34 +93,31 @@ void rs690_pm_info(struct radeon_device *rdev) tmp.full = dfixed_const(100); rdev->pm.igp_sideport_mclk.full = dfixed_const(info->info_v2.ulBootUpSidePortClock); rdev->pm.igp_sideport_mclk.full = dfixed_div(rdev->pm.igp_sideport_mclk, tmp); - rdev->pm.igp_system_mclk.full = dfixed_const(info->info_v2.ulBootUpUMAClock); + if (info->info_v2.ulBootUpUMAClock) + rdev->pm.igp_system_mclk.full = dfixed_const(info->info_v2.ulBootUpUMAClock); + else if (rdev->clock.default_mclk) + rdev->pm.igp_system_mclk.full = dfixed_const(rdev->clock.default_mclk); + else + rdev->pm.igp_system_mclk.full = dfixed_const(66700); rdev->pm.igp_system_mclk.full = dfixed_div(rdev->pm.igp_system_mclk, tmp); rdev->pm.igp_ht_link_clk.full = dfixed_const(info->info_v2.ulHTLinkFreq); rdev->pm.igp_ht_link_clk.full = dfixed_div(rdev->pm.igp_ht_link_clk, tmp); rdev->pm.igp_ht_link_width.full = dfixed_const(le16_to_cpu(info->info_v2.usMinHTLinkWidth)); break; default: - tmp.full = dfixed_const(100); /* We assume the slower possible clock ie worst case */ - /* DDR 333Mhz */ - rdev->pm.igp_sideport_mclk.full = dfixed_const(333); - /* FIXME: system clock ? */ - rdev->pm.igp_system_mclk.full = dfixed_const(100); - rdev->pm.igp_system_mclk.full = dfixed_div(rdev->pm.igp_system_mclk, tmp); - rdev->pm.igp_ht_link_clk.full = dfixed_const(200); + rdev->pm.igp_sideport_mclk.full = dfixed_const(200); + rdev->pm.igp_system_mclk.full = dfixed_const(200); + rdev->pm.igp_ht_link_clk.full = dfixed_const(1000); rdev->pm.igp_ht_link_width.full = dfixed_const(8); DRM_ERROR("No integrated system info for your GPU, using safe default\n"); break; } } else { - tmp.full = dfixed_const(100); /* We assume the slower possible clock ie worst case */ - /* DDR 333Mhz */ - rdev->pm.igp_sideport_mclk.full = dfixed_const(333); - /* FIXME: system clock ? */ - rdev->pm.igp_system_mclk.full = dfixed_const(100); - rdev->pm.igp_system_mclk.full = dfixed_div(rdev->pm.igp_system_mclk, tmp); - rdev->pm.igp_ht_link_clk.full = dfixed_const(200); + rdev->pm.igp_sideport_mclk.full = dfixed_const(200); + rdev->pm.igp_system_mclk.full = dfixed_const(200); + rdev->pm.igp_ht_link_clk.full = dfixed_const(1000); rdev->pm.igp_ht_link_width.full = dfixed_const(8); DRM_ERROR("No integrated system info for your GPU, using safe default\n"); } -- 1.7.0.1 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 15:34 ` Alex Deucher @ 2010-06-30 15:50 ` Markus Trippelsdorf 2010-06-30 16:04 ` Alex Deucher 0 siblings, 1 reply; 19+ messages in thread From: Markus Trippelsdorf @ 2010-06-30 15:50 UTC (permalink / raw) To: Alex Deucher; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 11:34:53AM -0400, Alex Deucher wrote: > On Wed, Jun 30, 2010 at 11:14 AM, Markus Trippelsdorf > <markus@trippelsdorf.de> wrote: > > On Wed, Jun 30, 2010 at 11:03:33AM -0400, Alex Deucher wrote: > >> On Wed, Jun 30, 2010 at 10:58 AM, Markus Trippelsdorf > >> <markus@trippelsdorf.de> wrote: > >> > On Wed, Jun 30, 2010 at 10:49:41AM -0400, Alex Deucher wrote: > >> >> On Wed, Jun 30, 2010 at 3:31 AM, Markus Trippelsdorf > >> >> <markus@trippelsdorf.de> wrote: > >> >> > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: > >> >> >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: > >> >> >> > > >> >> >> > one fb layer fix in a flag I introduced, > >> >> >> > > >> >> >> > the rest are drm fixes: > >> >> >> > radeon fixes: the larger ones in the command stream checker for older cards, > >> >> >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. > >> >> >> > along with some updates to the evergreen command stream checker introduced in -rc1. > >> >> >> > > >> >> >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. > >> >> >> > ttm: fix regression introduced in -rc1 in memory allocation paths. > >> >> >> > > >> >> >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: > >> >> >> > > >> >> >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) > >> >> >> > > >> >> >> > >> >> >> I've tested these patches and they break my setup (RS780). On reboot, the > >> >> >> monitor goes straight to powersaving mode and no framebuffer is shown. > >> >> > > >> >> > This is the result of the bisection: > >> >> > > >> >> > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit > >> >> > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 > >> >> > Author: Alex Deucher <alexdeucher@gmail.com> > >> >> > Date: Sat Jun 12 11:50:13 2010 -0400 > >> >> > > >> >> > drm/radeon/kms: fix bandwidth calculation when sideport is present > >> >> > > >> >> > Fixes fdo bug 27529: > >> >> > https://bugs.freedesktop.org/show_bug.cgi?id=27529 > >> >> > > >> >> > Reported-by: steckdenis@yahoo.fr > >> >> > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> > >> >> > Cc: stable <stable@kernel.org> > >> >> > Signed-off-by: Dave Airlie <airlied@redhat.com> > >> >> > >> >> Markus, can you send me a copy of your vbios? as root: > >> >> cd /sys/bus/pci/devices/<pci bus id of video card> > >> >> echo 1 > rom > >> >> cat rom ? /tmp/vbio.rom > >> >> echo 0 > rom > >> > > >> > Attached. > >> > > >> >> > >> >> Also, when you say "on reboot" do you mean the card comes up ok > >> >> initially with the new kernel and then fails after a reboot, or fails > >> >> directly after booting the new kernel? Also, is there an oops or > >> >> anything like that in dmesg? > >> > > >> > It fails directly after booting the new kernel. There is no oops or > >> > anything like it in dmesg, because the kernel fails so early that it > >> > could not log anything. > >> > >> Is the machine still pingable? Can you ssh in? or is it completely dead? > > > > I don't think so. There is no disk activivy after the hang, but maybe > > the kernel displays an oops, which I just can't see. > > The attached patch should fix the issue. Sorry, but it does not. I've still the same issue with your patch applied. -- Markus ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 15:50 ` Markus Trippelsdorf @ 2010-06-30 16:04 ` Alex Deucher 2010-06-30 16:11 ` Markus Trippelsdorf 0 siblings, 1 reply; 19+ messages in thread From: Alex Deucher @ 2010-06-30 16:04 UTC (permalink / raw) To: Markus Trippelsdorf; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel [-- Attachment #1: Type: text/plain, Size: 3704 bytes --] On Wed, Jun 30, 2010 at 11:50 AM, Markus Trippelsdorf <markus@trippelsdorf.de> wrote: > On Wed, Jun 30, 2010 at 11:34:53AM -0400, Alex Deucher wrote: >> On Wed, Jun 30, 2010 at 11:14 AM, Markus Trippelsdorf >> <markus@trippelsdorf.de> wrote: >> > On Wed, Jun 30, 2010 at 11:03:33AM -0400, Alex Deucher wrote: >> >> On Wed, Jun 30, 2010 at 10:58 AM, Markus Trippelsdorf >> >> <markus@trippelsdorf.de> wrote: >> >> > On Wed, Jun 30, 2010 at 10:49:41AM -0400, Alex Deucher wrote: >> >> >> On Wed, Jun 30, 2010 at 3:31 AM, Markus Trippelsdorf >> >> >> <markus@trippelsdorf.de> wrote: >> >> >> > On Wed, Jun 30, 2010 at 08:54:40AM +0200, Markus Trippelsdorf wrote: >> >> >> >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: >> >> >> >> > >> >> >> >> > one fb layer fix in a flag I introduced, >> >> >> >> > >> >> >> >> > the rest are drm fixes: >> >> >> >> > radeon fixes: the larger ones in the command stream checker for older cards, >> >> >> >> > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >> >> >> >> > along with some updates to the evergreen command stream checker introduced in -rc1. >> >> >> >> > >> >> >> >> > agp: fix issue with warning on memory allocation + fallback to vmalloc. >> >> >> >> > ttm: fix regression introduced in -rc1 in memory allocation paths. >> >> >> >> > >> >> >> >> > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >> >> >> >> > >> >> >> >> > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >> >> >> >> > >> >> >> >> >> >> >> >> I've tested these patches and they break my setup (RS780). On reboot, the >> >> >> >> monitor goes straight to powersaving mode and no framebuffer is shown. >> >> >> > >> >> >> > This is the result of the bisection: >> >> >> > >> >> >> > 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 is the first bad commit >> >> >> > commit 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 >> >> >> > Author: Alex Deucher <alexdeucher@gmail.com> >> >> >> > Date: Sat Jun 12 11:50:13 2010 -0400 >> >> >> > >> >> >> > drm/radeon/kms: fix bandwidth calculation when sideport is present >> >> >> > >> >> >> > Fixes fdo bug 27529: >> >> >> > https://bugs.freedesktop.org/show_bug.cgi?id=27529 >> >> >> > >> >> >> > Reported-by: steckdenis@yahoo.fr >> >> >> > Signed-off-by: Alex Deucher <alexdeucher@gmail.com> >> >> >> > Cc: stable <stable@kernel.org> >> >> >> > Signed-off-by: Dave Airlie <airlied@redhat.com> >> >> >> >> >> >> Markus, can you send me a copy of your vbios? as root: >> >> >> cd /sys/bus/pci/devices/<pci bus id of video card> >> >> >> echo 1 > rom >> >> >> cat rom ? /tmp/vbio.rom >> >> >> echo 0 > rom >> >> > >> >> > Attached. >> >> > >> >> >> >> >> >> Also, when you say "on reboot" do you mean the card comes up ok >> >> >> initially with the new kernel and then fails after a reboot, or fails >> >> >> directly after booting the new kernel? Also, is there an oops or >> >> >> anything like that in dmesg? >> >> > >> >> > It fails directly after booting the new kernel. There is no oops or >> >> > anything like it in dmesg, because the kernel fails so early that it >> >> > could not log anything. >> >> >> >> Is the machine still pingable? Can you ssh in? or is it completely dead? >> > >> > I don't think so. There is no disk activivy after the hang, but maybe >> > the kernel displays an oops, which I just can't see. >> >> The attached patch should fix the issue. > > Sorry, but it does not. I've still the same issue with your patch > applied. New patch attached. The rs690_pm_info function wasn't getting called at all on rs780/rs880 and it needs to be. Alex [-- Attachment #2: 0001-drm-radeon-kms-igp-fix-possible-divide-by-0-in-bandw.patch --] [-- Type: text/x-patch, Size: 5386 bytes --] From b79c8299fec572953ef6d870990293c0ee4ca678 Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexdeucher@gmail.com> Date: Wed, 30 Jun 2010 12:02:03 -0400 Subject: [PATCH] drm/radeon/kms/igp: fix possible divide by 0 in bandwidth code (v2) Some IGP systems specify the system memory clock in the Firmware table rather than the IGP info table. Check both and make sure we have a value system memory clock value. v2: make sure rs690_pm_info is called on rs780/rs880 as well. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> --- drivers/gpu/drm/radeon/r600.c | 4 +++- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/rs690.c | 35 +++++++++++++++++++---------------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 7f48593..1d5057b 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1224,8 +1224,10 @@ int r600_mc_init(struct radeon_device *rdev) rdev->mc.visible_vram_size = rdev->mc.aper_size; r600_vram_gtt_location(rdev, &rdev->mc); - if (rdev->flags & RADEON_IS_IGP) + if (rdev->flags & RADEON_IS_IGP) { + rs690_pm_info(rdev); rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); + } radeon_update_bandwidth_info(rdev); return 0; } diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 35f0800..9fcdba7 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -177,6 +177,7 @@ void radeon_pm_resume(struct radeon_device *rdev); void radeon_combios_get_power_modes(struct radeon_device *rdev); void radeon_atombios_get_power_modes(struct radeon_device *rdev); void radeon_atom_set_voltage(struct radeon_device *rdev, u16 level); +void rs690_pm_info(struct radeon_device *rdev); /* * Fences. diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 64b94a8..f4f0a61 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c @@ -79,7 +79,13 @@ void rs690_pm_info(struct radeon_device *rdev) tmp.full = dfixed_const(100); rdev->pm.igp_sideport_mclk.full = dfixed_const(info->info.ulBootUpMemoryClock); rdev->pm.igp_sideport_mclk.full = dfixed_div(rdev->pm.igp_sideport_mclk, tmp); - rdev->pm.igp_system_mclk.full = dfixed_const(le16_to_cpu(info->info.usK8MemoryClock)); + if (info->info.usK8MemoryClock) + rdev->pm.igp_system_mclk.full = dfixed_const(le16_to_cpu(info->info.usK8MemoryClock)); + else if (rdev->clock.default_mclk) { + rdev->pm.igp_system_mclk.full = dfixed_const(rdev->clock.default_mclk); + rdev->pm.igp_system_mclk.full = dfixed_div(rdev->pm.igp_system_mclk, tmp); + } else + rdev->pm.igp_system_mclk.full = dfixed_const(400); rdev->pm.igp_ht_link_clk.full = dfixed_const(le16_to_cpu(info->info.usFSBClock)); rdev->pm.igp_ht_link_width.full = dfixed_const(info->info.ucHTLinkWidth); break; @@ -87,34 +93,31 @@ void rs690_pm_info(struct radeon_device *rdev) tmp.full = dfixed_const(100); rdev->pm.igp_sideport_mclk.full = dfixed_const(info->info_v2.ulBootUpSidePortClock); rdev->pm.igp_sideport_mclk.full = dfixed_div(rdev->pm.igp_sideport_mclk, tmp); - rdev->pm.igp_system_mclk.full = dfixed_const(info->info_v2.ulBootUpUMAClock); + if (info->info_v2.ulBootUpUMAClock) + rdev->pm.igp_system_mclk.full = dfixed_const(info->info_v2.ulBootUpUMAClock); + else if (rdev->clock.default_mclk) + rdev->pm.igp_system_mclk.full = dfixed_const(rdev->clock.default_mclk); + else + rdev->pm.igp_system_mclk.full = dfixed_const(66700); rdev->pm.igp_system_mclk.full = dfixed_div(rdev->pm.igp_system_mclk, tmp); rdev->pm.igp_ht_link_clk.full = dfixed_const(info->info_v2.ulHTLinkFreq); rdev->pm.igp_ht_link_clk.full = dfixed_div(rdev->pm.igp_ht_link_clk, tmp); rdev->pm.igp_ht_link_width.full = dfixed_const(le16_to_cpu(info->info_v2.usMinHTLinkWidth)); break; default: - tmp.full = dfixed_const(100); /* We assume the slower possible clock ie worst case */ - /* DDR 333Mhz */ - rdev->pm.igp_sideport_mclk.full = dfixed_const(333); - /* FIXME: system clock ? */ - rdev->pm.igp_system_mclk.full = dfixed_const(100); - rdev->pm.igp_system_mclk.full = dfixed_div(rdev->pm.igp_system_mclk, tmp); - rdev->pm.igp_ht_link_clk.full = dfixed_const(200); + rdev->pm.igp_sideport_mclk.full = dfixed_const(200); + rdev->pm.igp_system_mclk.full = dfixed_const(200); + rdev->pm.igp_ht_link_clk.full = dfixed_const(1000); rdev->pm.igp_ht_link_width.full = dfixed_const(8); DRM_ERROR("No integrated system info for your GPU, using safe default\n"); break; } } else { - tmp.full = dfixed_const(100); /* We assume the slower possible clock ie worst case */ - /* DDR 333Mhz */ - rdev->pm.igp_sideport_mclk.full = dfixed_const(333); - /* FIXME: system clock ? */ - rdev->pm.igp_system_mclk.full = dfixed_const(100); - rdev->pm.igp_system_mclk.full = dfixed_div(rdev->pm.igp_system_mclk, tmp); - rdev->pm.igp_ht_link_clk.full = dfixed_const(200); + rdev->pm.igp_sideport_mclk.full = dfixed_const(200); + rdev->pm.igp_system_mclk.full = dfixed_const(200); + rdev->pm.igp_ht_link_clk.full = dfixed_const(1000); rdev->pm.igp_ht_link_width.full = dfixed_const(8); DRM_ERROR("No integrated system info for your GPU, using safe default\n"); } -- 1.7.0.1 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch (bisected) 2010-06-30 16:04 ` Alex Deucher @ 2010-06-30 16:11 ` Markus Trippelsdorf 0 siblings, 0 replies; 19+ messages in thread From: Markus Trippelsdorf @ 2010-06-30 16:11 UTC (permalink / raw) To: Alex Deucher; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 12:04:35PM -0400, Alex Deucher wrote: > On Wed, Jun 30, 2010 at 11:50 AM, Markus Trippelsdorf > <markus@trippelsdorf.de> wrote: > > On Wed, Jun 30, 2010 at 11:34:53AM -0400, Alex Deucher wrote: > >> > >> The attached patch should fix the issue. > > > > Sorry, but it does not. I've still the same issue with your patch > > applied. > > New patch attached. The rs690_pm_info function wasn't getting called > at all on rs780/rs880 and it needs to be. Looks good. Thanks Alex. -- Markus ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch 2010-06-30 6:54 ` Markus Trippelsdorf 2010-06-30 7:31 ` [git pull] drm fixes + agp + one fb patch (bisected) Markus Trippelsdorf @ 2010-06-30 7:57 ` Dave Airlie 2010-06-30 8:00 ` Dave Airlie 1 sibling, 1 reply; 19+ messages in thread From: Dave Airlie @ 2010-06-30 7:57 UTC (permalink / raw) To: Markus Trippelsdorf; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 4:54 PM, Markus Trippelsdorf <markus@trippelsdorf.de> wrote: > On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: >> >> Hi Linus, >> >> one fb layer fix in a flag I introduced, >> >> the rest are drm fixes: >> radeon fixes: the larger ones in the command stream checker for older cards, >> which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >> along with some updates to the evergreen command stream checker introduced in -rc1. >> >> agp: fix issue with warning on memory allocation + fallback to vmalloc. >> ttm: fix regression introduced in -rc1 in memory allocation paths. >> >> The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >> >> Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >> > > I've tested these patches and they break my setup (RS780). On reboot, the > monitor goes straight to powersaving mode and no framebuffer is shown. Can you bisect which one does it? 2.6.35-rc3 works okay? Dave. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch 2010-06-30 7:57 ` [git pull] drm fixes + agp + one fb patch Dave Airlie @ 2010-06-30 8:00 ` Dave Airlie 2010-06-30 8:03 ` Markus Trippelsdorf 0 siblings, 1 reply; 19+ messages in thread From: Dave Airlie @ 2010-06-30 8:00 UTC (permalink / raw) To: Markus Trippelsdorf; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 5:57 PM, Dave Airlie <airlied@gmail.com> wrote: > On Wed, Jun 30, 2010 at 4:54 PM, Markus Trippelsdorf > <markus@trippelsdorf.de> wrote: >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: >>> >>> Hi Linus, >>> >>> one fb layer fix in a flag I introduced, >>> >>> the rest are drm fixes: >>> radeon fixes: the larger ones in the command stream checker for older cards, >>> which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >>> along with some updates to the evergreen command stream checker introduced in -rc1. >>> >>> agp: fix issue with warning on memory allocation + fallback to vmalloc. >>> ttm: fix regression introduced in -rc1 in memory allocation paths. >>> >>> The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >>> >>> Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >>> >> >> I've tested these patches and they break my setup (RS780). On reboot, the >> monitor goes straight to powersaving mode and no framebuffer is shown. > > Can you bisect which one does it? 2.6.35-rc3 works okay? first guess is 6d35ce0a468b8098c22ca54b4e222c27e364f9bb then 8ed219f50c943a21a0b4f545876b58a344a28f45 then d2c1736971e3cc3b5315d034424a872dc5f44f4a Dave. > > Dave. > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch 2010-06-30 8:00 ` Dave Airlie @ 2010-06-30 8:03 ` Markus Trippelsdorf 0 siblings, 0 replies; 19+ messages in thread From: Markus Trippelsdorf @ 2010-06-30 8:03 UTC (permalink / raw) To: Dave Airlie; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 06:00:32PM +1000, Dave Airlie wrote: > On Wed, Jun 30, 2010 at 5:57 PM, Dave Airlie <airlied@gmail.com> wrote: > > On Wed, Jun 30, 2010 at 4:54 PM, Markus Trippelsdorf > > <markus@trippelsdorf.de> wrote: > >> On Wed, Jun 30, 2010 at 02:03:04AM +0100, Dave Airlie wrote: > >>> > >>> Hi Linus, > >>> > >>> one fb layer fix in a flag I introduced, > >>> > >>> the rest are drm fixes: > >>> radeon fixes: the larger ones in the command stream checker for older cards, > >>> which was causing a lot of userspace apps to fail. Also some powerpc server fixes. > >>> along with some updates to the evergreen command stream checker introduced in -rc1. > >>> > >>> agp: fix issue with warning on memory allocation + fallback to vmalloc. > >>> ttm: fix regression introduced in -rc1 in memory allocation paths. > >>> > >>> The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: > >>> > >>> Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) > >>> > >> > >> I've tested these patches and they break my setup (RS780). On reboot, the > >> monitor goes straight to powersaving mode and no framebuffer is shown. > > > > Can you bisect which one does it? 2.6.35-rc3 works okay? > > first guess is 6d35ce0a468b8098c22ca54b4e222c27e364f9bb > then 8ed219f50c943a21a0b4f545876b58a344a28f45 > then d2c1736971e3cc3b5315d034424a872dc5f44f4a It's 07d4190327b02ab3aaad25a2d168f79d92e8f8c2 :-) see my other email. -- Markus ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch 2010-06-30 1:03 [git pull] drm fixes + agp + one fb patch Dave Airlie 2010-06-30 4:42 ` Rafał Miłecki 2010-06-30 6:54 ` Markus Trippelsdorf @ 2010-06-30 10:13 ` Rafael J. Wysocki 2010-06-30 15:45 ` Alex Deucher 2 siblings, 1 reply; 19+ messages in thread From: Rafael J. Wysocki @ 2010-06-30 10:13 UTC (permalink / raw) To: Dave Airlie; +Cc: torvalds, linux-kernel, dri-devel On Wednesday, June 30, 2010, Dave Airlie wrote: > > Hi Linus, > > one fb layer fix in a flag I introduced, > > the rest are drm fixes: > radeon fixes: the larger ones in the command stream checker for older cards, > which was causing a lot of userspace apps to fail. Also some powerpc server fixes. > along with some updates to the evergreen command stream checker introduced in -rc1. > > agp: fix issue with warning on memory allocation + fallback to vmalloc. > ttm: fix regression introduced in -rc1 in memory allocation paths. > > The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: > > Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) > > are available in the git repository at: > ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes > > Adam Jackson (1): > drm/fb: Fix video= mode computation > > Alex Deucher (7): > drm/radeon/kms: fix bandwidth calculation when sideport is present > drm/radeon/kms: fix DP after DPMS cycle > drm/radeon/kms: fix typo in evergreen_gpu_init > drm/radeon/kms: disable frac fb dividers for rs6xx > drm/radeon/kms: avoid oops on mac r4xx cards > drm/radeon/kms: fix typos in evergreen command checker > drm/radeon/kms: add some missing regs to evergreen gpu init > > Cedric Godin (1): > drm/radeon/kms: fix dpms state on resume > > Dave Airlie (7): > drm/radeon: fix dual-head on rv250 > radeon/kms: fix powerpc/rn50 untiled behaviour. > agp: drop vmalloc flag. > agp: add no warn since we have a fallback to vmalloc paths > drm/radeon: add fake RN50 table for powerpc > drm/radeon/kms: don't read attempt to read bios from VRAM on unposted GPU. > fb: fix colliding defines for fb flags. > > Jerome Glisse (2): > drm/ttm: non pooled page allocation should have GFP_USER set > drm/radeon/kms: Force HDP_NONSURF to maximum size > > Matt Turner (1): > drm/radeon/kms: return ret in cursor_set failure path > > Roland Scheidegger (3): > drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx > drm/radeon/r200: handle more hw tex coord types > drm/radeon/r100/r200: fix calculation of compressed cube maps Hmm. What about: https://patchwork.kernel.org/patch/106757/ ? It fixes a regression from 2.6.34. Rafael ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [git pull] drm fixes + agp + one fb patch 2010-06-30 10:13 ` Rafael J. Wysocki @ 2010-06-30 15:45 ` Alex Deucher 0 siblings, 0 replies; 19+ messages in thread From: Alex Deucher @ 2010-06-30 15:45 UTC (permalink / raw) To: Rafael J. Wysocki; +Cc: Dave Airlie, torvalds, linux-kernel, dri-devel On Wed, Jun 30, 2010 at 6:13 AM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > On Wednesday, June 30, 2010, Dave Airlie wrote: >> >> Hi Linus, >> >> one fb layer fix in a flag I introduced, >> >> the rest are drm fixes: >> radeon fixes: the larger ones in the command stream checker for older cards, >> which was causing a lot of userspace apps to fail. Also some powerpc server fixes. >> along with some updates to the evergreen command stream checker introduced in -rc1. >> >> agp: fix issue with warning on memory allocation + fallback to vmalloc. >> ttm: fix regression introduced in -rc1 in memory allocation paths. >> >> The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02: >> >> Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700) >> >> are available in the git repository at: >> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes >> >> Adam Jackson (1): >> drm/fb: Fix video= mode computation >> >> Alex Deucher (7): >> drm/radeon/kms: fix bandwidth calculation when sideport is present >> drm/radeon/kms: fix DP after DPMS cycle >> drm/radeon/kms: fix typo in evergreen_gpu_init >> drm/radeon/kms: disable frac fb dividers for rs6xx >> drm/radeon/kms: avoid oops on mac r4xx cards >> drm/radeon/kms: fix typos in evergreen command checker >> drm/radeon/kms: add some missing regs to evergreen gpu init >> >> Cedric Godin (1): >> drm/radeon/kms: fix dpms state on resume >> >> Dave Airlie (7): >> drm/radeon: fix dual-head on rv250 >> radeon/kms: fix powerpc/rn50 untiled behaviour. >> agp: drop vmalloc flag. >> agp: add no warn since we have a fallback to vmalloc paths >> drm/radeon: add fake RN50 table for powerpc >> drm/radeon/kms: don't read attempt to read bios from VRAM on unposted GPU. >> fb: fix colliding defines for fb flags. >> >> Jerome Glisse (2): >> drm/ttm: non pooled page allocation should have GFP_USER set >> drm/radeon/kms: Force HDP_NONSURF to maximum size >> >> Matt Turner (1): >> drm/radeon/kms: return ret in cursor_set failure path >> >> Roland Scheidegger (3): >> drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx >> drm/radeon/r200: handle more hw tex coord types >> drm/radeon/r100/r200: fix calculation of compressed cube maps > > Hmm. What about: > > https://patchwork.kernel.org/patch/106757/ ? > > It fixes a regression from 2.6.34. This patch should definitely go in as well. Alex ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2010-06-30 16:11 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-06-30 1:03 [git pull] drm fixes + agp + one fb patch Dave Airlie 2010-06-30 4:42 ` Rafał Miłecki 2010-06-30 6:54 ` Markus Trippelsdorf 2010-06-30 7:31 ` [git pull] drm fixes + agp + one fb patch (bisected) Markus Trippelsdorf 2010-06-30 9:22 ` Dave Airlie 2010-06-30 14:49 ` Alex Deucher 2010-06-30 14:58 ` Markus Trippelsdorf 2010-06-30 15:03 ` Alex Deucher 2010-06-30 15:14 ` Markus Trippelsdorf 2010-06-30 15:16 ` Alex Deucher 2010-06-30 15:34 ` Alex Deucher 2010-06-30 15:50 ` Markus Trippelsdorf 2010-06-30 16:04 ` Alex Deucher 2010-06-30 16:11 ` Markus Trippelsdorf 2010-06-30 7:57 ` [git pull] drm fixes + agp + one fb patch Dave Airlie 2010-06-30 8:00 ` Dave Airlie 2010-06-30 8:03 ` Markus Trippelsdorf 2010-06-30 10:13 ` Rafael J. Wysocki 2010-06-30 15:45 ` Alex Deucher
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).