[Bug 24973] [r300 KMS] KMS uses wrong display resulution, xrandr causes X to crash

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=24973

--- Comment #11 from Marius Groeger  2010-08-02 03:03:13 
PDT ---
I verified this issue is still present with 2.6.35rc6 and the current X
packages on xorg-edgers. Something new I noticed with Ubuntu 10.04: if I set
GRUB_GFXMODE=1400x1050 (the native resolution of the LVDS) in
/etc/defaults/grub, then the console actually uses the correct resolution.
Howerver, once X starts, the new FB switches to 800x600. The Xorg.0.log
indicates that S-Video is falsely detected as being connected, while in fact
nothing is attached. 

What can I do to further isolate the cause of this issue?

-- 
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: Glitch in newer drm-next/drm-radeon-testing

2010-08-02 Thread Marius Gröger

Am 07.06.2010 00:15, wrote Dave Airlie:

On Mon, Jun 7, 2010 at 3:52 AM, Marius Gröger
  wrote:

Am 06.06.2010 18:47, schrieb James Simmons:



Apologies for such an unspecific description, and for what almost seems
like a support request for MythTV. I wouldn't post here if I were not
100% sure it must be related with the recent drm changes.


Note that the DRM APIs are intended for use by userspace components of
graphics drivers / API libraries, not applications directly. MythTV
shouldn't use the DRM directly for synchronization but rather use GLX
synchronization APIs.


Tho not the case for MythTV on a embedded device requiring apps to use GLX
wuld be to heavy. I would agree libdrm should be used.


I have found the cause for the glitch and just filed
http://bugs.freedesktop.org/show_bug.cgi?id=28411.


Okay I can see the problem, now I have to think of a good solution,

I probably need to break down the locking a bit further which is a bit messy.


Is there any news on this issue? I didn't notice any commits to d-r-t or 
d-n WRT this, but then again those repos aren't updated very frequently 
anyway (how come?)


Thanks T& Regards,
Marius
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Glitch in newer drm-next/drm-radeon-testing

2010-08-02 Thread Dave Airlie
On Mon, Aug 2, 2010 at 8:12 PM, Marius Gröger
 wrote:
> Am 07.06.2010 00:15, wrote Dave Airlie:
>>
>> On Mon, Jun 7, 2010 at 3:52 AM, Marius Gröger
>>   wrote:
>>>
>>> Am 06.06.2010 18:47, schrieb James Simmons:

>> Apologies for such an unspecific description, and for what almost
>> seems
>> like a support request for MythTV. I wouldn't post here if I were not
>> 100% sure it must be related with the recent drm changes.
>
> Note that the DRM APIs are intended for use by userspace components of
> graphics drivers / API libraries, not applications directly. MythTV
> shouldn't use the DRM directly for synchronization but rather use GLX
> synchronization APIs.

 Tho not the case for MythTV on a embedded device requiring apps to use
 GLX
 wuld be to heavy. I would agree libdrm should be used.
>>>
>>> I have found the cause for the glitch and just filed
>>> http://bugs.freedesktop.org/show_bug.cgi?id=28411.
>>
>> Okay I can see the problem, now I have to think of a good solution,
>>
>> I probably need to break down the locking a bit further which is a bit
>> messy.
>
> Is there any news on this issue? I didn't notice any commits to d-r-t or d-n
> WRT this, but then again those repos aren't updated very frequently anyway
> (how come?)
>

Should be fixed in 2.6.35 final, 29508eb66bfacdef324d2199eeaea31e0cdfaa29
drm/radeon/kms: drop taking lock around crtc lookup.

Generally regression fixes go via the drm-fixes tree, the other trees
get rebased/updated as patches arrive, we didn't really have much for
d-r-t this cycle.

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


[PATCH] [drm-core-next] drm: Fixed coding style issues

2010-08-02 Thread Nicolas Kaiser
Fixed some brace, spacing and whitespace, printk, and
initialisation of statics and globals coding style issues.

Signed-off-by: Nicolas Kaiser 
---
Against drm-core-next.
Supersedes "drm: fixed brace, spacing and whitespace
coding style issues"

 drivers/gpu/drm/ati_pcigart.c   |9 ++--
 drivers/gpu/drm/drm_agpsupport.c|   15 +++
 drivers/gpu/drm/drm_auth.c  |2 +-
 drivers/gpu/drm/drm_bufs.c  |   48 ---
 drivers/gpu/drm/drm_context.c   |   17 +++
 drivers/gpu/drm/drm_crtc.c  |   53 -
 drivers/gpu/drm/drm_crtc_helper.c   |7 +--
 drivers/gpu/drm/drm_dma.c   |7 +--
 drivers/gpu/drm/drm_dp_i2c_helper.c |5 +-
 drivers/gpu/drm/drm_drawable.c  |3 +-
 drivers/gpu/drm/drm_drv.c   |9 +---
 drivers/gpu/drm/drm_edid.c  |   23 -
 drivers/gpu/drm/drm_fb_helper.c |   32 +++---
 drivers/gpu/drm/drm_fops.c  |8 ++--
 drivers/gpu/drm/drm_hashtab.c   |   13 ++---
 drivers/gpu/drm/drm_ioc32.c |1 -
 drivers/gpu/drm/drm_irq.c   |4 +-
 drivers/gpu/drm/drm_lock.c  |   11 ++---
 drivers/gpu/drm/drm_memory.c|   12 +++---
 drivers/gpu/drm/drm_mm.c|   12 ++---
 drivers/gpu/drm/drm_modes.c |3 +-
 drivers/gpu/drm/drm_pci.c   |6 +--
 drivers/gpu/drm/drm_proc.c  |2 +-
 drivers/gpu/drm/drm_scatter.c   |4 +-
 drivers/gpu/drm/drm_sman.c  |   34 --
 drivers/gpu/drm/drm_stub.c  |   24 +-
 drivers/gpu/drm/drm_sysfs.c |   86 +-
 drivers/gpu/drm/drm_vm.c|7 +--
 28 files changed, 195 insertions(+), 262 deletions(-)

diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
index 17be051..a8df5e9 100644
--- a/drivers/gpu/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c
@@ -141,11 +141,10 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct 
drm_ati_pcigart_info *ga
pages = (entry->pages <= max_real_pages)
? entry->pages : max_real_pages;
 
-   if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
+   if (gart_info->gart_table_location == DRM_ATI_GART_MAIN)
memset(pci_gart, 0, max_ati_pages * sizeof(u32));
-   } else {
+   else
memset_io((void __iomem *)map->handle, 0, max_ati_pages * 
sizeof(u32));
-   }
 
gart_idx = 0;
for (i = 0; i < pages; i++) {
@@ -164,7 +163,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct 
drm_ati_pcigart_info *ga
for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
u32 val;
 
-   switch(gart_info->gart_reg_if) {
+   switch (gart_info->gart_reg_if) {
case DRM_ATI_GART_IGP:
val = page_base | 0xc;
break;
@@ -193,7 +192,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct 
drm_ati_pcigart_info *ga
mb();
 #endif
 
-  done:
+done:
gart_info->addr = address;
gart_info->bus_addr = bus_address;
return ret;
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index ba38e01..91ca82d 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -71,7 +71,6 @@ int drm_agp_info(struct drm_device *dev, struct drm_agp_info 
*info)
 
return 0;
 }
-
 EXPORT_SYMBOL(drm_agp_info);
 
 int drm_agp_info_ioctl(struct drm_device *dev, void *data,
@@ -96,7 +95,7 @@ int drm_agp_info_ioctl(struct drm_device *dev, void *data,
  * Verifies the AGP device hasn't been acquired before and calls
  * \c agp_backend_acquire.
  */
-int drm_agp_acquire(struct drm_device * dev)
+int drm_agp_acquire(struct drm_device *dev)
 {
if (!dev->agp)
return -ENODEV;
@@ -107,7 +106,6 @@ int drm_agp_acquire(struct drm_device * dev)
dev->agp->acquired = 1;
return 0;
 }
-
 EXPORT_SYMBOL(drm_agp_acquire);
 
 /**
@@ -136,7 +134,7 @@ int drm_agp_acquire_ioctl(struct drm_device *dev, void 
*data,
  *
  * Verifies the AGP device has been acquired and calls \c agp_backend_release.
  */
-int drm_agp_release(struct drm_device * dev)
+int drm_agp_release(struct drm_device *dev)
 {
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
@@ -162,7 +160,7 @@ int drm_agp_release_ioctl(struct drm_device *dev, void 
*data,
  * Verifies the AGP device has been acquired but not enabled, and calls
  * \c agp_enable.
  */
-int drm_agp_enable(struct drm_device * dev, struct drm_agp_mode mode)
+int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode)
 {
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
@@ -172,7 +170,6 @@ int drm_agp_enable(struct drm_device * dev, struct 
drm_agp_mode mode)
dev->agp->enabled = 1;

[Bug 29355] New: M92 : Xserver fails to start

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29355

   Summary: M92 : Xserver fails to start
   Product: Mesa
   Version: unspecified
  Platform: x86-64 (AMD64)
OS/Version: All
Status: NEW
  Severity: critical
  Priority: medium
 Component: Drivers/DRI/R600
AssignedTo: dri-devel@lists.freedesktop.org
ReportedBy: hysv...@gmail.com


Created an attachment (id=37517)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37517)
xorg.log

KMS Driver Stack details :
=

1)Kernel-2.6.32-21-generic-pae   
2)Libdrm-2.4.19   
3)Mesa-7.8-rc2
4)Xorg-server-1.7.4  
5)ddx: xf86-video-ati-6.13.0 


System Environment :
===

O.S. - Ubuntu-10.04(64 bit)
Asic - M92 RadeonHD 4330(955F)
CPU  - AMD Athlon(tm) 64 FX-60 Dual Core proces...@2.60 GHz


Steps to Reproduce:
===

# startx 

1)X server fails to start with the message "(EE) No devices detected"

2)The issue is specific to M92 and is not reproduced with other Asics.

-- 
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 29355] M92 : Xserver fails to start

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29355

--- Comment #1 from samit vats  2010-08-02 03:41:28 PDT ---
Created an attachment (id=37518)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37518)
xorg.conf

-- 
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 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #3 from Pavel Ondračka  2010-08-02 06:41:10 PDT 
---
(In reply to comment #2)
> As a quick workaround you could modify Wine to use a slightly smaller array in
> shader_generate_glsl_declarations(), but we can't do that in general in Wine,
> because some applications depend on being able to use the higher indices, even
> if the total number of constants they use is nowhere near the limit.

I've had a look at shader_generate_glsl_declarations() function, however it is
quite complicated and I don't have any clue how to do this. I don't even know
if we are talking about some one liner patch or complete rewrite of this
function :-( Henri, if this is just a simple change would you be so kind to
write this patch for me, please? I don't know if this issue is going to be
fixed in the r300g driver any time soon.

-- 
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 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #4 from Henri Verbeet  2010-08-02 06:52:06 PDT 
---
Created an attachment (id=37525)
 View: https://bugs.freedesktop.org/attachment.cgi?id=37525
 Review: https://bugs.freedesktop.org/review?bug=29137&attachment=37525

wined3d hack

Something along the lines of the attached patch. You don't necessarily need the
changes in shader.c, but they avoid a similar problem.

-- 
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 24973] [r300 KMS] KMS uses wrong display resulution, xrandr causes X to crash

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=24973

--- Comment #12 from Alex Deucher  2010-08-02 07:25:08 PDT ---
(In reply to comment #11)
> I verified this issue is still present with 2.6.35rc6 and the current X
> packages on xorg-edgers. Something new I noticed with Ubuntu 10.04: if I set
> GRUB_GFXMODE=1400x1050 (the native resolution of the LVDS) in
> /etc/defaults/grub, then the console actually uses the correct resolution.
> Howerver, once X starts, the new FB switches to 800x600. The Xorg.0.log
> indicates that S-Video is falsely detected as being connected, while in fact
> nothing is attached. 
> 
> What can I do to further isolate the cause of this issue?

Unfortunately, load detection for tv-out is inherently unreliable on a lot of
boards (You can end up with false positives and false negatives).  The best
option is to force the tv-out connection on or off in your console or xorg
config.

-- 
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 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #5 from Pavel Ondračka  2010-08-02 07:31:59 PDT 
---
(In reply to comment #4)
> Created an attachment (id=37525)
 View: https://bugs.freedesktop.org/attachment.cgi?id=37525
 Review: https://bugs.freedesktop.org/review?bug=29137&attachment=37525

> wined3d hack
> 
> Something along the lines of the attached patch. You don't necessarily need 
> the
> changes in shader.c, but they avoid a similar problem.

Thank you with this hack Sins of a Solar Empire is working fine.

-- 
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 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #6 from Marek Olšák  2010-08-02 07:40:17 PDT ---
It won't certainly get fixed in r300g, we would have to reorder constants every
draw call, which would incur noticable perfomance drop (in Gallium, constant
buffers may be reused for several different shaders).

It might get fixed in the GLSL compiler, though, which resides in Mesa core.
I'd rather wait until Intel merge their new GLSL compiler before looking into
this issue.

-- 
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 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #7 from Pavel Ondračka  2010-08-02 07:57:10 PDT 
---
One last question. Is it OK to report bugs spotted with this hack applied?

-- 
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 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #8 from Henri Verbeet  2010-08-02 08:10:10 PDT 
---
(In reply to comment #7)
> One last question. Is it OK to report bugs spotted with this hack applied?

The patch is fairly safe, but in general you shouldn't report (Wine) bugs with
modified source. The other consideration is that at least currently there's a
reasonably high chance that any (D3D/OpenGL) bugs you'll run into will be in
the driver instead of Wine. I'm certainly willing to help if there's anything I
can do to help track those down, but Wine bugzilla isn't the place for it.

-- 
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: [PATCH] drm: fixed brace, spacing and whitespace coding style issues

2010-08-02 Thread Jesse Barnes
On Mon, 02 Aug 2010 10:16:53 +1000
Dave Airlie  wrote:

> On Wed, 2010-07-14 at 16:11 +0200, Nicolas Kaiser wrote:
> > Fixed brace, spacing and whitespace coding style issues.
> 
> Failed to apply to drm-core-next, might always be a pain to get
> something like this to apply though, whitespace isn't top of my
> priorities most days.

I think you should just reject it, unless it comes as part of a series
with actual work in it.  At least that's been my policy lately...

-- 
Jesse Barnes, Intel Open Source Technology Center
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


[Bug 29020] [r300g] Wine d3d9 tests hardlock

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29020

Marek Olšák  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #8 from Marek Olšák  2010-08-02 08:40:36 PDT ---
Fixed by commit afa925066c158ac49e3b0f883f67debd8545bf26.

-- 
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 28615] [r300g] Hard freeze when running POP: Sands of time under wine

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28615

--- Comment #4 from Marek Olšák  2010-08-02 08:43:57 PDT ---
I've fixed the hardlock we were getting in wine tests. Could you please test
POP again?

-- 
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 29311] [r300g]: Compiz crashes when trying to start it with latest mesa master.

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29311

Marek Olšák  changed:

   What|Removed |Added

 Resolution|WONTFIX |FIXED

--- Comment #2 from Marek Olšák  2010-08-02 08:48:49 PDT ---
Fixed by commit aef4500ca4ae9e5bc57560c6f9a32d9ad892975b.

-- 
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 28993] [r300g] lightmap texture corruption in some games

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28993

--- Comment #4 from Marek Olšák  2010-08-02 08:54:15 PDT ---
Created an attachment (id=37526)
 View: https://bugs.freedesktop.org/attachment.cgi?id=37526
 Review: https://bugs.freedesktop.org/review?bug=28993&attachment=37526

possible workaround

Could you try this patch?

-- 
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 29355] M92 : Xserver fails to start

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29355

Alex Deucher  changed:

   What|Removed |Added

  Attachment #37517|application/octet-stream|text/plain
  mime type||
  Attachment #37517|0   |1
   is patch||

-- 
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 29355] M92 : Xserver fails to start

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29355

--- Comment #2 from Alex Deucher  2010-08-02 09:03:21 PDT ---
Since you are using kms, can you attach the dmesg output as well?

-- 
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 29355] M92 : Xserver fails to start

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29355

Alex Deucher  changed:

   What|Removed |Added

Product|Mesa|DRI
  Component|Drivers/DRI/R600|DRM/Radeon

-- 
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


[PATCH] drm/radeon/kms: handle the case of no active displays properly in the bandwidth code

2010-08-02 Thread Alex Deucher
Logic was:
if (mode0 && mode1)
else if (mode0)
else

Should be:
if (mode0 && mode1)
else if (mode0)
else if (mode1)

Otherwise we may end up calculating the priority regs with
unitialized values.

Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=16492

Signed-off-by: Alex Deucher 
Cc: sta...@kernel.org
---
 drivers/gpu/drm/radeon/rs690.c |   27 +--
 drivers/gpu/drm/radeon/rv515.c |   23 +--
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index f3a8c93..6fbb874 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -398,7 +398,9 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
struct drm_display_mode *mode1 = NULL;
struct rs690_watermark wm0;
struct rs690_watermark wm1;
-   u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt;
+   u32 tmp;
+   u32 d1mode_priority_a_cnt = S_006548_D1MODE_PRIORITY_A_OFF(1);
+   u32 d2mode_priority_a_cnt = S_006548_D1MODE_PRIORITY_A_OFF(1);
fixed20_12 priority_mark02, priority_mark12, fill_rate;
fixed20_12 a, b;
 
@@ -495,10 +497,6 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
d1mode_priority_a_cnt |= 
S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1);
d2mode_priority_a_cnt |= 
S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1);
}
-   WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
-   WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-   WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-   WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
} else if (mode0) {
if (dfixed_trunc(wm0.dbpp) > 64)
a.full = dfixed_mul(wm0.dbpp, wm0.num_line_pair);
@@ -528,13 +526,7 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
if (rdev->disp_priority == 2)
d1mode_priority_a_cnt |= 
S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1);
-   WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
-   WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-   WREG32(R_006D48_D2MODE_PRIORITY_A_CNT,
-   S_006D48_D2MODE_PRIORITY_A_OFF(1));
-   WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT,
-   S_006D4C_D2MODE_PRIORITY_B_OFF(1));
-   } else {
+   } else if (mode1) {
if (dfixed_trunc(wm1.dbpp) > 64)
a.full = dfixed_mul(wm1.dbpp, wm1.num_line_pair);
else
@@ -563,13 +555,12 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
d2mode_priority_a_cnt = dfixed_trunc(priority_mark12);
if (rdev->disp_priority == 2)
d2mode_priority_a_cnt |= 
S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1);
-   WREG32(R_006548_D1MODE_PRIORITY_A_CNT,
-   S_006548_D1MODE_PRIORITY_A_OFF(1));
-   WREG32(R_00654C_D1MODE_PRIORITY_B_CNT,
-   S_00654C_D1MODE_PRIORITY_B_OFF(1));
-   WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-   WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
}
+
+   WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
+   WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
+   WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
+   WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
 }
 
 uint32_t rs690_mc_rreg(struct radeon_device *rdev, uint32_t reg)
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index b951b87..4d6e860 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -927,7 +927,9 @@ void rv515_bandwidth_avivo_update(struct radeon_device 
*rdev)
struct drm_display_mode *mode1 = NULL;
struct rv515_watermark wm0;
struct rv515_watermark wm1;
-   u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt;
+   u32 tmp;
+   u32 d1mode_priority_a_cnt = MODE_PRIORITY_OFF;
+   u32 d2mode_priority_a_cnt = MODE_PRIORITY_OFF;
fixed20_12 priority_mark02, priority_mark12, fill_rate;
fixed20_12 a, b;
 
@@ -1001,10 +1003,6 @@ void rv515_bandwidth_avivo_update(struct radeon_device 
*rdev)
d1mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON;
d2mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON;
}
-   WREG32(D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
-   WREG32(D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-   WREG32(D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-   WREG32(D2MODE_PRIORITY_B_CNT

[Bug 29363] New: [r300g] Starcraft 2: "r300 VP: Compiler error"

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29363

   Summary: [r300g] Starcraft 2: "r300 VP: Compiler error"
   Product: Mesa
   Version: git
  Platform: Other
OS/Version: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: Drivers/DRI/r300
AssignedTo: dri-devel@lists.freedesktop.org
ReportedBy: dra...@centrum.cz


Created an attachment (id=37527)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37527)
terminal output

When running with Wine 1.3.0 patched with slightly modified hack from bug
29137, I'm now able to start Starcraft 2, menus are working OK, however in game
almost everything is black.
mesa: afa925066c158ac49e3b0f883f67debd8545bf26
GPU: RV530
kernel: 2.6.35

Some chosen terminal output, full log attached:

r300 VP: Compiler error:
Vertex program has too many instructions
Using a dummy shader instead.
If there's an 'unknown opcode' message, please file a bug report and attach
this log.

fixme:d3d_shader:print_glsl_info_log Error received from GLSL shader #27:
fixme:d3d_shader:print_glsl_info_log Note: 'for (tmpInt0 ... )' body is too
large/complex to unroll

I'm not sure if this is only r300g bug, because some users with intel graphic
cards reported similar issues at Wine bugzilla,
http://bugs.winehq.org/show_bug.cgi?id=22971. 

BTW disabling use of GLSL in Wine allows the terrain to be displayed more or
less properly, however units and buildings are still invisible

-- 
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 29363] [r300g] Starcraft 2: "r300 VP: Compiler error"

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29363

--- Comment #1 from Pavel Ondračka  2010-08-02 09:15:13 PDT 
---
Created an attachment (id=37528)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37528)
screenshot

-- 
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 29363] [r300g] Starcraft 2: "r300 VP: Compiler error"

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29363

--- Comment #2 from Tom Stellard  2010-08-02 09:22:37 PDT 
---
Can you run the program again with the environment variable RADEON_DEBUG=vp and
post the output.

-- 
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 29363] [r300g] Starcraft 2: "r300 VP: Compiler error"

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29363

--- Comment #3 from Pavel Ondračka  2010-08-02 09:50:35 PDT 
---
Created an attachment (id=37530)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37530)
output with RADEON_DEBUG=vp

-- 
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 28386] [KMS] echo standby > /sys/power/state hang machine forever

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28386

Andrew Randrianasulu  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Andrew Randrianasulu  2010-08-02 09:51:01 
PDT ---
(In reply to comment #3)
> (In reply to comment #2)
> > Is this a recent regression?  Has s/r worked previously for you with kms?
> 
> May be 0.5 year ago it was working, so not really recent. (I rarely use this
> mode).

It works now, with mainline kernel ( up to commit
a63ecd835f075b21d7d5cef9580447f5fbb36263 - Date:   Fri Jul 30 19:02:51 2010
-0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm )

-- 
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: 2.6.35-rc6-git6: Reported regressions from 2.6.34

2010-08-02 Thread Tejun Heo
Hello, Linus.

On 08/01/2010 08:01 PM, Linus Torvalds wrote:
> This has a proposed patch. I don't know what the status of it is, though. 
> Jens?
> 
>http://marc.info/?l=linux-kernel&m=127950018204029&w=2
> 
>> Bug-Entry   : http://bugzilla.kernel.org/show_bug.cgi?id=16393
>> Subject : kernel BUG at fs/block_dev.c:765!
>> Submitter   : Markus Trippelsdorf 
>> Date: 2010-07-14 13:52 (19 days old)
>> Message-ID  : <20100714135217.ga1...@arch.tripp.de>
>> References  : http://marc.info/?l=linux-kernel&m=127911564213748&w=2
> 
> This one is interesting. And I think I perhaps see where it's coming from.
> 
> bd_start_claiming() (through bd_prepare_to_claim()) has two separate
> success cases: either there was no holder (bd_claiming is NULL) or the
> new holder was already claiming it (bd_claiming == holder).
> 
> Note in particular the case of the holder _already_ holding it. What happens 
> is:
> 
>  - bd_start_claiming() succeeds because we had _already_ claimed it
> with the same holder
> 
>  - then some error happens, and we call bd_abort_claiming(), which
> does whole->bd_claiming = NULL;
> 
>  - the original holder thinks it still holds the bd, but it has been released!
> 
>  - a new claimer comes in, and succeeds because bd_claiming is now NULL.
> 
>  - we now have two "owners" of the bd, but bd_claiming only points to
> the second one.
> 
> I think bd_start_claiming() needs to do some kind of refcount for the
> nested holder case, and bd_abort_claiming() needs to decrement the
> refcount and only clear the bd_claiming field when it goes down to
> zero.
> 
> I dunno. Maybe there's something else going on, but it does look
> suspicious, and the above would explain the BUG_ON().

Yeah, that definitely sounds plausible.  I think the condition check
in bd_prepare_to_claim() should have been "if (whole->bd_claiming)"
instead of "if (whole->bd_claiming && whole->bd_claiming != holder)".
It doesn't make much sense to allow multiple parallel claiming
operations anyway and the comment above already says - "This function
fails if @bdev is already claimed by another holder and waits if
another claiming is in progress."

I'll try to build a test case and verify it.

Thank you.

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


[Bug 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #9 from Sven Arvidsson  2010-08-02 11:20:35 PDT ---
(In reply to comment #6)
> It won't certainly get fixed in r300g, we would have to reorder constants 
> every
> draw call, which would incur noticable perfomance drop (in Gallium, constant
> buffers may be reused for several different shaders).
> 
> It might get fixed in the GLSL compiler, though, which resides in Mesa core.
> I'd rather wait until Intel merge their new GLSL compiler before looking into
> this issue.

Dunno if it's of any help (it being both different hardware and not Gallium)
but the i965 driver works quite well with Wine+GLSL.

-- 
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 24973] [r300 KMS] KMS uses wrong display resulution, xrandr causes X to crash

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=24973

--- Comment #13 from Marius Groeger  2010-08-02 11:33:07 
PDT ---
(In reply to comment #12)
> Unfortunately, load detection for tv-out is inherently unreliable on a lot of
> boards (You can end up with false positives and false negatives).  The best
> option is to force the tv-out connection on or off in your console or xorg
> config.

Fair enough, however that's what I tried but it doesn't seem to work either. I
have this definition in xorg.conf:

  Section "Monitor"
  Identifier  "S-Video Monitor"
  Option  "Enabled" "false"
  EndSection

According to the Xorg.0.log it is picked up:

  (II) RADEON(0): Output S-video using monitor section S-Video Monitor

but then this:

  (II) RADEON(0): Output LVDS connected
  (II) RADEON(0): Output VGA-0 disconnected
  (II) RADEON(0): Output DVI-0 disconnected
  (II) RADEON(0): Output S-video connected
  (II) RADEON(0): Using exact sizes for initial modes
  (II) RADEON(0): Output LVDS using initial mode 800x600
  (II) RADEON(0): Output S-video using initial mode 800x600

Is there any other way to disable a connector? How to do it on the console?

-- 
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 24973] [r300 KMS] KMS uses wrong display resulution, xrandr causes X to crash

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=24973

--- Comment #14 from Alex Deucher  2010-08-02 11:57:53 PDT ---
(In reply to comment #13)
> (In reply to comment #12)
> > Unfortunately, load detection for tv-out is inherently unreliable on a lot 
> > of
> > boards (You can end up with false positives and false negatives).  The best
> > option is to force the tv-out connection on or off in your console or xorg
> > config.
> 
> Fair enough, however that's what I tried but it doesn't seem to work either. I
> have this definition in xorg.conf:
> 
>   Section "Monitor"
>   Identifier  "S-Video Monitor"
>   Option  "Enabled" "false"
>   EndSection


It's:
Option "Enable" "False"
However, some older xservers (maybe recent ones too), do not deal with enable
false, you need to use:
Option "Disable" "True"

-- 
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 28341] Flickering screen in Neverball on drm-radeon-testing

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28341

Mario Kleiner  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #30 from Mario Kleiner  2010-08-02 
12:11:45 PDT ---
Patch with fix now in mesa master. Closing as resolved.

-- 
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 28993] [r300g] lightmap texture corruption in some games

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28993

--- Comment #5 from Álmos  2010-08-02 12:27:12 PDT ---
Sadly, the patch has no apparent effect.

I tried to change the texture detail and to turn detail textures on and off in
ut2004, but the always same surfaces get corrupted. In the menu of doom3 the
mars is corrupted only if bump mapping is not enabled (I'm not entirely sure,
but it seems to me that only the clouds get corrupted).

-- 
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 28800] [r300c, r300g] Texture corruption with World of Warcraft

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28800

--- Comment #12 from Chris Rankin  2010-08-02 13:48:41 
PDT ---
(In reply to comment #11)
> Could you try this patch?

Sorry, that made no difference.

-- 
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 29367] New: [KMS] Assertion `boi->space_accounted' failed. on rv280

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29367

   Summary: [KMS]  Assertion `boi->space_accounted' failed. on
rv280
   Product: Mesa
   Version: git
  Platform: x86 (IA32)
OS/Version: Linux (All)
Status: NEW
  Severity: normal
  Priority: medium
 Component: Drivers/DRI/r200
AssignedTo: dri-devel@lists.freedesktop.org
ReportedBy: rand...@mail.ru


With latest mesa (commit 313df4156279f84ebc5b98a7540820b994762650
Author: Jerome Glisse 
Date:   Mon Aug 2 14:21:33 2010 -0400
   r600g: add autogenerated reg definition + debug print cleanup)

i have  very reproductable  bug with even glxgears, but also with ray demo. Ray
demo aborts at startup, glxgears window must be resized before bug kill it.

Xserver - commit a2c13f0d6548310e3cd115cf486d3e43edf23dcc
Author: Keith Packard 
Date:   Wed Jul 14 12:57:29 2010 -0700
Bump to version 1.8.99.905 (1.9 RC5)

libdrm - commit b803918f3f77c62edf22e78cb2095be399753423
Author: Chris Wilson 
Date:   Thu Jul 1 22:38:54 2010 +0100
drm mode: Return -errno on drmIoctl() failure

ddx - commit aca0a8669b538d58f018f95c9b22e6b3ec1ffe50
Author: Gaetan Nadon 
Date:   Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements

kernel - drm-radeon-testing (also tried with 2.6.35) up to 
commit ab9e1f5966591dc3e811418e96ba04f284c52458
Author: Dave Airlie 
Date:   Tue Jul 13 11:11:11 2010 +1000
drm/radeon: add basic zmask/hiz support (v4)

---

Hw - rv280/agp.

-- 
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 29367] [KMS] Assertion `boi->space_accounted' failed. on rv280

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29367

--- Comment #1 from Andrew Randrianasulu  2010-08-02 14:41:40 
PDT ---
Created an attachment (id=37532)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37532)
gdb.txt from ray demo

I can easily produce more bt full , from glxgears for example, but not sure if
they have any  value for developers 

-- 
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 29367] [KMS] Assertion `boi->space_accounted' failed. on rv280

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29367

--- Comment #2 from Andrew Randrianasulu  2010-08-02 14:48:33 
PDT ---
vblank_mode=0 | 1 helps me avoid  this bug. But vblank_mode=2 expose bug, just
like default.

-- 
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


[PATCH] light weight drm fbdev panning

2010-08-02 Thread James Simmons

This patch uses the much lighter mode_set_base instead of calling a full 
mode set. Tested on a i915 netbook. Patch should be against drm-core-next.
 
Signed-By: James Simmons 

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 7196620..99889e3 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -730,15 +730,20 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo 
*var,
  struct fb_info *info)
 {
struct drm_fb_helper *fb_helper = info->par;
+   struct drm_crtc_helper_funcs *crtc_funcs;
struct drm_device *dev = fb_helper->dev;
struct drm_mode_set *modeset;
struct drm_crtc *crtc;
-   int ret = 0;
+   int ret = -ENXIO;
int i;
 
mutex_lock(&dev->mode_config.mutex);
for (i = 0; i < fb_helper->crtc_count; i++) {
crtc = fb_helper->crtc_info[i].mode_set.crtc;
+   crtc_funcs = crtc->helper_private;
+
+   if (!crtc_funcs->mode_set_base)
+   continue;
 
modeset = &fb_helper->crtc_info[i].mode_set;
 
@@ -746,7 +751,8 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
modeset->y = var->yoffset;
 
if (modeset->num_connectors) {
-   ret = crtc->funcs->set_config(modeset);
+   ret = crtc_funcs->mode_set_base(crtc, modeset->x,
+   modeset->y, crtc->fb);
if (!ret) {
info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset;
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


[Bug 29367] [KMS] Assertion `boi->space_accounted' failed. on rv280

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29367

--- Comment #3 from Andrew Randrianasulu  2010-08-02 15:22:26 
PDT ---
Forgot to say  - bug happens with compositing on, using e16's built-in
compositor (xrender-based)

-- 
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: [PATCH] light weight drm fbdev panning

2010-08-02 Thread Dave Airlie
On Tue, Aug 3, 2010 at 8:01 AM, James Simmons  wrote:
>
> This patch uses the much lighter mode_set_base instead of calling a full
> mode set. Tested on a i915 netbook. Patch should be against drm-core-next.

The kms code should always fallback if appropriate, I've definitely
seen some modesets I thought were triggered by the pan_display
codepath, so I'd expect if we add this, we might some base sets at the
wrong time. Unless we can prove we only get pan_displays when
expected.

Dave.

>
> Signed-By: James Simmons 
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 7196620..99889e3 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -730,15 +730,20 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo 
> *var,
>                              struct fb_info *info)
>  {
>        struct drm_fb_helper *fb_helper = info->par;
> +       struct drm_crtc_helper_funcs *crtc_funcs;
>        struct drm_device *dev = fb_helper->dev;
>        struct drm_mode_set *modeset;
>        struct drm_crtc *crtc;
> -       int ret = 0;
> +       int ret = -ENXIO;
>        int i;
>
>        mutex_lock(&dev->mode_config.mutex);
>        for (i = 0; i < fb_helper->crtc_count; i++) {
>                crtc = fb_helper->crtc_info[i].mode_set.crtc;
> +               crtc_funcs = crtc->helper_private;
> +
> +               if (!crtc_funcs->mode_set_base)
> +                       continue;
>
>                modeset = &fb_helper->crtc_info[i].mode_set;
>
> @@ -746,7 +751,8 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo 
> *var,
>                modeset->y = var->yoffset;
>
>                if (modeset->num_connectors) {
> -                       ret = crtc->funcs->set_config(modeset);
> +                       ret = crtc_funcs->mode_set_base(crtc, modeset->x,
> +                                                       modeset->y, crtc->fb);
>                        if (!ret) {
>                                info->var.xoffset = var->xoffset;
>                                info->var.yoffset = var->yoffset;
> ___
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


[PATCH] drm/radeon/kms/igp: sideport is AMD only

2010-08-02 Thread Alex Deucher
Intel variants don't support it.

Signed-off-by: Alex Deucher 
---
 drivers/gpu/drm/radeon/radeon_atombios.c |   15 ++-
 drivers/gpu/drm/radeon/radeon_combios.c  |4 
 drivers/gpu/drm/radeon/rs600.c   |1 -
 drivers/gpu/drm/radeon/rs690.c   |2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c 
b/drivers/gpu/drm/radeon/radeon_atombios.c
index 6df7bd5..3bc2bcd 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1032,21 +1032,18 @@ bool radeon_atombios_sideport_present(struct 
radeon_device *rdev)
u8 frev, crev;
u16 data_offset;
 
+   /* sideport is AMD only */
+   if (rdev->family == CHIP_RS600)
+   return false;
+
if (atom_parse_data_header(mode_info->atom_context, index, NULL,
   &frev, &crev, &data_offset)) {
igp_info = (union igp_info *)(mode_info->atom_context->bios +
  data_offset);
switch (crev) {
case 1:
-   /* AMD IGPS */
-   if ((rdev->family == CHIP_RS690) ||
-   (rdev->family == CHIP_RS740)) {
-   if (igp_info->info.ulBootUpMemoryClock)
-   return true;
-   } else {
-   if (igp_info->info.ucMemoryType & 0xf0)
-   return true;
-   }
+   if (igp_info->info.ulBootUpMemoryClock)
+   return true;
break;
case 2:
if (igp_info->info_2.ucMemoryType & 0x0f)
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c 
b/drivers/gpu/drm/radeon/radeon_combios.c
index cd2a6c2..5e1474c 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -693,6 +693,10 @@ bool radeon_combios_sideport_present(struct radeon_device 
*rdev)
struct drm_device *dev = rdev->ddev;
u16 igp_info;
 
+   /* sideport is AMD only */
+   if (rdev->family == CHIP_RS400)
+   return false;
+
igp_info = combios_get_table_offset(dev, 
COMBIOS_INTEGRATED_SYSTEM_INFO_TABLE);
 
if (igp_info) {
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 85cd911..cc05b23 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -696,7 +696,6 @@ void rs600_mc_init(struct radeon_device *rdev)
rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
base = RREG32_MC(R_04_MC_FB_LOCATION);
base = G_04_MC_FB_START(base) << 16;
-   rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
radeon_vram_location(rdev, &rdev->mc, base);
rdev->mc.gtt_base_align = 0;
radeon_gtt_location(rdev, &rdev->mc);
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 6fbb874..3e3f757 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -159,8 +159,8 @@ void rs690_mc_init(struct radeon_device *rdev)
rdev->mc.visible_vram_size = rdev->mc.aper_size;
base = RREG32_MC(R_000100_MCCFG_FB_LOCATION);
base = G_000100_MC_FB_START(base) << 16;
-   rs690_pm_info(rdev);
rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
+   rs690_pm_info(rdev);
radeon_vram_location(rdev, &rdev->mc, base);
rdev->mc.gtt_base_align = rdev->mc.gtt_size - 1;
radeon_gtt_location(rdev, &rdev->mc);
-- 
1.7.1.1

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


[Bug 29311] [r300g]: Compiz crashes when trying to start it with latest mesa master.

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29311

--- Comment #3 from Scott Moreau  2010-08-02 16:49:08 PDT ---
(In reply to comment #2)
> Fixed by commit aef4500ca4ae9e5bc57560c6f9a32d9ad892975b.

With latest mesa master the same symptoms persist here.

-- 
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: [Bugme-new] [Bug 16488] New: [i915] Framebuffer ID error after suspend/hibernate leading to X crash

2010-08-02 Thread Andrew Morton

(switched to email.  Please respond via emailed reply-to-all, not via the
bugzilla web interface).

On Sun, 1 Aug 2010 08:55:49 GMT
bugzilla-dae...@bugzilla.kernel.org wrote:

> https://bugzilla.kernel.org/show_bug.cgi?id=16488

Innocuous-looking one-liner is said to have made Milan's X server even
worse than normal.

>Summary: [i915] Framebuffer ID error after suspend/hibernate
> leading to X crash
>Product: Drivers
>Version: 2.5
>   Platform: All
> OS/Version: Linux
>   Tree: Mainline
> Status: NEW
>   Severity: high
>   Priority: P1
>  Component: Video(DRI - Intel)
> AssignedTo: drivers_video-dri-in...@kernel-bugs.osdl.org
> ReportedBy: nalimi...@club.fr
> CC: ch...@chris-wilson.co.uk
> Regression: Yes
> 
> 
> I've been experiencing X freezes and crashes for more than a year, and with
> every kernel version the cause of the bug changes. After Linus pushed
> 985b823b919273fe1327d56d2196b4f92e5d0fae to 2.6.35rc6 (see below [2]), I'm now
> getting an "invalid framebuffer id" error that kills my X server. Before that
> commit, I was getting an oops, which was reported in bugs.fd.o as [1].
> 
> 
> /var/log/kern.log:
> [ 1467.408347] PM: Finishing wakeup.
> [ 1467.408350] Restarting tasks ... done.
> [ 1467.434616] [drm:drm_mode_getfb] *ERROR* invalid framebuffer id
> [ 1467.747233] sky2 :02:00.0: eth0: enabling interface [...]
> [ 1512.204160] [drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed...
> GPU hung
> [ 1512.205452] [drm:i915_do_wait_request] *ERROR* i915_do_wait_request returns
> -5 (awaiting 11072 at 11071)
> 
> 
> At this point, the X server is killed, and won't restart:
> Fatal server error:
> Failed to submit batchbuffer: Input/output error
> 
> 
> Excerpt from lspci -vnn:
> 00:02.1 Display controller [0380]: Intel Corporation Mobile 915GM/GMS/910GML
> Express Graphics Controller [8086:2792] (rev 03)
> Subsystem: Toshiba America Info Systems Device [1179:ff00]
> Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr-
> Stepping- SERR- FastB2B- DisINTx-
> Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- 
>  SERR-  Region 0: Memory at 6400 (32-bit, non-prefetchable) [disabled]
> [size=512K]
> Capabilities: [d0] Power Management version 2
> Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA
> PME(D0-,D1-,D2-,D3hot-,D3cold-)
> Status: D0 PME-Enable- DSel=0 DScale=0 PME-
> 
> 
> 1: https://bugs.freedesktop.org/show_bug.cgi?id=26974
> 2:
> commit 985b823b919273fe1327d56d2196b4f92e5d0fae
> Author: Linus Torvalds 
> Date:   Fri Jul 2 10:04:42 2010 +1000
> 
> drm/i915: fix hibernation since i915 self-reclaim fixes
> 
> Since commit 4bdadb9785696439c6e2b3efe34aa76df1149c83 ("drm/i915:
> Selectively enable self-reclaim"), we've been passing GFP_MOVABLE to the
> i915 page allocator where we weren't before due to some over-eager
> removal of the page mapping gfp_flags games the code used to play.
> 
> This caused hibernate on Intel hardware to result in a lot of memory
> corruptions on resume.  See for example
> 
>   http://bugzilla.kernel.org/show_bug.cgi?id=13811
> 
> -- 
> Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email
> --- You are receiving this mail because: ---
> You are on the CC list for the bug.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


[Bug 28800] [r300c, r300g] Texture corruption with World of Warcraft

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28800

--- Comment #13 from Chris Rankin  2010-08-02 17:25:43 
PDT ---
I have just upgraded this machine from 2.6.33.6 to 2.6.34.2 and have discovered
that the texture corruption is now *massively* reduced. There are still
artifacts here and there if I look closely, but the large blocks of mangled
textures have gone!

Switching back to 2.6.33.6 makes the corruption reappear.

I'm stunned. I should probably also mention now that I am using KMS.

-- 
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


[PATCH] expand gamma_set

2010-08-02 Thread James Simmons

Expand the crtc_gamma_set function to accept a starting offset. The 
reason for this is to eventually use this function for setcolreg from 
drm_fb_helper.c. The fbdev colormap function can start at any offset in 
the color map.

Signed-by: James Simmons 

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 4c68f76..a06d1da 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2541,7 +2541,7 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev,
goto out;
}
 
-   crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);
+   crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, 
crtc->gamma_size);
 
 out:
mutex_unlock(&dev->mode_config.mutex);
diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index f879589..07a430c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4096,15 +4096,12 @@ void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 
*red, u16 *green,
 }
 
 static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
-u16 *blue, uint32_t size)
+u16 *blue, uint32_t start, uint32_t size)
 {
+   int end = (start + size > 256) ? 256 : start + size, i;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-   int i;
-
-   if (size != 256)
-   return;
 
-   for (i = 0; i < 256; i++) {
+   for (i = start; i < end; i++) {
intel_crtc->lut_r[i] = red[i] >> 8;
intel_crtc->lut_g[i] = green[i] >> 8;
intel_crtc->lut_b[i] = blue[i] >> 8;
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c 
b/drivers/gpu/drm/nouveau/nv04_crtc.c
index 1c20c08..88bb4ce 100644
--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
@@ -739,15 +739,13 @@ nv_crtc_gamma_load(struct drm_crtc *crtc)
 }
 
 static void
-nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t size)
+nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t 
start,
+ uint32_t size)
 {
+   int end = (start + size > 256) ? 256 : start + size, i;
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
-   int i;
-
-   if (size != 256)
-   return;
 
-   for (i = 0; i < 256; i++) {
+   for (i = start; i < end; i++) {
nv_crtc->lut.r[i] = r[i];
nv_crtc->lut.g[i] = g[i];
nv_crtc->lut.b[i] = b[i];
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c 
b/drivers/gpu/drm/nouveau/nv50_crtc.c
index 5d11ea1..2f5f2f2 100644
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
@@ -381,15 +381,12 @@ nv50_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
 
 static void
 nv50_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
-   uint32_t size)
+   uint32_t start, uint32_t size)
 {
+   int end = (start + size > 256) ? 256 : start + size, i;
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
-   int i;
-
-   if (size != 256)
-   return;
 
-   for (i = 0; i < 256; i++) {
+   for (i = start; i < end; i++) {
nv_crtc->lut.r[i] = r[i];
nv_crtc->lut.g[i] = g[i];
nv_crtc->lut.b[i] = b[i];
diff --git a/drivers/gpu/drm/radeon/radeon_display.c 
b/drivers/gpu/drm/radeon/radeon_display.c
index 283beed..64e69fd 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -161,17 +161,13 @@ void radeon_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 
*red, u16 *green,
 }
 
 static void radeon_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
- u16 *blue, uint32_t size)
+ u16 *blue, uint32_t start, uint32_t size)
 {
struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-   int i;
-
-   if (size != 256) {
-   return;
-   }
+   int end = (start + size > 256) ? 256 : start + size, i;
 
/* userspace palettes are always correct as is */
-   for (i = 0; i < 256; i++) {
+   for (i = start; i < end; i++) {
radeon_crtc->lut_r[i] = red[i] >> 6;
radeon_crtc->lut_g[i] = green[i] >> 6;
radeon_crtc->lut_b[i] = blue[i] >> 6;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c 
b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index cfaf690..2ff5cf7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -79,7 +79,7 @@ static void vmw_ldu_crtc_restore(struct drm_crtc *crtc)
 
 static void vmw_ldu_crtc_gamma_set(struct drm_crtc *crtc,
   u16 *r, u16 *g, u16 *b,
-  uint32_t size)
+  uint32_t start, uint32_t size)
 {
 }
 
di

[Bug 29311] [r300g]: Compiz crashes when trying to start it with latest mesa master.

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=29311

--- Comment #4 from Scott Moreau  2010-08-02 19:28:43 PDT ---
(In reply to comment #3)
> (In reply to comment #2)
> > Fixed by commit aef4500ca4ae9e5bc57560c6f9a32d9ad892975b.
> 
> With latest mesa master the same symptoms persist here.

DISREGARD this comment. It is indeed fixed (bug report # mixup)

-- 
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 28411] Output polling causes latency every 10 seconds

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28411

Marius Groeger  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Marius Groeger  2010-08-02 23:04:24 
PDT ---
Fixed in 2.6.35 final, 29508eb66bfacdef324d2199eeaea31e0cdfaa29
drm/radeon/kms: drop taking lock around crtc lookup.

Thanks Dave!

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
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 28459] [r300g] Heroes of Newerth slow and corrupted with libtxc_dxtn.so

2010-08-02 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=28459

--- Comment #17 from Fabio Pedretti  2010-08-02 23:59:18 
PDT ---
This is also fixed in 2.6.34.2.

-- 
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


[PATCH] drm: Cleanup after failing to create master->unique and dev->name

2010-08-02 Thread Dave Airlie
On Sat, 2010-07-24 at 19:34 +0100, Chris Wilson wrote:
> v2: Userspace (notably xf86-video-{intel,ati}) became confused when
> drmSetInterfaceVersion() started returning -EBUSY as they used a second
> call (the first done in drmOpen()) to check their master credentials.
> Since userspace wants to be able to repeatedly call
> drmSetInterfaceVersion() allow them to do so.
> 

care to rebase on drm-core-next?

this fails to apply since the drm platform changes.

Dave.




[PATCH] drm: fixed brace, spacing and whitespace coding style issues

2010-08-02 Thread Dave Airlie
On Wed, 2010-07-14 at 16:11 +0200, Nicolas Kaiser wrote:
> Fixed brace, spacing and whitespace coding style issues.

Failed to apply to drm-core-next, might always be a pain to get
something like this to apply though, whitespace isn't top of my
priorities most days.

Dave.



[Bug 24973] [r300 KMS] KMS uses wrong display resulution, xrandr causes X to crash

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=24973

--- Comment #11 from Marius Groeger  2010-08-02 
03:03:13 PDT ---
I verified this issue is still present with 2.6.35rc6 and the current X
packages on xorg-edgers. Something new I noticed with Ubuntu 10.04: if I set
GRUB_GFXMODE=1400x1050 (the native resolution of the LVDS) in
/etc/defaults/grub, then the console actually uses the correct resolution.
Howerver, once X starts, the new FB switches to 800x600. The Xorg.0.log
indicates that S-Video is falsely detected as being connected, while in fact
nothing is attached. 

What can I do to further isolate the cause of this issue?

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


Glitch in newer drm-next/drm-radeon-testing

2010-08-02 Thread Marius Gröger
Am 07.06.2010 00:15, wrote Dave Airlie:
> On Mon, Jun 7, 2010 at 3:52 AM, Marius Gr?ger
>   wrote:
>> Am 06.06.2010 18:47, schrieb James Simmons:
>>>
> Apologies for such an unspecific description, and for what almost seems
> like a support request for MythTV. I wouldn't post here if I were not
> 100% sure it must be related with the recent drm changes.

 Note that the DRM APIs are intended for use by userspace components of
 graphics drivers / API libraries, not applications directly. MythTV
 shouldn't use the DRM directly for synchronization but rather use GLX
 synchronization APIs.
>>>
>>> Tho not the case for MythTV on a embedded device requiring apps to use GLX
>>> wuld be to heavy. I would agree libdrm should be used.
>>
>> I have found the cause for the glitch and just filed
>> http://bugs.freedesktop.org/show_bug.cgi?id=28411.
>
> Okay I can see the problem, now I have to think of a good solution,
>
> I probably need to break down the locking a bit further which is a bit messy.

Is there any news on this issue? I didn't notice any commits to d-r-t or 
d-n WRT this, but then again those repos aren't updated very frequently 
anyway (how come?)

Thanks T& Regards,
Marius


Glitch in newer drm-next/drm-radeon-testing

2010-08-02 Thread Dave Airlie
On Mon, Aug 2, 2010 at 8:12 PM, Marius Gr?ger
 wrote:
> Am 07.06.2010 00:15, wrote Dave Airlie:
>>
>> On Mon, Jun 7, 2010 at 3:52 AM, Marius Gr?ger
>>  ?wrote:
>>>
>>> Am 06.06.2010 18:47, schrieb James Simmons:

>> Apologies for such an unspecific description, and for what almost
>> seems
>> like a support request for MythTV. I wouldn't post here if I were not
>> 100% sure it must be related with the recent drm changes.
>
> Note that the DRM APIs are intended for use by userspace components of
> graphics drivers / API libraries, not applications directly. MythTV
> shouldn't use the DRM directly for synchronization but rather use GLX
> synchronization APIs.

 Tho not the case for MythTV on a embedded device requiring apps to use
 GLX
 wuld be to heavy. I would agree libdrm should be used.
>>>
>>> I have found the cause for the glitch and just filed
>>> http://bugs.freedesktop.org/show_bug.cgi?id=28411.
>>
>> Okay I can see the problem, now I have to think of a good solution,
>>
>> I probably need to break down the locking a bit further which is a bit
>> messy.
>
> Is there any news on this issue? I didn't notice any commits to d-r-t or d-n
> WRT this, but then again those repos aren't updated very frequently anyway
> (how come?)
>

Should be fixed in 2.6.35 final, 29508eb66bfacdef324d2199eeaea31e0cdfaa29
drm/radeon/kms: drop taking lock around crtc lookup.

Generally regression fixes go via the drm-fixes tree, the other trees
get rebased/updated as patches arrive, we didn't really have much for
d-r-t this cycle.

Dave.


[PATCH] [drm-core-next] drm: Fixed coding style issues

2010-08-02 Thread Nicolas Kaiser
Fixed some brace, spacing and whitespace, printk, and
initialisation of statics and globals coding style issues.

Signed-off-by: Nicolas Kaiser 
---
Against drm-core-next.
Supersedes "drm: fixed brace, spacing and whitespace
coding style issues"

 drivers/gpu/drm/ati_pcigart.c   |9 ++--
 drivers/gpu/drm/drm_agpsupport.c|   15 +++
 drivers/gpu/drm/drm_auth.c  |2 +-
 drivers/gpu/drm/drm_bufs.c  |   48 ---
 drivers/gpu/drm/drm_context.c   |   17 +++
 drivers/gpu/drm/drm_crtc.c  |   53 -
 drivers/gpu/drm/drm_crtc_helper.c   |7 +--
 drivers/gpu/drm/drm_dma.c   |7 +--
 drivers/gpu/drm/drm_dp_i2c_helper.c |5 +-
 drivers/gpu/drm/drm_drawable.c  |3 +-
 drivers/gpu/drm/drm_drv.c   |9 +---
 drivers/gpu/drm/drm_edid.c  |   23 -
 drivers/gpu/drm/drm_fb_helper.c |   32 +++---
 drivers/gpu/drm/drm_fops.c  |8 ++--
 drivers/gpu/drm/drm_hashtab.c   |   13 ++---
 drivers/gpu/drm/drm_ioc32.c |1 -
 drivers/gpu/drm/drm_irq.c   |4 +-
 drivers/gpu/drm/drm_lock.c  |   11 ++---
 drivers/gpu/drm/drm_memory.c|   12 +++---
 drivers/gpu/drm/drm_mm.c|   12 ++---
 drivers/gpu/drm/drm_modes.c |3 +-
 drivers/gpu/drm/drm_pci.c   |6 +--
 drivers/gpu/drm/drm_proc.c  |2 +-
 drivers/gpu/drm/drm_scatter.c   |4 +-
 drivers/gpu/drm/drm_sman.c  |   34 --
 drivers/gpu/drm/drm_stub.c  |   24 +-
 drivers/gpu/drm/drm_sysfs.c |   86 +-
 drivers/gpu/drm/drm_vm.c|7 +--
 28 files changed, 195 insertions(+), 262 deletions(-)

diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
index 17be051..a8df5e9 100644
--- a/drivers/gpu/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c
@@ -141,11 +141,10 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct 
drm_ati_pcigart_info *ga
pages = (entry->pages <= max_real_pages)
? entry->pages : max_real_pages;

-   if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
+   if (gart_info->gart_table_location == DRM_ATI_GART_MAIN)
memset(pci_gart, 0, max_ati_pages * sizeof(u32));
-   } else {
+   else
memset_io((void __iomem *)map->handle, 0, max_ati_pages * 
sizeof(u32));
-   }

gart_idx = 0;
for (i = 0; i < pages; i++) {
@@ -164,7 +163,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct 
drm_ati_pcigart_info *ga
for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
u32 val;

-   switch(gart_info->gart_reg_if) {
+   switch (gart_info->gart_reg_if) {
case DRM_ATI_GART_IGP:
val = page_base | 0xc;
break;
@@ -193,7 +192,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct 
drm_ati_pcigart_info *ga
mb();
 #endif

-  done:
+done:
gart_info->addr = address;
gart_info->bus_addr = bus_address;
return ret;
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index ba38e01..91ca82d 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -71,7 +71,6 @@ int drm_agp_info(struct drm_device *dev, struct drm_agp_info 
*info)

return 0;
 }
-
 EXPORT_SYMBOL(drm_agp_info);

 int drm_agp_info_ioctl(struct drm_device *dev, void *data,
@@ -96,7 +95,7 @@ int drm_agp_info_ioctl(struct drm_device *dev, void *data,
  * Verifies the AGP device hasn't been acquired before and calls
  * \c agp_backend_acquire.
  */
-int drm_agp_acquire(struct drm_device * dev)
+int drm_agp_acquire(struct drm_device *dev)
 {
if (!dev->agp)
return -ENODEV;
@@ -107,7 +106,6 @@ int drm_agp_acquire(struct drm_device * dev)
dev->agp->acquired = 1;
return 0;
 }
-
 EXPORT_SYMBOL(drm_agp_acquire);

 /**
@@ -136,7 +134,7 @@ int drm_agp_acquire_ioctl(struct drm_device *dev, void 
*data,
  *
  * Verifies the AGP device has been acquired and calls \c agp_backend_release.
  */
-int drm_agp_release(struct drm_device * dev)
+int drm_agp_release(struct drm_device *dev)
 {
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
@@ -162,7 +160,7 @@ int drm_agp_release_ioctl(struct drm_device *dev, void 
*data,
  * Verifies the AGP device has been acquired but not enabled, and calls
  * \c agp_enable.
  */
-int drm_agp_enable(struct drm_device * dev, struct drm_agp_mode mode)
+int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode)
 {
if (!dev->agp || !dev->agp->acquired)
return -EINVAL;
@@ -172,7 +170,6 @@ int drm_agp_enable(struct drm_device * dev, struct 
drm_agp_mode mode)
dev->agp->enabled = 1;
ret

[Bug 29355] New: M92 : Xserver fails to start

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29355

   Summary: M92 : Xserver fails to start
   Product: Mesa
   Version: unspecified
  Platform: x86-64 (AMD64)
OS/Version: All
Status: NEW
  Severity: critical
  Priority: medium
 Component: Drivers/DRI/R600
AssignedTo: dri-devel at lists.freedesktop.org
ReportedBy: hysvats at gmail.com


Created an attachment (id=37517)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37517)
xorg.log

KMS Driver Stack details :
=

1)Kernel-2.6.32-21-generic-pae   
2)Libdrm-2.4.19   
3)Mesa-7.8-rc2
4)Xorg-server-1.7.4  
5)ddx: xf86-video-ati-6.13.0 


System Environment :
===

O.S. - Ubuntu-10.04(64 bit)
Asic - M92 RadeonHD 4330(955F)
CPU  - AMD Athlon(tm) 64 FX-60 Dual Core Processor at 2.60 GHz


Steps to Reproduce:
===

# startx 

1)X server fails to start with the message "(EE) No devices detected"

2)The issue is specific to M92 and is not reproduced with other Asics.

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


[Bug 29355] M92 : Xserver fails to start

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29355

--- Comment #1 from samit vats  2010-08-02 03:41:28 PDT 
---
Created an attachment (id=37518)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37518)
xorg.conf

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


[Bug 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #3 from Pavel Ondra?ka  2010-08-02 06:41:10 
PDT ---
(In reply to comment #2)
> As a quick workaround you could modify Wine to use a slightly smaller array in
> shader_generate_glsl_declarations(), but we can't do that in general in Wine,
> because some applications depend on being able to use the higher indices, even
> if the total number of constants they use is nowhere near the limit.

I've had a look at shader_generate_glsl_declarations() function, however it is
quite complicated and I don't have any clue how to do this. I don't even know
if we are talking about some one liner patch or complete rewrite of this
function :-( Henri, if this is just a simple change would you be so kind to
write this patch for me, please? I don't know if this issue is going to be
fixed in the r300g driver any time soon.

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


[Bug 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #4 from Henri Verbeet  2010-08-02 06:52:06 
PDT ---
Created an attachment (id=37525)
 View: https://bugs.freedesktop.org/attachment.cgi?id=37525
 Review: https://bugs.freedesktop.org/review?bug=29137&attachment=37525

wined3d hack

Something along the lines of the attached patch. You don't necessarily need the
changes in shader.c, but they avoid a similar problem.

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


[Bug 24973] [r300 KMS] KMS uses wrong display resulution, xrandr causes X to crash

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=24973

--- Comment #12 from Alex Deucher  2010-08-02 07:25:08 PDT 
---
(In reply to comment #11)
> I verified this issue is still present with 2.6.35rc6 and the current X
> packages on xorg-edgers. Something new I noticed with Ubuntu 10.04: if I set
> GRUB_GFXMODE=1400x1050 (the native resolution of the LVDS) in
> /etc/defaults/grub, then the console actually uses the correct resolution.
> Howerver, once X starts, the new FB switches to 800x600. The Xorg.0.log
> indicates that S-Video is falsely detected as being connected, while in fact
> nothing is attached. 
> 
> What can I do to further isolate the cause of this issue?

Unfortunately, load detection for tv-out is inherently unreliable on a lot of
boards (You can end up with false positives and false negatives).  The best
option is to force the tv-out connection on or off in your console or xorg
config.

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


[Bug 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #5 from Pavel Ondra?ka  2010-08-02 07:31:59 
PDT ---
(In reply to comment #4)
> Created an attachment (id=37525)
 View: https://bugs.freedesktop.org/attachment.cgi?id=37525
 Review: https://bugs.freedesktop.org/review?bug=29137&attachment=37525

> wined3d hack
> 
> Something along the lines of the attached patch. You don't necessarily need 
> the
> changes in shader.c, but they avoid a similar problem.

Thank you with this hack Sins of a Solar Empire is working fine.

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


[Bug 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #6 from Marek Ol??k  2010-08-02 07:40:17 PDT 
---
It won't certainly get fixed in r300g, we would have to reorder constants every
draw call, which would incur noticable perfomance drop (in Gallium, constant
buffers may be reused for several different shaders).

It might get fixed in the GLSL compiler, though, which resides in Mesa core.
I'd rather wait until Intel merge their new GLSL compiler before looking into
this issue.

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


[Bug 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #7 from Pavel Ondra?ka  2010-08-02 07:57:10 
PDT ---
One last question. Is it OK to report bugs spotted with this hack applied?

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


[Bug 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #8 from Henri Verbeet  2010-08-02 08:10:10 
PDT ---
(In reply to comment #7)
> One last question. Is it OK to report bugs spotted with this hack applied?

The patch is fairly safe, but in general you shouldn't report (Wine) bugs with
modified source. The other consideration is that at least currently there's a
reasonably high chance that any (D3D/OpenGL) bugs you'll run into will be in
the driver instead of Wine. I'm certainly willing to help if there's anything I
can do to help track those down, but Wine bugzilla isn't the place for it.

-- 
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: fixed brace, spacing and whitespace coding style issues

2010-08-02 Thread Jesse Barnes
On Mon, 02 Aug 2010 10:16:53 +1000
Dave Airlie  wrote:

> On Wed, 2010-07-14 at 16:11 +0200, Nicolas Kaiser wrote:
> > Fixed brace, spacing and whitespace coding style issues.
> 
> Failed to apply to drm-core-next, might always be a pain to get
> something like this to apply though, whitespace isn't top of my
> priorities most days.

I think you should just reject it, unless it comes as part of a series
with actual work in it.  At least that's been my policy lately...

-- 
Jesse Barnes, Intel Open Source Technology Center


[Bug 29020] [r300g] Wine d3d9 tests hardlock

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29020

Marek Ol??k  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #8 from Marek Ol??k  2010-08-02 08:40:36 PDT 
---
Fixed by commit afa925066c158ac49e3b0f883f67debd8545bf26.

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


[Bug 28615] [r300g] Hard freeze when running POP: Sands of time under wine

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28615

--- Comment #4 from Marek Ol??k  2010-08-02 08:43:57 PDT 
---
I've fixed the hardlock we were getting in wine tests. Could you please test
POP again?

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


[Bug 29311] [r300g]: Compiz crashes when trying to start it with latest mesa master.

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29311

Marek Ol??k  changed:

   What|Removed |Added

 Resolution|WONTFIX |FIXED

--- Comment #2 from Marek Ol??k  2010-08-02 08:48:49 PDT 
---
Fixed by commit aef4500ca4ae9e5bc57560c6f9a32d9ad892975b.

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


[Bug 28993] [r300g] lightmap texture corruption in some games

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28993

--- Comment #4 from Marek Ol??k  2010-08-02 08:54:15 PDT 
---
Created an attachment (id=37526)
 View: https://bugs.freedesktop.org/attachment.cgi?id=37526
 Review: https://bugs.freedesktop.org/review?bug=28993&attachment=37526

possible workaround

Could you try this patch?

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


[Bug 29355] M92 : Xserver fails to start

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29355

Alex Deucher  changed:

   What|Removed |Added

  Attachment #37517|application/octet-stream|text/plain
  mime type||
  Attachment #37517|0   |1
   is patch||

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


[Bug 29355] M92 : Xserver fails to start

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29355

--- Comment #2 from Alex Deucher  2010-08-02 09:03:21 PDT 
---
Since you are using kms, can you attach the dmesg output as well?

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


[Bug 29355] M92 : Xserver fails to start

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29355

Alex Deucher  changed:

   What|Removed |Added

Product|Mesa|DRI
  Component|Drivers/DRI/R600|DRM/Radeon

-- 
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: handle the case of no active displays properly in the bandwidth code

2010-08-02 Thread Alex Deucher
Logic was:
if (mode0 && mode1)
else if (mode0)
else

Should be:
if (mode0 && mode1)
else if (mode0)
else if (mode1)

Otherwise we may end up calculating the priority regs with
unitialized values.

Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=16492

Signed-off-by: Alex Deucher 
Cc: stable at kernel.org
---
 drivers/gpu/drm/radeon/rs690.c |   27 +--
 drivers/gpu/drm/radeon/rv515.c |   23 +--
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index f3a8c93..6fbb874 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -398,7 +398,9 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
struct drm_display_mode *mode1 = NULL;
struct rs690_watermark wm0;
struct rs690_watermark wm1;
-   u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt;
+   u32 tmp;
+   u32 d1mode_priority_a_cnt = S_006548_D1MODE_PRIORITY_A_OFF(1);
+   u32 d2mode_priority_a_cnt = S_006548_D1MODE_PRIORITY_A_OFF(1);
fixed20_12 priority_mark02, priority_mark12, fill_rate;
fixed20_12 a, b;

@@ -495,10 +497,6 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
d1mode_priority_a_cnt |= 
S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1);
d2mode_priority_a_cnt |= 
S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1);
}
-   WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
-   WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-   WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-   WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
} else if (mode0) {
if (dfixed_trunc(wm0.dbpp) > 64)
a.full = dfixed_mul(wm0.dbpp, wm0.num_line_pair);
@@ -528,13 +526,7 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
if (rdev->disp_priority == 2)
d1mode_priority_a_cnt |= 
S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1);
-   WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
-   WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-   WREG32(R_006D48_D2MODE_PRIORITY_A_CNT,
-   S_006D48_D2MODE_PRIORITY_A_OFF(1));
-   WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT,
-   S_006D4C_D2MODE_PRIORITY_B_OFF(1));
-   } else {
+   } else if (mode1) {
if (dfixed_trunc(wm1.dbpp) > 64)
a.full = dfixed_mul(wm1.dbpp, wm1.num_line_pair);
else
@@ -563,13 +555,12 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
d2mode_priority_a_cnt = dfixed_trunc(priority_mark12);
if (rdev->disp_priority == 2)
d2mode_priority_a_cnt |= 
S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1);
-   WREG32(R_006548_D1MODE_PRIORITY_A_CNT,
-   S_006548_D1MODE_PRIORITY_A_OFF(1));
-   WREG32(R_00654C_D1MODE_PRIORITY_B_CNT,
-   S_00654C_D1MODE_PRIORITY_B_OFF(1));
-   WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-   WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
}
+
+   WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
+   WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
+   WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
+   WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt);
 }

 uint32_t rs690_mc_rreg(struct radeon_device *rdev, uint32_t reg)
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index b951b87..4d6e860 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -927,7 +927,9 @@ void rv515_bandwidth_avivo_update(struct radeon_device 
*rdev)
struct drm_display_mode *mode1 = NULL;
struct rv515_watermark wm0;
struct rv515_watermark wm1;
-   u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt;
+   u32 tmp;
+   u32 d1mode_priority_a_cnt = MODE_PRIORITY_OFF;
+   u32 d2mode_priority_a_cnt = MODE_PRIORITY_OFF;
fixed20_12 priority_mark02, priority_mark12, fill_rate;
fixed20_12 a, b;

@@ -1001,10 +1003,6 @@ void rv515_bandwidth_avivo_update(struct radeon_device 
*rdev)
d1mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON;
d2mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON;
}
-   WREG32(D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt);
-   WREG32(D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt);
-   WREG32(D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt);
-   WREG32(D2MODE_PRIORITY_B_CNT

[Bug 29363] New: [r300g] Starcraft 2: "r300 VP: Compiler error"

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29363

   Summary: [r300g] Starcraft 2: "r300 VP: Compiler error"
   Product: Mesa
   Version: git
  Platform: Other
OS/Version: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: Drivers/DRI/r300
AssignedTo: dri-devel at lists.freedesktop.org
ReportedBy: drakkk at centrum.cz


Created an attachment (id=37527)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37527)
terminal output

When running with Wine 1.3.0 patched with slightly modified hack from bug
29137, I'm now able to start Starcraft 2, menus are working OK, however in game
almost everything is black.
mesa: afa925066c158ac49e3b0f883f67debd8545bf26
GPU: RV530
kernel: 2.6.35

Some chosen terminal output, full log attached:

r300 VP: Compiler error:
Vertex program has too many instructions
Using a dummy shader instead.
If there's an 'unknown opcode' message, please file a bug report and attach
this log.

fixme:d3d_shader:print_glsl_info_log Error received from GLSL shader #27:
fixme:d3d_shader:print_glsl_info_log Note: 'for (tmpInt0 ... )' body is too
large/complex to unroll

I'm not sure if this is only r300g bug, because some users with intel graphic
cards reported similar issues at Wine bugzilla,
http://bugs.winehq.org/show_bug.cgi?id=22971. 

BTW disabling use of GLSL in Wine allows the terrain to be displayed more or
less properly, however units and buildings are still invisible

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


[Bug 29363] [r300g] Starcraft 2: "r300 VP: Compiler error"

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29363

--- Comment #1 from Pavel Ondra?ka  2010-08-02 09:15:13 
PDT ---
Created an attachment (id=37528)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37528)
screenshot

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


[Bug 29363] [r300g] Starcraft 2: "r300 VP: Compiler error"

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29363

--- Comment #2 from Tom Stellard  2010-08-02 09:22:37 
PDT ---
Can you run the program again with the environment variable RADEON_DEBUG=vp and
post the output.

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


[Bug 29363] [r300g] Starcraft 2: "r300 VP: Compiler error"

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29363

--- Comment #3 from Pavel Ondra?ka  2010-08-02 09:50:35 
PDT ---
Created an attachment (id=37530)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37530)
output with RADEON_DEBUG=vp

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


[Bug 28386] [KMS] echo standby > /sys/power/state hang machine forever

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28386

Andrew Randrianasulu  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Andrew Randrianasulu  2010-08-02 
09:51:01 PDT ---
(In reply to comment #3)
> (In reply to comment #2)
> > Is this a recent regression?  Has s/r worked previously for you with kms?
> 
> May be 0.5 year ago it was working, so not really recent. (I rarely use this
> mode).

It works now, with mainline kernel ( up to commit
a63ecd835f075b21d7d5cef9580447f5fbb36263 - Date:   Fri Jul 30 19:02:51 2010
-0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm )

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


2.6.35-rc6-git6: Reported regressions from 2.6.34

2010-08-02 Thread Tejun Heo
Hello, Linus.

On 08/01/2010 08:01 PM, Linus Torvalds wrote:
> This has a proposed patch. I don't know what the status of it is, though. 
> Jens?
> 
>http://marc.info/?l=linux-kernel&m=127950018204029&w=2
> 
>> Bug-Entry   : http://bugzilla.kernel.org/show_bug.cgi?id=16393
>> Subject : kernel BUG at fs/block_dev.c:765!
>> Submitter   : Markus Trippelsdorf 
>> Date: 2010-07-14 13:52 (19 days old)
>> Message-ID  : <20100714135217.GA1797 at arch.tripp.de>
>> References  : http://marc.info/?l=linux-kernel&m=127911564213748&w=2
> 
> This one is interesting. And I think I perhaps see where it's coming from.
> 
> bd_start_claiming() (through bd_prepare_to_claim()) has two separate
> success cases: either there was no holder (bd_claiming is NULL) or the
> new holder was already claiming it (bd_claiming == holder).
> 
> Note in particular the case of the holder _already_ holding it. What happens 
> is:
> 
>  - bd_start_claiming() succeeds because we had _already_ claimed it
> with the same holder
> 
>  - then some error happens, and we call bd_abort_claiming(), which
> does whole->bd_claiming = NULL;
> 
>  - the original holder thinks it still holds the bd, but it has been released!
> 
>  - a new claimer comes in, and succeeds because bd_claiming is now NULL.
> 
>  - we now have two "owners" of the bd, but bd_claiming only points to
> the second one.
> 
> I think bd_start_claiming() needs to do some kind of refcount for the
> nested holder case, and bd_abort_claiming() needs to decrement the
> refcount and only clear the bd_claiming field when it goes down to
> zero.
> 
> I dunno. Maybe there's something else going on, but it does look
> suspicious, and the above would explain the BUG_ON().

Yeah, that definitely sounds plausible.  I think the condition check
in bd_prepare_to_claim() should have been "if (whole->bd_claiming)"
instead of "if (whole->bd_claiming && whole->bd_claiming != holder)".
It doesn't make much sense to allow multiple parallel claiming
operations anyway and the comment above already says - "This function
fails if @bdev is already claimed by another holder and waits if
another claiming is in progress."

I'll try to build a test case and verify it.

Thank you.

-- 
tejun


[Bug 29137] [r300g] troubles with wine and "r300: Max size of the constant buffer is 256*4 floats."

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29137

--- Comment #9 from Sven Arvidsson  2010-08-02 11:20:35 PDT ---
(In reply to comment #6)
> It won't certainly get fixed in r300g, we would have to reorder constants 
> every
> draw call, which would incur noticable perfomance drop (in Gallium, constant
> buffers may be reused for several different shaders).
> 
> It might get fixed in the GLSL compiler, though, which resides in Mesa core.
> I'd rather wait until Intel merge their new GLSL compiler before looking into
> this issue.

Dunno if it's of any help (it being both different hardware and not Gallium)
but the i965 driver works quite well with Wine+GLSL.

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


[Bug 24973] [r300 KMS] KMS uses wrong display resulution, xrandr causes X to crash

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=24973

--- Comment #13 from Marius Groeger  2010-08-02 
11:33:07 PDT ---
(In reply to comment #12)
> Unfortunately, load detection for tv-out is inherently unreliable on a lot of
> boards (You can end up with false positives and false negatives).  The best
> option is to force the tv-out connection on or off in your console or xorg
> config.

Fair enough, however that's what I tried but it doesn't seem to work either. I
have this definition in xorg.conf:

  Section "Monitor"
  Identifier  "S-Video Monitor"
  Option  "Enabled" "false"
  EndSection

According to the Xorg.0.log it is picked up:

  (II) RADEON(0): Output S-video using monitor section S-Video Monitor

but then this:

  (II) RADEON(0): Output LVDS connected
  (II) RADEON(0): Output VGA-0 disconnected
  (II) RADEON(0): Output DVI-0 disconnected
  (II) RADEON(0): Output S-video connected
  (II) RADEON(0): Using exact sizes for initial modes
  (II) RADEON(0): Output LVDS using initial mode 800x600
  (II) RADEON(0): Output S-video using initial mode 800x600

Is there any other way to disable a connector? How to do it on the console?

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


[Bug 24973] [r300 KMS] KMS uses wrong display resulution, xrandr causes X to crash

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=24973

--- Comment #14 from Alex Deucher  2010-08-02 11:57:53 PDT 
---
(In reply to comment #13)
> (In reply to comment #12)
> > Unfortunately, load detection for tv-out is inherently unreliable on a lot 
> > of
> > boards (You can end up with false positives and false negatives).  The best
> > option is to force the tv-out connection on or off in your console or xorg
> > config.
> 
> Fair enough, however that's what I tried but it doesn't seem to work either. I
> have this definition in xorg.conf:
> 
>   Section "Monitor"
>   Identifier  "S-Video Monitor"
>   Option  "Enabled" "false"
>   EndSection


It's:
Option "Enable" "False"
However, some older xservers (maybe recent ones too), do not deal with enable
false, you need to use:
Option "Disable" "True"

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


[Bug 28341] Flickering screen in Neverball on drm-radeon-testing

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28341

Mario Kleiner  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #30 from Mario Kleiner  
2010-08-02 12:11:45 PDT ---
Patch with fix now in mesa master. Closing as resolved.

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


[Bug 28993] [r300g] lightmap texture corruption in some games

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28993

--- Comment #5 from ?lmos  2010-08-02 12:27:12 PDT ---
Sadly, the patch has no apparent effect.

I tried to change the texture detail and to turn detail textures on and off in
ut2004, but the always same surfaces get corrupted. In the menu of doom3 the
mars is corrupted only if bump mapping is not enabled (I'm not entirely sure,
but it seems to me that only the clouds get corrupted).

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


[Bug 28800] [r300c, r300g] Texture corruption with World of Warcraft

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28800

--- Comment #12 from Chris Rankin  2010-08-02 
13:48:41 PDT ---
(In reply to comment #11)
> Could you try this patch?

Sorry, that made no difference.

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


[Bug 29367] New: [KMS] Assertion `boi->space_accounted' failed. on rv280

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29367

   Summary: [KMS]  Assertion `boi->space_accounted' failed. on
rv280
   Product: Mesa
   Version: git
  Platform: x86 (IA32)
OS/Version: Linux (All)
Status: NEW
  Severity: normal
  Priority: medium
 Component: Drivers/DRI/r200
AssignedTo: dri-devel at lists.freedesktop.org
ReportedBy: randrik at mail.ru


With latest mesa (commit 313df4156279f84ebc5b98a7540820b994762650
Author: Jerome Glisse 
Date:   Mon Aug 2 14:21:33 2010 -0400
   r600g: add autogenerated reg definition + debug print cleanup)

i have  very reproductable  bug with even glxgears, but also with ray demo. Ray
demo aborts at startup, glxgears window must be resized before bug kill it.

Xserver - commit a2c13f0d6548310e3cd115cf486d3e43edf23dcc
Author: Keith Packard 
Date:   Wed Jul 14 12:57:29 2010 -0700
Bump to version 1.8.99.905 (1.9 RC5)

libdrm - commit b803918f3f77c62edf22e78cb2095be399753423
Author: Chris Wilson 
Date:   Thu Jul 1 22:38:54 2010 +0100
drm mode: Return -errno on drmIoctl() failure

ddx - commit aca0a8669b538d58f018f95c9b22e6b3ec1ffe50
Author: Gaetan Nadon 
Date:   Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements

kernel - drm-radeon-testing (also tried with 2.6.35) up to 
commit ab9e1f5966591dc3e811418e96ba04f284c52458
Author: Dave Airlie 
Date:   Tue Jul 13 11:11:11 2010 +1000
drm/radeon: add basic zmask/hiz support (v4)

---

Hw - rv280/agp.

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


[Bug 29367] [KMS] Assertion `boi->space_accounted' failed. on rv280

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29367

--- Comment #1 from Andrew Randrianasulu  2010-08-02 
14:41:40 PDT ---
Created an attachment (id=37532)
 --> (https://bugs.freedesktop.org/attachment.cgi?id=37532)
gdb.txt from ray demo

I can easily produce more bt full , from glxgears for example, but not sure if
they have any  value for developers 

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


[Bug 29367] [KMS] Assertion `boi->space_accounted' failed. on rv280

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29367

--- Comment #2 from Andrew Randrianasulu  2010-08-02 
14:48:33 PDT ---
vblank_mode=0 | 1 helps me avoid  this bug. But vblank_mode=2 expose bug, just
like default.

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


[PATCH] light weight drm fbdev panning

2010-08-02 Thread James Simmons

This patch uses the much lighter mode_set_base instead of calling a full 
mode set. Tested on a i915 netbook. Patch should be against drm-core-next.

Signed-By: James Simmons 

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 7196620..99889e3 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -730,15 +730,20 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo 
*var,
  struct fb_info *info)
 {
struct drm_fb_helper *fb_helper = info->par;
+   struct drm_crtc_helper_funcs *crtc_funcs;
struct drm_device *dev = fb_helper->dev;
struct drm_mode_set *modeset;
struct drm_crtc *crtc;
-   int ret = 0;
+   int ret = -ENXIO;
int i;

mutex_lock(&dev->mode_config.mutex);
for (i = 0; i < fb_helper->crtc_count; i++) {
crtc = fb_helper->crtc_info[i].mode_set.crtc;
+   crtc_funcs = crtc->helper_private;
+
+   if (!crtc_funcs->mode_set_base)
+   continue;

modeset = &fb_helper->crtc_info[i].mode_set;

@@ -746,7 +751,8 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
modeset->y = var->yoffset;

if (modeset->num_connectors) {
-   ret = crtc->funcs->set_config(modeset);
+   ret = crtc_funcs->mode_set_base(crtc, modeset->x,
+   modeset->y, crtc->fb);
if (!ret) {
info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset;


[Bug 29367] [KMS] Assertion `boi->space_accounted' failed. on rv280

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29367

--- Comment #3 from Andrew Randrianasulu  2010-08-02 
15:22:26 PDT ---
Forgot to say  - bug happens with compositing on, using e16's built-in
compositor (xrender-based)

-- 
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/igp: sideport is AMD only

2010-08-02 Thread Alex Deucher
Intel variants don't support it.

Signed-off-by: Alex Deucher 
---
 drivers/gpu/drm/radeon/radeon_atombios.c |   15 ++-
 drivers/gpu/drm/radeon/radeon_combios.c  |4 
 drivers/gpu/drm/radeon/rs600.c   |1 -
 drivers/gpu/drm/radeon/rs690.c   |2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c 
b/drivers/gpu/drm/radeon/radeon_atombios.c
index 6df7bd5..3bc2bcd 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1032,21 +1032,18 @@ bool radeon_atombios_sideport_present(struct 
radeon_device *rdev)
u8 frev, crev;
u16 data_offset;

+   /* sideport is AMD only */
+   if (rdev->family == CHIP_RS600)
+   return false;
+
if (atom_parse_data_header(mode_info->atom_context, index, NULL,
   &frev, &crev, &data_offset)) {
igp_info = (union igp_info *)(mode_info->atom_context->bios +
  data_offset);
switch (crev) {
case 1:
-   /* AMD IGPS */
-   if ((rdev->family == CHIP_RS690) ||
-   (rdev->family == CHIP_RS740)) {
-   if (igp_info->info.ulBootUpMemoryClock)
-   return true;
-   } else {
-   if (igp_info->info.ucMemoryType & 0xf0)
-   return true;
-   }
+   if (igp_info->info.ulBootUpMemoryClock)
+   return true;
break;
case 2:
if (igp_info->info_2.ucMemoryType & 0x0f)
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c 
b/drivers/gpu/drm/radeon/radeon_combios.c
index cd2a6c2..5e1474c 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -693,6 +693,10 @@ bool radeon_combios_sideport_present(struct radeon_device 
*rdev)
struct drm_device *dev = rdev->ddev;
u16 igp_info;

+   /* sideport is AMD only */
+   if (rdev->family == CHIP_RS400)
+   return false;
+
igp_info = combios_get_table_offset(dev, 
COMBIOS_INTEGRATED_SYSTEM_INFO_TABLE);

if (igp_info) {
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 85cd911..cc05b23 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -696,7 +696,6 @@ void rs600_mc_init(struct radeon_device *rdev)
rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
base = RREG32_MC(R_04_MC_FB_LOCATION);
base = G_04_MC_FB_START(base) << 16;
-   rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
radeon_vram_location(rdev, &rdev->mc, base);
rdev->mc.gtt_base_align = 0;
radeon_gtt_location(rdev, &rdev->mc);
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 6fbb874..3e3f757 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -159,8 +159,8 @@ void rs690_mc_init(struct radeon_device *rdev)
rdev->mc.visible_vram_size = rdev->mc.aper_size;
base = RREG32_MC(R_000100_MCCFG_FB_LOCATION);
base = G_000100_MC_FB_START(base) << 16;
-   rs690_pm_info(rdev);
rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev);
+   rs690_pm_info(rdev);
radeon_vram_location(rdev, &rdev->mc, base);
rdev->mc.gtt_base_align = rdev->mc.gtt_size - 1;
radeon_gtt_location(rdev, &rdev->mc);
-- 
1.7.1.1



[Bug 29311] [r300g]: Compiz crashes when trying to start it with latest mesa master.

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29311

--- Comment #3 from Scott Moreau  2010-08-02 16:49:08 PDT 
---
(In reply to comment #2)
> Fixed by commit aef4500ca4ae9e5bc57560c6f9a32d9ad892975b.

With latest mesa master the same symptoms persist here.

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


[Bugme-new] [Bug 16488] New: [i915] Framebuffer ID error after suspend/hibernate leading to X crash

2010-08-02 Thread Andrew Morton

(switched to email.  Please respond via emailed reply-to-all, not via the
bugzilla web interface).

On Sun, 1 Aug 2010 08:55:49 GMT
bugzilla-daemon at bugzilla.kernel.org wrote:

> https://bugzilla.kernel.org/show_bug.cgi?id=16488

Innocuous-looking one-liner is said to have made Milan's X server even
worse than normal.

>Summary: [i915] Framebuffer ID error after suspend/hibernate
> leading to X crash
>Product: Drivers
>Version: 2.5
>   Platform: All
> OS/Version: Linux
>   Tree: Mainline
> Status: NEW
>   Severity: high
>   Priority: P1
>  Component: Video(DRI - Intel)
> AssignedTo: drivers_video-dri-intel at kernel-bugs.osdl.org
> ReportedBy: nalimilan at club.fr
> CC: chris at chris-wilson.co.uk
> Regression: Yes
> 
> 
> I've been experiencing X freezes and crashes for more than a year, and with
> every kernel version the cause of the bug changes. After Linus pushed
> 985b823b919273fe1327d56d2196b4f92e5d0fae to 2.6.35rc6 (see below [2]), I'm now
> getting an "invalid framebuffer id" error that kills my X server. Before that
> commit, I was getting an oops, which was reported in bugs.fd.o as [1].
> 
> 
> /var/log/kern.log:
> [ 1467.408347] PM: Finishing wakeup.
> [ 1467.408350] Restarting tasks ... done.
> [ 1467.434616] [drm:drm_mode_getfb] *ERROR* invalid framebuffer id
> [ 1467.747233] sky2 :02:00.0: eth0: enabling interface [...]
> [ 1512.204160] [drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed...
> GPU hung
> [ 1512.205452] [drm:i915_do_wait_request] *ERROR* i915_do_wait_request returns
> -5 (awaiting 11072 at 11071)
> 
> 
> At this point, the X server is killed, and won't restart:
> Fatal server error:
> Failed to submit batchbuffer: Input/output error
> 
> 
> Excerpt from lspci -vnn:
> 00:02.1 Display controller [0380]: Intel Corporation Mobile 915GM/GMS/910GML
> Express Graphics Controller [8086:2792] (rev 03)
> Subsystem: Toshiba America Info Systems Device [1179:ff00]
> Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr-
> Stepping- SERR- FastB2B- DisINTx-
> Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- 
>  SERR-  Region 0: Memory at 6400 (32-bit, non-prefetchable) [disabled]
> [size=512K]
> Capabilities: [d0] Power Management version 2
> Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA
> PME(D0-,D1-,D2-,D3hot-,D3cold-)
> Status: D0 PME-Enable- DSel=0 DScale=0 PME-
> 
> 
> 1: https://bugs.freedesktop.org/show_bug.cgi?id=26974
> 2:
> commit 985b823b919273fe1327d56d2196b4f92e5d0fae
> Author: Linus Torvalds 
> Date:   Fri Jul 2 10:04:42 2010 +1000
> 
> drm/i915: fix hibernation since i915 self-reclaim fixes
> 
> Since commit 4bdadb9785696439c6e2b3efe34aa76df1149c83 ("drm/i915:
> Selectively enable self-reclaim"), we've been passing GFP_MOVABLE to the
> i915 page allocator where we weren't before due to some over-eager
> removal of the page mapping gfp_flags games the code used to play.
> 
> This caused hibernate on Intel hardware to result in a lot of memory
> corruptions on resume.  See for example
> 
>   http://bugzilla.kernel.org/show_bug.cgi?id=13811
> 
> -- 
> Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email
> --- You are receiving this mail because: ---
> You are on the CC list for the bug.


[Bug 28800] [r300c, r300g] Texture corruption with World of Warcraft

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28800

--- Comment #13 from Chris Rankin  2010-08-02 
17:25:43 PDT ---
I have just upgraded this machine from 2.6.33.6 to 2.6.34.2 and have discovered
that the texture corruption is now *massively* reduced. There are still
artifacts here and there if I look closely, but the large blocks of mangled
textures have gone!

Switching back to 2.6.33.6 makes the corruption reappear.

I'm stunned. I should probably also mention now that I am using KMS.

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


[Bug 29311] [r300g]: Compiz crashes when trying to start it with latest mesa master.

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=29311

--- Comment #4 from Scott Moreau  2010-08-02 19:28:43 PDT 
---
(In reply to comment #3)
> (In reply to comment #2)
> > Fixed by commit aef4500ca4ae9e5bc57560c6f9a32d9ad892975b.
> 
> With latest mesa master the same symptoms persist here.

DISREGARD this comment. It is indeed fixed (bug report # mixup)

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


[Bug 28411] Output polling causes latency every 10 seconds

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28411

Marius Groeger  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Marius Groeger  2010-08-02 
23:04:24 PDT ---
Fixed in 2.6.35 final, 29508eb66bfacdef324d2199eeaea31e0cdfaa29
drm/radeon/kms: drop taking lock around crtc lookup.

Thanks Dave!

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


[Bug 28459] [r300g] Heroes of Newerth slow and corrupted with libtxc_dxtn.so

2010-08-02 Thread bugzilla-dae...@freedesktop.org
https://bugs.freedesktop.org/show_bug.cgi?id=28459

--- Comment #17 from Fabio Pedretti  2010-08-02 
23:59:18 PDT ---
This is also fixed in 2.6.34.2.

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