[git pull] drm for 2.6.35-rc1 (revised)

2010-05-21 Thread Dave Airlie 

Original pull details below: note new branch name, I didn't mean to use 
drm-next branch though the contents were totally correct.

Changes since prev req: I missed a nouveau fixes tree from Ben, its mainly 
displayport + i2c fixes for a bunch of Dell laptops we have them all in 
F13 already I think. there are also a few radeon kms fixes + another drm 
mode typo fix that came in over the last few days.

I'm on holidays until next week so let me know if there is anything wrong 
on your end as I'm really not meant to be compiling kernels instead of 
playing with my daughter.

Dave.

 This is a combined drm/agp tree.
 
 Highlights:
 core: initial dev docs, agp scratch page support
 kms: framebuffer cleanup + improved disconnected monitor at boot handling, 
 lots of edid parser updates to bring us in line with the X.org code, 
 improved fbdev handover mechanism.
 
 ttm: add AGP page pool support to increase AGP speed.
 
 radeon kms: initial powermanagement support - for all radeon GPU families, 
 this needs more work but it really needs to be upstream so we can get some 
 feedback now. PM on GPUs is a very complex task. There are two modes of 
 operation a profile driven mode and a dynamic mode, the dynamic mode can 
 potentially save more power but is also more likely to glitch on screen.
 evergreen irq/basic accel hw setup code.
 full access to VRAM beyond PCI BAR
 
 Intel kms:
 split intel agp driver into two drivers, one for AGP, one for GTT.
 move intel sdvo to proper encoder/connector organisation
 Intel Cougarpoint support
 
 This merge has one patch in x86 land which is acked on the list by the 
 proper people.
 
 Dave.
 

The following changes since commit 722154e4cacf015161efe60009ae9be23d492296:
  Linus Torvalds (1):
Merge branch 'zerolen' of git://git.kernel.org/.../jgarzik/misc-2.6

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git 
drm-for-2.6.35

Adam Jackson (25):
  drm/edid: Fix secondary block fetch.
  drm/edid: Remove some misleading comments
  drm/edid: Remove a redundant check
  drm/edid: Reshuffle mode list construction to closer match the spec
  drm/edid: Add modes for Established Timings III section
  drm/edid: Remove arbitrary EDID extension limit
  drm/edid: Remove some silly comments
  drm/edid: Fix preferred mode parse for EDID 1.4
  drm/edid: Add test for monitor reduced blanking support.
  drm/edid: Extend range-based mode addition for EDID 1.4
  drm/edid: Fix the HDTV hack.
  drm/edid: Strengthen the algorithm for standard mode codes
  drm/edid: Add secondary GTF curve support
  drm/modes: Fix interlaced mode names
  drm/edid: Fix sync polarity for secondary GTF curve
  drm/edid: When checking duplicate standard modes, walked the probed list
  drm/i915: Allow LVDS on pipe A on gen4+
  drm/i915: Un-magic a DPCD register write
  drm/i915: Set sync polarity correctly on DisplayPort
  drm/i915/pch: Use minimal number of FDI lanes (v2)
  drm/i915: Use spatio-temporal dithering on PCH
  drm/i915: Make fbc control wrapper functions
  drm/i915: Fix DDC bus selection for multifunction SDVO
  drm/i915: Be extra careful about A/D matching for multifunction SDVO
  drm/edid: Fix 1024x...@85hz

Alex Deucher (42):
  drm/radeon/kms: update atombios.h power tables for evergreen
  drm/radeon/kms: add support for evergreen power tables
  drm/radeon/kms/evergreen: add gart support
  drm/radeon/kms/evergreen: add soft reset function
  drm/radeon/kms/evergreen: implement gfx init
  drm/radeon/kms/evergreen: setup and enable the CP
  drm/radeon/kms/evergreen: implement irq support
  drm/radeon/kms/evergreen: add hpd support
  drm/radeon/kms/atom: disable the encoders in encoder_disable
  drm/radeon/kms: fix copy pasto in disable encoders patch
  drm/radeon/kms/atom: fix typo in LVDS panel info parsing
  drm/radeon/kms/combios: match lvds panel info parsing to ddx
  drm/radeon/kms: add gui_idle callback
  drm/radeon/kms: add support for gui idle interrupts (v4)
  drm/radeon/kms: wait for gpu idle before changing power mode
  drm/radeon/kms/atom/pm: rework power mode parsing
  drm/radeon/kms/pm: interate across crtcs for vblank
  drm/radeon/kms/pm: move pm state update to crtc functions
  drm/radeon/kms/pm: add asic specific callbacks for setting power state 
(v2)
  drm/radeon/kms/pm: add asic specific callbacks for getting power state 
(v2)
  drm/radeon/kms/pm: update display watermarks with power state changes
  drm/radeon/kms/atom: load hwmon drivers
  drm/radeon/kms/pm: don't enable pm if there is only on power state
  drm/radeon/kms/pm: clean power state printing
  drm/radeon/kms: minor pm cleanups
  drm/radeon/kms/pm: restore default power state on exit
  drm/radeon/kms/pm: add additional asic callbacks

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

--- Comment #11 from Conn Clark conn.o.cl...@gmail.com 2010-05-21 09:32:33 
PDT ---
On Fri, May 21, 2010 at 12:48 AM,  bugzilla-dae...@freedesktop.org wrote:
 https://bugs.freedesktop.org/show_bug.cgi?id=27901

 --- Comment #10 from Alain Perrot alain.per...@gmail.com 2010-05-21 
 00:48:34 PDT ---
 Alain,

 Its a tough call on who's is the better solution. Yours uses one less
 temp reg and mine will allow for a couple of operations to be done in
 parallel in the future. I guess we both deserve a pat on the back and
 leave it to someone more experienced to make the call on which one to
 choose.

 Good job

 Conn

 You're probably right (and I known nothing about parallelization on GPUs).

 In any way, many thanks for your help.

 --
 Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
 --- You are receiving this mail because: ---
 You are the assignee for the bug.
 ___
 dri-devel mailing list
 dri-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/dri-devel


Alain,

For the current code I think your patch a tad better. It uses one less
instruction. Short of benchmarking the two solutions I think yours is
the one that should go in. Would you please submit a patch that
includes the assemble_SCS function as well. After you submit it with
that change and a notice that you have singed off on it. I'll nominate
it over my own to go in.

Conn

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

--- Comment #13 from Conn Clark conn.o.cl...@gmail.com 2010-05-21 11:56:36 
PDT ---
On Fri, May 21, 2010 at 11:13 AM,  bugzilla-dae...@freedesktop.org wrote:
 https://bugs.freedesktop.org/show_bug.cgi?id=27901

 Alain Perrot alain.per...@gmail.com changed:

           What    |Removed                     |Added
 
  Attachment #35777|0                           |1
        is obsolete|                            |

 --- Comment #12 from Alain Perrot alain.per...@gmail.com 2010-05-21 
 11:13:05 PDT ---
 Created an attachment (id=35787)
 View: https://bugs.freedesktop.org/attachment.cgi?id=35787
 Review: https://bugs.freedesktop.org/review?bug=27901attachment=35787

  View: https://bugs.freedesktop.org/attachment.cgi?id=35787
  Review: https://bugs.freedesktop.org/review?bug=27901attachment=35787

 Alternative assemble_TRIG and assemble_SCS fix

 Conn,

 Attached is the updated patch which includes the assemble_SCS function.
 If it is ok for you, I will submit it (I guess that it should be sent to the
 dri-devel mailing list ?)

 --
 Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
 --- You are receiving this mail because: ---
 You are the assignee for the bug.
 ___
 dri-devel mailing list
 dri-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/dri-devel


Alain,

Its on the mailing list.

I'll inform them to merge it after I run piglit and verify it works.

Conn

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

Conn Clark conn.o.cl...@gmail.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #14 from Conn Clark conn.o.cl...@gmail.com 2010-05-21 13:45:19 
PDT ---
Alain,

Your patch passes piglit.

I'm going to change the status of this bug now to FIXED


Conn

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [git pull] drm for 2.6.35-rc1 (revised)

2010-05-21 Thread Linus Torvalds 


Grrr. Not well tested. On x86, I get several warnings like this:

drivers/video/fbmem.c: In function ‘fb_do_apertures_overlap’:
drivers/video/fbmem.c:1494: warning: format ‘%llx’ expects type ‘long 
long unsigned int’, but argument 2 has type ‘resource_size_t’

Please fix. And please test the thing. 

I suspect we should have some new warnings are errors thing for 
linux-next, so that people can't do this.

Linus
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [git pull] drm for 2.6.35-rc1 (revised)

2010-05-21 Thread Linus Torvalds 


On Sat, 22 May 2010, Stephen Rothwell wrote:
 
 That being said, I did not get the mentioned warning for either an i386
 or x86_64 allmodconfig build - I wonder why not?  Compiler differences?
 Config differences? (See
 http://kisskb.ellerman.id.au/kisskb/buildresult/2617918/ and
 http://kisskb.ellerman.id.au/kisskb/buildresult/2617928/).
 
 Ah, I did get it for an i386 defconfig build

You need to have 32-bit resources for it to trigger. So it ends up 
depending on CONFIG_PHYS_ADDR_T_64BIT. Which gets set for X86_PAE on x86.

Linus
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[RFC] Try a bit harder to get output on the screen at panic time

2010-05-21 Thread Maxim Levitsky 
On Thu, 2010-05-20 at 09:28 -0700, Jesse Barnes wrote: 
> On Thu, 20 May 2010 04:27:07 +0300
> Maxim Levitsky  wrote:
> 
> > On Thu, 2010-05-20 at 04:13 +0300, Maxim Levitsky wrote: 
> > > On Wed, 2010-05-19 at 17:34 -0700, Jesse Barnes wrote: 
> > > > On Fri, 9 Apr 2010 15:10:50 -0700
> > > > Jesse Barnes  wrote:
> > > > 
> > > > > This set of 3 patches makes it a little more likely we'll get panic
> > > > > output onto the screen even when X is running, assuming a KMS enabled
> > > > > stack anyway.
> > > > > 
> > > > > It gets me from a blank or very sparsely populated black screen at
> > > > > panic time, to one including the full backtrace and panic output at
> > > > > panic time (tested with "echo c > /proc/sysrq-trigger" from an X
> > > > > session).
> > > > > 
> > > > > It doesn't cover every case; for instance I think it'll fail when X 
> > > > > has
> > > > > disabled the display, but those cases need to be handled with separate
> > > > > patches anyway (need to add atomic DPMS paths for instance).
> > > > > 
> > > > > Anyway, please test these out and let me know if they work for you.
> > > > 
> > > > Ping Linus & Dave again.  Have you guys tried these?  Really, it's cool.
> > > > 
> > > Second that, just tested these patches, and these work perfectly.
> > > One more reason for me to dump nvidia driver for nouveau.
> > 
> > 
> > Unfortunately I spoke too soon.
> > 
> > 
> > After suspend to ram, system doesn't properly resume now.
> > 
> > My system is based on nvidia G86, I use latest nouveau drivers, and
> > suspend with compiz running.
> > 
> > I also patched kernel not to do vt switch on suspend/resume:
> > 
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
> > b/drivers/gpu/drm/nouveau/nouveau_state.c
> > index 062b7f6..b3ef08b 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_state.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
> > @@ -31,6 +31,7 @@
> > #include "drm_crtc_helper.h"
> > #include 
> > #include 
> > +#include 
> > 
> > #include "nouveau_drv.h"
> > #include "nouveau_drm.h"
> > @@ -771,6 +772,8 @@ int nouveau_load(struct drm_device *dev, unsigned
> > long flags)
> > int ret = nouveau_card_init(dev);
> > if (ret)
> > return ret;
> > +
> > +   pm_set_vt_switch(0);
> > }
> > 
> > return 0;
> 
> Hm I don't see how my patches would have affected suspend/resume, since
> they just add "oops_in_progress" checks to a few places.  Are you sure
> something else isn't breaking your resume path?
I am sure. I just reverted them, and everything works again.
I refer to 3 patches in this thread.

Best regards,
Maxim Levitsky


>

[git pull] drm for 2.6.35-rc1 (revised)

2010-05-21 Thread Dave Airlie 

Original pull details below: note new branch name, I didn't mean to use 
drm-next branch though the contents were totally correct.

Changes since prev req: I missed a nouveau fixes tree from Ben, its mainly 
displayport + i2c fixes for a bunch of Dell laptops we have them all in 
F13 already I think. there are also a few radeon kms fixes + another drm 
mode typo fix that came in over the last few days.

I'm on holidays until next week so let me know if there is anything wrong 
on your end as I'm really not meant to be compiling kernels instead of 
playing with my daughter.

Dave.

> This is a combined drm/agp tree.
> 
> Highlights:
> core: initial dev docs, agp scratch page support
> kms: framebuffer cleanup + improved disconnected monitor at boot handling, 
> lots of edid parser updates to bring us in line with the X.org code, 
> improved fbdev handover mechanism.
> 
> ttm: add AGP page pool support to increase AGP speed.
> 
> radeon kms: initial powermanagement support - for all radeon GPU families, 
> this needs more work but it really needs to be upstream so we can get some 
> feedback now. PM on GPUs is a very complex task. There are two modes of 
> operation a profile driven mode and a dynamic mode, the dynamic mode can 
> potentially save more power but is also more likely to glitch on screen.
> evergreen irq/basic accel hw setup code.
> full access to VRAM beyond PCI BAR
> 
> Intel kms:
> split intel agp driver into two drivers, one for AGP, one for GTT.
> move intel sdvo to proper encoder/connector organisation
> Intel Cougarpoint support
> 
> This merge has one patch in x86 land which is acked on the list by the 
> proper people.
> 
> Dave.
> 

The following changes since commit 722154e4cacf015161efe60009ae9be23d492296:
  Linus Torvalds (1):
Merge branch 'zerolen' of git://git.kernel.org/.../jgarzik/misc-2.6

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git 
drm-for-2.6.35

Adam Jackson (25):
  drm/edid: Fix secondary block fetch.
  drm/edid: Remove some misleading comments
  drm/edid: Remove a redundant check
  drm/edid: Reshuffle mode list construction to closer match the spec
  drm/edid: Add modes for Established Timings III section
  drm/edid: Remove arbitrary EDID extension limit
  drm/edid: Remove some silly comments
  drm/edid: Fix preferred mode parse for EDID 1.4
  drm/edid: Add test for monitor reduced blanking support.
  drm/edid: Extend range-based mode addition for EDID 1.4
  drm/edid: Fix the HDTV hack.
  drm/edid: Strengthen the algorithm for standard mode codes
  drm/edid: Add secondary GTF curve support
  drm/modes: Fix interlaced mode names
  drm/edid: Fix sync polarity for secondary GTF curve
  drm/edid: When checking duplicate standard modes, walked the probed list
  drm/i915: Allow LVDS on pipe A on gen4+
  drm/i915: Un-magic a DPCD register write
  drm/i915: Set sync polarity correctly on DisplayPort
  drm/i915/pch: Use minimal number of FDI lanes (v2)
  drm/i915: Use spatio-temporal dithering on PCH
  drm/i915: Make fbc control wrapper functions
  drm/i915: Fix DDC bus selection for multifunction SDVO
  drm/i915: Be extra careful about A/D matching for multifunction SDVO
  drm/edid: Fix 1024x768 at 85Hz

Alex Deucher (42):
  drm/radeon/kms: update atombios.h power tables for evergreen
  drm/radeon/kms: add support for evergreen power tables
  drm/radeon/kms/evergreen: add gart support
  drm/radeon/kms/evergreen: add soft reset function
  drm/radeon/kms/evergreen: implement gfx init
  drm/radeon/kms/evergreen: setup and enable the CP
  drm/radeon/kms/evergreen: implement irq support
  drm/radeon/kms/evergreen: add hpd support
  drm/radeon/kms/atom: disable the encoders in encoder_disable
  drm/radeon/kms: fix copy pasto in disable encoders patch
  drm/radeon/kms/atom: fix typo in LVDS panel info parsing
  drm/radeon/kms/combios: match lvds panel info parsing to ddx
  drm/radeon/kms: add gui_idle callback
  drm/radeon/kms: add support for gui idle interrupts (v4)
  drm/radeon/kms: wait for gpu idle before changing power mode
  drm/radeon/kms/atom/pm: rework power mode parsing
  drm/radeon/kms/pm: interate across crtcs for vblank
  drm/radeon/kms/pm: move pm state update to crtc functions
  drm/radeon/kms/pm: add asic specific callbacks for setting power state 
(v2)
  drm/radeon/kms/pm: add asic specific callbacks for getting power state 
(v2)
  drm/radeon/kms/pm: update display watermarks with power state changes
  drm/radeon/kms/atom: load hwmon drivers
  drm/radeon/kms/pm: don't enable pm if there is only on power state
  drm/radeon/kms/pm: clean power state printing
  drm/radeon/kms: minor pm cleanups
  drm/radeon/kms/pm: restore default power state on exit
  drm/radeon/kms/pm: add additional asic

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-dae...@freedesktop.org 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

--- Comment #10 from Alain Perrot  2010-05-21 
00:48:34 PDT ---
> Alain,
> 
> Its a tough call on who's is the better solution. Yours uses one less
> temp reg and mine will allow for a couple of operations to be done in
> parallel in the future. I guess we both deserve a pat on the back and
> leave it to someone more experienced to make the call on which one to
> choose.
> 
> Good job
> 
> Conn

You're probably right (and I known nothing about parallelization on GPUs).

In any way, many thanks for your help.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-dae...@freedesktop.org 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

--- Comment #11 from Conn Clark  2010-05-21 09:32:33 
PDT ---
On Fri, May 21, 2010 at 12:48 AM,   wrote:
> https://bugs.freedesktop.org/show_bug.cgi?id=27901
>
> --- Comment #10 from Alain Perrot  2010-05-21 
> 00:48:34 PDT ---
>> Alain,
>>
>> Its a tough call on who's is the better solution. Yours uses one less
>> temp reg and mine will allow for a couple of operations to be done in
>> parallel in the future. I guess we both deserve a pat on the back and
>> leave it to someone more experienced to make the call on which one to
>> choose.
>>
>> Good job
>>
>> Conn
>
> You're probably right (and I known nothing about parallelization on GPUs).
>
> In any way, many thanks for your help.
>
> --
> Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
> --- You are receiving this mail because: ---
> You are the assignee for the bug.
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>

Alain,

For the current code I think your patch a tad better. It uses one less
instruction. Short of benchmarking the two solutions I think yours is
the one that should go in. Would you please submit a patch that
includes the assemble_SCS function as well. After you submit it with
that change and a notice that you have singed off on it. I'll nominate
it over my own to go in.

Conn

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

[PATCH] drm/radeon/kms: release AGP bridge at suspend

2010-05-21 Thread Jerome Glisse 
I think it's good to release the AGP bridge at suspend
and reacquire it at resume. Also fix :
https://bugzilla.kernel.org/show_bug.cgi?id=15969

Signed-off-by: Jerome Glisse 
Cc: stable 
---
 drivers/gpu/drm/radeon/radeon.h|1 +
 drivers/gpu/drm/radeon/radeon_agp.c|5 +
 drivers/gpu/drm/radeon/radeon_device.c |2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 034218c..4c7204a 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -566,6 +566,7 @@ typedef int (*radeon_packet3_check_t)(struct 
radeon_cs_parser *p,
  */
 int radeon_agp_init(struct radeon_device *rdev);
 void radeon_agp_resume(struct radeon_device *rdev);
+void radeon_agp_suspend(struct radeon_device *rdev);
 void radeon_agp_fini(struct radeon_device *rdev);


diff --git a/drivers/gpu/drm/radeon/radeon_agp.c 
b/drivers/gpu/drm/radeon/radeon_agp.c
index 28e473f..f40dfb7 100644
--- a/drivers/gpu/drm/radeon/radeon_agp.c
+++ b/drivers/gpu/drm/radeon/radeon_agp.c
@@ -270,3 +270,8 @@ void radeon_agp_fini(struct radeon_device *rdev)
}
 #endif
 }
+
+void radeon_agp_suspend(struct radeon_device *rdev)
+{
+   radeon_agp_fini(rdev);
+}
diff --git a/drivers/gpu/drm/radeon/radeon_device.c 
b/drivers/gpu/drm/radeon/radeon_device.c
index 7b629e3..ed6a724 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -748,6 +748,8 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t 
state)
/* evict remaining vram memory */
radeon_bo_evict_vram(rdev);

+   radeon_agp_suspend(rdev);
+
pci_save_state(dev->pdev);
if (state.event == PM_EVENT_SUSPEND) {
/* Shut down the device */
-- 
1.7.0.1

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-dae...@freedesktop.org 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

Alain Perrot  changed:

   What|Removed |Added

  Attachment #35777|0   |1
is obsolete||

--- Comment #12 from Alain Perrot  2010-05-21 
11:13:05 PDT ---
Created an attachment (id=35787)
 View: https://bugs.freedesktop.org/attachment.cgi?id=35787
 Review: https://bugs.freedesktop.org/review?bug=27901=35787

Alternative assemble_TRIG and assemble_SCS fix

Conn,

Attached is the updated patch which includes the assemble_SCS function.
If it is ok for you, I will submit it (I guess that it should be sent to the
dri-devel mailing list ?)

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread Conn Clark 
On Fri, May 21, 2010 at 11:13 AM,   wrote:
> https://bugs.freedesktop.org/show_bug.cgi?id=27901
>
> Alain Perrot  changed:
>
> ? ? ? ? ? What ? ?|Removed ? ? ? ? ? ? ? ? ? ? |Added
> 
> ?Attachment #35777|0 ? ? ? ? ? ? ? ? ? ? ? ? ? |1
> ? ? ? ?is obsolete| ? ? ? ? ? ? ? ? ? ? ? ? ? ?|
>
> --- Comment #12 from Alain Perrot  2010-05-21 
> 11:13:05 PDT ---
> Created an attachment (id=35787)
> ?View: https://bugs.freedesktop.org/attachment.cgi?id=35787
> ?Review: https://bugs.freedesktop.org/review?bug=27901=35787
>
> Alternative assemble_TRIG and assemble_SCS fix
>
> Conn,
>
> Attached is the updated patch which includes the assemble_SCS function.
> If it is ok for you, I will submit it (I guess that it should be sent to the
> dri-devel mailing list ?)
>
> --
> Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
> --- You are receiving this mail because: ---
> You are the assignee for the bug.
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>

Alain,

Its on the mailing list.

I'll inform them to merge it after I run piglit and verify it works.

Conn

-- 

Conn O. Clark

Observation: In formal computer science advances are made
by standing on the shoulders of giants. Linux has proved
that if there are enough of you, you can advance just as
far by stepping on each others toes.

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-dae...@freedesktop.org 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

--- Comment #13 from Conn Clark  2010-05-21 11:56:36 
PDT ---
On Fri, May 21, 2010 at 11:13 AM,   wrote:
> https://bugs.freedesktop.org/show_bug.cgi?id=27901
>
> Alain Perrot  changed:
>
> ? ? ? ? ? What ? ?|Removed ? ? ? ? ? ? ? ? ? ? |Added
> 
> ?Attachment #35777|0 ? ? ? ? ? ? ? ? ? ? ? ? ? |1
> ? ? ? ?is obsolete| ? ? ? ? ? ? ? ? ? ? ? ? ? ?|
>
> --- Comment #12 from Alain Perrot  2010-05-21 
> 11:13:05 PDT ---
> Created an attachment (id=35787)
 View: https://bugs.freedesktop.org/attachment.cgi?id=35787
 Review: https://bugs.freedesktop.org/review?bug=27901=35787

> ?View: https://bugs.freedesktop.org/attachment.cgi?id=35787
> ?Review: https://bugs.freedesktop.org/review?bug=27901=35787
>
> Alternative assemble_TRIG and assemble_SCS fix
>
> Conn,
>
> Attached is the updated patch which includes the assemble_SCS function.
> If it is ok for you, I will submit it (I guess that it should be sent to the
> dri-devel mailing list ?)
>
> --
> Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
> --- You are receiving this mail because: ---
> You are the assignee for the bug.
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>

Alain,

Its on the mailing list.

I'll inform them to merge it after I run piglit and verify it works.

Conn

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

[git pull] drm for 2.6.35-rc1 (revised)

2010-05-21 Thread Randy Dunlap 
On Fri, 21 May 2010 11:56:39 -0700 (PDT) Linus Torvalds wrote:

> 
> 
> Grrr. Not well tested. On x86, I get several warnings like this:
> 
>   drivers/video/fbmem.c: In function ?fb_do_apertures_overlap?:
>   drivers/video/fbmem.c:1494: warning: format ?%llx? expects type ?long 
> long unsigned int?, but argument 2 has type ?resource_size_t?
> 
> Please fix. And please test the thing. 

I sent a patch for this a few days ago.  Below.

---
From: Randy Dunlap 

Fix printk formats:

drivers/video/fbmem.c: In function 'fb_do_apertures_overlap':
drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long 
unsigned int', but argument 2 has type 'resource_size_t'
drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long 
unsigned int', but argument 3 has type 'resource_size_t'
drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long 
unsigned int', but argument 4 has type 'resource_size_t'
drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long 
unsigned int', but argument 5 has type 'resource_size_t'

Signed-off-by: Randy Dunlap 
---
 drivers/video/fbmem.c |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

--- linux-next-20100519.orig/drivers/video/fbmem.c
+++ linux-next-20100519/drivers/video/fbmem.c
@@ -1491,7 +1491,10 @@ static bool fb_do_apertures_overlap(stru
for (j = 0; j < gena->count; ++j) {
struct aperture *g = >ranges[j];
printk(KERN_DEBUG "checking generic (%llx %llx) vs hw 
(%llx %llx)\n",
-   g->base, g->size, h->base, h->size);
+   (unsigned long long)g->base,
+   (unsigned long long)g->size,
+   (unsigned long long)h->base,
+   (unsigned long long)h->size);
if (apertures_overlap(g, h))
return true;
}

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-dae...@freedesktop.org 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

Conn Clark  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #14 from Conn Clark  2010-05-21 13:45:19 
PDT ---
Alain,

Your patch passes piglit.

I'm going to change the status of this bug now to FIXED


Conn

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

[Bug 27901] GLSL cos/sin functions broken on Mesa R600 driver

2010-05-21 Thread bugzilla-dae...@freedesktop.org 
https://bugs.freedesktop.org/show_bug.cgi?id=27901

--- Comment #15 from Alain Perrot  2010-05-21 
14:04:24 PDT ---
(In reply to comment #14)
> Alain,
> 
> Your patch passes piglit.
> 
> I'm going to change the status of this bug now to FIXED
> 
> 
> Conn

Ok, thanks.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

[RFC] Try a bit harder to get output on the screen at panic time

2010-05-21 Thread Jesse Barnes 
On Sat, 22 May 2010 00:57:30 +0300
Maxim Levitsky  wrote:

> On Fri, 2010-05-21 at 00:14 +0300, Maxim Levitsky wrote: 
> > On Thu, 2010-05-20 at 09:28 -0700, Jesse Barnes wrote: 
> > > On Thu, 20 May 2010 04:27:07 +0300
> > > Maxim Levitsky  wrote:
> > > 
> > > > On Thu, 2010-05-20 at 04:13 +0300, Maxim Levitsky wrote: 
> > > > > On Wed, 2010-05-19 at 17:34 -0700, Jesse Barnes wrote: 
> > > > > > On Fri, 9 Apr 2010 15:10:50 -0700
> > > > > > Jesse Barnes  wrote:
> > > > > > 
> > > > > > > This set of 3 patches makes it a little more likely we'll get 
> > > > > > > panic
> > > > > > > output onto the screen even when X is running, assuming a KMS 
> > > > > > > enabled
> > > > > > > stack anyway.
> > > > > > > 
> > > > > > > It gets me from a blank or very sparsely populated black screen at
> > > > > > > panic time, to one including the full backtrace and panic output 
> > > > > > > at
> > > > > > > panic time (tested with "echo c > /proc/sysrq-trigger" from an X
> > > > > > > session).
> > > > > > > 
> > > > > > > It doesn't cover every case; for instance I think it'll fail when 
> > > > > > > X has
> > > > > > > disabled the display, but those cases need to be handled with 
> > > > > > > separate
> > > > > > > patches anyway (need to add atomic DPMS paths for instance).
> > > > > > > 
> > > > > > > Anyway, please test these out and let me know if they work for 
> > > > > > > you.
> > > > > > 
> > > > > > Ping Linus & Dave again.  Have you guys tried these?  Really, it's 
> > > > > > cool.
> > > > > > 
> > > > > Second that, just tested these patches, and these work perfectly.
> > > > > One more reason for me to dump nvidia driver for nouveau.
> > > > 
> > > > 
> > > > Unfortunately I spoke too soon.
> > > > 
> > > > 
> > > > After suspend to ram, system doesn't properly resume now.
> > > > 
> > > > My system is based on nvidia G86, I use latest nouveau drivers, and
> > > > suspend with compiz running.
> > > > 
> > > > I also patched kernel not to do vt switch on suspend/resume:
> > > > 
> > > > diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
> > > > b/drivers/gpu/drm/nouveau/nouveau_state.c
> > > > index 062b7f6..b3ef08b 100644
> > > > --- a/drivers/gpu/drm/nouveau/nouveau_state.c
> > > > +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
> > > > @@ -31,6 +31,7 @@
> > > > #include "drm_crtc_helper.h"
> > > > #include 
> > > > #include 
> > > > +#include 
> > > > 
> > > > #include "nouveau_drv.h"
> > > > #include "nouveau_drm.h"
> > > > @@ -771,6 +772,8 @@ int nouveau_load(struct drm_device *dev, unsigned
> > > > long flags)
> > > > int ret = nouveau_card_init(dev);
> > > > if (ret)
> > > > return ret;
> > > > +
> > > > +   pm_set_vt_switch(0);
> > > > }
> > > > 
> > > > return 0;
> > > 
> > > Hm I don't see how my patches would have affected suspend/resume, since
> > > they just add "oops_in_progress" checks to a few places.  Are you sure
> > > something else isn't breaking your resume path?
> > I am sure. I just reverted them, and everything works again.
> > I refer to 3 patches in this thread.
> In fact I might look a bit silly, but I applied these patches on top of
> linus master tree + nouveau master, and suspend to ram works just fine.
> 
> Maybe it shows up when kgdb+kdb isn't compiled in or so.
> Maybe it just triggered some bug in nouveau drivers...
> 
> 
> (Note that I also enabled kgdb, and kdb, and breaking into kdb (SysRQ+g)
> doesn't switch console mode, just hangs till I press 'g'.

Ok so it sounds like these particular patches are innocent?

As for kdb, I think the latest tree is probably missing the graphics
switch support on the driver side...

-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] drm for 2.6.35-rc1 (revised)

2010-05-21 Thread Linus Torvalds 


Grrr. Not well tested. On x86, I get several warnings like this:

drivers/video/fbmem.c: In function ?fb_do_apertures_overlap?:
drivers/video/fbmem.c:1494: warning: format ?%llx? expects type ?long 
long unsigned int?, but argument 2 has type ?resource_size_t?

Please fix. And please test the thing. 

I suspect we should have some "new warnings are errors" thing for 
linux-next, so that people can't do this.

Linus

[git pull] drm for 2.6.35-rc1 (revised)

2010-05-21 Thread Linus Torvalds 


On Sat, 22 May 2010, Stephen Rothwell wrote:
> 
> That being said, I did not get the mentioned warning for either an i386
> or x86_64 allmodconfig build - I wonder why not?  Compiler differences?
> Config differences? (See
> http://kisskb.ellerman.id.au/kisskb/buildresult/2617918/ and
> http://kisskb.ellerman.id.au/kisskb/buildresult/2617928/).
> 
> Ah, I did get it for an i386 defconfig build

You need to have 32-bit resources for it to trigger. So it ends up 
depending on CONFIG_PHYS_ADDR_T_64BIT. Which gets set for X86_PAE on x86.

Linus

[PATCH]: nouveau and radeon checkstack fixes

2010-05-21 Thread Prarit Bhargava 
Fixes linux-next & linux-2.6 checkstack warnings:

drivers/gpu/drm/nouveau/nv40_graph.c: In function `nv40_graph_init':
drivers/gpu/drm/nouveau/nv40_graph.c:400: warning: the frame size of 1184 bytes 
is larger than 1024 bytes
drivers/gpu/drm/radeon/radeon_atombios.c: In function 
`radeon_get_atom_connector_info_from_supported_devices_table':
drivers/gpu/drm/radeon/radeon_atombios.c:857: warning: the frame size of 1872 
bytes is larger than 1024 bytes

Signed-off-by: Prarit Bhargava 

diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c 
b/drivers/gpu/drm/nouveau/nv40_graph.c
index 0616c96..3604394 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/nv40_graph.c
@@ -253,7 +253,11 @@ nv40_graph_init(struct drm_device *dev)

if (!dev_priv->engine.graph.ctxprog) {
struct nouveau_grctx ctx = {};
-   uint32_t cp[256];
+   uint32_t *cp;
+
+   cp = kmalloc(sizeof(*cp), GFP_KERNEL);
+   if (!cp)
+   return -ENOMEM;

ctx.dev = dev;
ctx.mode = NOUVEAU_GRCTX_PROG;
@@ -265,6 +269,8 @@ nv40_graph_init(struct drm_device *dev)
nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0);
for (i = 0; i < ctx.ctxprog_len; i++)
nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, cp[i]);
+
+   kfree(cp);
}

/* No context present currently */
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c 
b/drivers/gpu/drm/radeon/radeon_atombios.c
index 1d05deb..5ad208c 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -682,10 +682,18 @@ bool 
radeon_get_atom_connector_info_from_supported_devices_table(struct
uint8_t dac;
union atom_supported_devices *supported_devices;
int i, j, max_device;
-   struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
+   struct bios_connector *bios_connectors;
+   size_t bc_size = sizeof(*bios_connectors) * ATOM_MAX_SUPPORTED_DEVICE;

-   if (!atom_parse_data_header(ctx, index, , , , 
_offset))
+   bios_connectors = kzalloc(bc_size, GFP_KERNEL);
+   if (!bios_connectors)
+   return false;
+
+   if (!atom_parse_data_header(ctx, index, , , ,
+   _offset)) {
+   kfree(bios_connectors);
return false;
+   }   

supported_devices =
(union atom_supported_devices *)(ctx->bios + data_offset);
@@ -853,6 +861,7 @@ bool 
radeon_get_atom_connector_info_from_supported_devices_table(struct

radeon_link_encoder_connector(dev);

+   kfree(bios_connectors);
return true;
 }