CINXE.COM

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: "Mark M. Hoffman": Re: [BUG] Xserver startup locks system... git bisect results</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by "Mark M. Hoffman"" href="/groupie.php?aid=10383" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/12"> [Dec]</a> 聽 <a class="nb" href="/lkml/2005/12/15"> [15]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/12/15/454" onclick="this.href='/lkml/headers'+'/2005/12/15/454';">[headers]</a>聽 <a href="/lkml/bounce/2005/12/15/454">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/12/14/458">First message in thread</a></li><li><a href="/lkml/2005/12/15/5">Benjamin Herrenschmidt</a><ul><li><a href="/lkml/2005/12/15/60">Paul Mackerras</a><ul><li class="origin"><a href="/lkml/2005/12/15/469">"Mark M. Hoffman"</a><ul><li><a href="/lkml/2005/12/15/469">Benjamin Herrenschmidt</a></li><li><a href="/lkml/2005/12/16/7">Benjamin Herrenschmidt</a><ul><li><a href="/lkml/2005/12/16/15">Dave Airlie</a></li><li><a href="/lkml/2005/12/27/23">Will Dyson</a></li></ul></li></ul></li></ul></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/12/15/454/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Thu, 15 Dec 2005 22:50:32 -0500</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">"Mark M. Hoffman" <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">Re: [BUG] Xserver startup locks system... git bisect results</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">Hi Paul, Benjamin:<br /><br />* Paul Mackerras <paulus@samba.org> [2005-12-15 20:03:59 +1100]:<br />> Benjamin Herrenschmidt writes:<br />> <br />> > On Thu, 2005-12-15 at 16:07 +1100, Benjamin Herrenschmidt wrote:<br />> > > Ah, also, something else you can try, is replace<br />> > > <br />> > > dev_priv->gart_vm_start = dev_priv->fb_location<br />> > > + RADEON_READ(RADEON_CONFIG_APER_SIZE);<br />> > <br />> > Actually, the above should read<br />> > <br />> > + RADEON_READ(RADEON_CONFIG_APER_SIZE) * 2;<br />> <br />> With the patch below, my powerbook will sleep and wake up<br />> successfully.<br /><br />I added the printk's you (BH) asked for to Paul's patch, resulting in the<br />patch below. It works fine so far. Here's the relevant kernel log:<br /><br />Dec 15 22:39:47 jupiter kernel: dev_priv->fb_location is 0xe8000000<br />Dec 15 22:39:47 jupiter kernel: RADEON_READ(RADEON_CONFIG_APER_SIZE) is 0x08000000<br />Dec 15 22:39:47 jupiter kernel: [drm] Loading R200 Microcode<br /><br />Let me know if you need any more info. Thanks.<br /><br />--- linux-2.6.15-rc5-radeon-test.orig/drivers/char/drm/radeon_cp.c<br />+++ linux-2.6.15-rc5-radeon-test/drivers/char/drm/radeon_cp.c<br />@@ -1522,7 +1522,12 @@ static int radeon_do_init_cp(drm_device_<br /> <br /> dev_priv->gart_size = init->gart_size;<br /> dev_priv->gart_vm_start = dev_priv->fb_location<br />- + RADEON_READ(RADEON_CONFIG_APER_SIZE) * 2;<br />+ + RADEON_READ(RADEON_CONFIG_MEMSIZE);<br />+<br />+printk(KERN_INFO "dev_priv->fb_location is 0x%08x\n",<br />+ dev_priv->fb_location);<br />+printk(KERN_INFO "RADEON_READ(RADEON_CONFIG_APER_SIZE) is 0x%08x\n",<br />+ RADEON_READ(RADEON_CONFIG_APER_SIZE));<br /> <br /> #if __OS_HAS_AGP<br /> if (!dev_priv->is_pci)<br />--- linux-2.6.15-rc5-radeon-test.orig/drivers/char/drm/radeon_drv.h<br />+++ linux-2.6.15-rc5-radeon-test/drivers/char/drm/radeon_drv.h<br />@@ -379,6 +379,7 @@ extern int r300_do_cp_cmdbuf(drm_device_<br /> # define RADEON_PLL_WR_EN (1 << 7)<br /> #define RADEON_CLOCK_CNTL_INDEX 0x0008<br /> #define RADEON_CONFIG_APER_SIZE 0x0108<br />+#define RADEON_CONFIG_MEMSIZE 0x00f8<br /> #define RADEON_CRTC_OFFSET 0x0224<br /> #define RADEON_CRTC_OFFSET_CNTL 0x0228<br /> # define RADEON_CRTC_TILE_EN (1 << 15)<br />-- <br />Mark M. Hoffman<br />mhoffman@lightlink.com<br /><br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><br /><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-12-16 04:53 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>