From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: Current suspend issues on Lenovo X200 Date: Fri, 24 Oct 2008 11:23:17 -0700 Message-ID: <200810241123.17883.jbarnes@virtuousgeek.org> References: <20081023204326.GB4175@denkbrett.schottelius.org> <200810241628.23002.andres@anarazel.de> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: base64 Return-path: Received: from outbound-mail-03.bluehost.com ([69.89.21.13]:40985 "HELO outbound-mail-03.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751341AbYJXSXW (ORCPT ); Fri, 24 Oct 2008 14:23:22 -0400 In-Reply-To: <200810241628.23002.andres@anarazel.de> Content-Disposition: inline Sender: linux-next-owner@vger.kernel.org List-ID: To: Andres Freund Cc: Nico -telmich- Schottelius , linux-next@vger.kernel.org, LKML T24gRnJpZGF5LCBPY3RvYmVyIDI0LCAyMDA4IDc6MjggYW0gQW5kcmVzIEZyZXVuZCB3cm90ZToK PiBIaSBOaWNvLAo+Cj4gT24gVGh1cnNkYXkgMjMgT2N0b2JlciAyMDA4IDIyOjQzOjI2IE5pY28g LXRlbG1pY2gtIFNjaG90dGVsaXVzIHdyb3RlOgo+ID4gIC0gMi42LjI3LW5leHQtMjAwODEwMjM6 Cj4gPiAgICAtPiBubyBYIHJ1bm5pbmcgKGJlY2F1c2UgeG9yZyBkb2VzIG5vdCB3b3JrIHdpdGgg dGhhdCBrZXJuZWwpCj4KPiBJIHRoaW5rIHdoYXQgeW91IG5lZWQgaXMgb25lIHJhdGhlciBzaG9y dCBmaXggZm9yIHRoZSBpbnRlbCB4b3JnIGRyaXZlcjoKPgo+IGRpZmYgLS1naXQgYS9zcmMvaTgz MF9kcml2ZXIuYyBiL3NyYy9pODMwX2RyaXZlci5jCj4gaW5kZXggYzFkNjFmNC4uZWFmNWQyNyAx MDA2NDQKPiAtLS0gYS9zcmMvaTgzMF9kcml2ZXIuYwo+ICsrKyBiL3NyYy9pODMwX2RyaXZlci5j Cj4gQEAgLTUwMiw4ICs1MDIsOCBAQCBJODMwRGV0ZWN0TWVtb3J5KFNjcm5JbmZvUHRyIHBTY3Ju KQo+ICAgICByYW5nZSA9IGd0dF9zaXplICsgNDsKPgo+ICAgICAvKiBuZXcgNCBzZXJpZXMgaGFy ZHdhcmUgaGFzIHNlcGVyYXRlIEdUVCBzdG9sZW4gd2l0aCBHRlggc3RvbGVuICovCj4gLSBpZiAo SVNfRzRYKHBJODMwKSkKPiAtIHJhbmdlID0gMDsKPiArIGlmIChJU19HNFgocEk4MzApIHx8IElT X0dNNDUocEk4MzApKQo+ICsgcmFuZ2UgPSA0Owo+Cj4gICAgIGlmIChJU19JODVYKHBJODMwKSB8 fCBJU19JODY1RyhwSTgzMCkgfHwgSVNfSTlYWChwSTgzMCkpIHsKPiAgICAgICAgc3dpdGNoIChn bWNoX2N0cmwgJiBJODU1X0dNQ0hfR01TX01BU0spIHsKPgo+IChPdXQgb2YgdGhlICJbZ2l0IHB1 bGxdIGFncCBwYXRjaGVzIGZvciAyLjYuMjgtcmMxIiB0aHJlYWQpCgpTb21ldGhpbmcgbGlrZSB0 aGlzIG1pZ2h0IGFsc28gaGVscC4KCkc0eCBjaGlwcyBkbyB0aGVpciBvd24gbWVtb3J5IGFyYml0 cmF0aW9uIG1hbmFnZW1lbnQsIHNvIHdlIHNob3VsZG4ndCB0cnlpbmcKdG8gc2F2ZS9yZXN0b3Jl IHRoZSBEU1BBUkIgcmVnLgoKSmVzc2UKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBmMjBm ZmUxLi42YmE4NzEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTY1Nyw2ICs2NTcsOSBA QCBleHRlcm4gaW50IGk5MTVfd2FpdF9yaW5nKHN0cnVjdCBkcm1fZGV2aWNlICogZGV2LCBpbnQg biwgY29uc3QgY2hhciAqY2FsbGVyKTsKIAogI2RlZmluZSBJOTE1X05FRURfR0ZYX0hXUyhkZXYp IChJU19HMzMoZGV2KSB8fCBJU19HTTQ1KGRldikgfHwgSVNfRzRYKGRldikpCiAKKy8qIGRzcGFy YiBjb250cm9sbGVkIGJ5IGh3IG9ubHkgKi8KKyNkZWZpbmUgRFNQQVJCX0hXQ09OVFJPTChkZXYp IChJU19HNFgoZGV2KSB8fCBJU19HTTQ1KGRldikpCisKICNkZWZpbmUgUFJJTUFSWV9SSU5HQlVG RkVSX1NJWkUgICAgICAgICAoMTI4KjEwMjQpCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3N1c3BlbmQuYwppbmRleCA2MDNmZTc0Li40YmVhNmVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3N1c3BlbmQuYwpAQCAtMjQxLDcgKzI0MSw4IEBAIGludCBpOTE1X3NhdmVfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAlwY2lfcmVhZF9jb25maWdfYnl0ZShkZXYtPnBkZXYsIExCQiwg JmRldl9wcml2LT5zYXZlTEJCKTsKIAogCS8qIERpc3BsYXkgYXJiaXRyYXRpb24gY29udHJvbCAq LwotCWRldl9wcml2LT5zYXZlRFNQQVJCID0gSTkxNV9SRUFEKERTUEFSQik7CisJaWYgKCFEU1BB UkJfSFdDT05UUk9MKGRldikpCisJCWRldl9wcml2LT5zYXZlRFNQQVJCID0gSTkxNV9SRUFEKERT UEFSQik7CiAKIAkvKiBQaXBlICYgcGxhbmUgQSBpbmZvICovCiAJZGV2X3ByaXYtPnNhdmVQSVBF QUNPTkYgPSBJOTE1X1JFQUQoUElQRUFDT05GKTsKQEAgLTM2NSw3ICszNjYsOCBAQCBpbnQgaTkx NV9yZXN0b3JlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlwY2lfd3JpdGVfY29u ZmlnX2J5dGUoZGV2LT5wZGV2LCBMQkIsIGRldl9wcml2LT5zYXZlTEJCKTsKIAotCUk5MTVfV1JJ VEUoRFNQQVJCLCBkZXZfcHJpdi0+c2F2ZURTUEFSQik7CisJaWYgKCFEU1BBUkJfSFdDT05UUk9M KGRldikpCisJCUk5MTVfV1JJVEUoRFNQQVJCLCBkZXZfcHJpdi0+c2F2ZURTUEFSQik7CiAKIAkv KiBQaXBlICYgcGxhbmUgQSBpbmZvICovCiAJLyogUHJpbWUgdGhlIGNsb2NrICovCgAK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757382AbYJXSXb (ORCPT ); Fri, 24 Oct 2008 14:23:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752814AbYJXSXX (ORCPT ); Fri, 24 Oct 2008 14:23:23 -0400 Received: from outbound-mail-102.bluehost.com ([69.89.22.12]:51103 "HELO outbound-mail-102.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752667AbYJXSXX (ORCPT ); Fri, 24 Oct 2008 14:23:23 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:From:To:Subject:Date:User-Agent:Cc:References:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-Disposition:Message-Id:X-Identified-User; b=b5nWXhcufYGPkgbHwKqEiGdVi1+uxrahb7ECfFLtTka20aedtit51YgUwLStT7MsJato8kaL+Yip6ow4d+3YdsNv2jw5aniMv41ZoBUZFqZpBP2lqEJSnDgPR5aRiI4B; From: Jesse Barnes To: Andres Freund Subject: Re: Current suspend issues on Lenovo X200 Date: Fri, 24 Oct 2008 11:23:17 -0700 User-Agent: KMail/1.10.1 (Linux/2.6.26.5-45.fc9.x86_64; KDE/4.1.2; x86_64; ; ) Cc: "Nico -telmich- Schottelius" , linux-next@vger.kernel.org, LKML References: <20081023204326.GB4175@denkbrett.schottelius.org> <200810241628.23002.andres@anarazel.de> In-Reply-To: <200810241628.23002.andres@anarazel.de> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Disposition: inline Message-Id: <200810241123.17883.jbarnes@virtuousgeek.org> X-Identified-User: {642:box128.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 75.111.27.49 authed with jbarnes@virtuousgeek.org} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id m9OINZdq027245 On Friday, October 24, 2008 7:28 am Andres Freund wrote:> Hi Nico,>> On Thursday 23 October 2008 22:43:26 Nico -telmich- Schottelius wrote:> > - 2.6.27-next-20081023:> > -> no X running (because xorg does not work with that kernel)>> I think what you need is one rather short fix for the intel xorg driver:>> diff --git a/src/i830_driver.c b/src/i830_driver.c> index c1d61f4..eaf5d27 100644> --- a/src/i830_driver.c> +++ b/src/i830_driver.c> @@ -502,8 +502,8 @@ I830DetectMemory(ScrnInfoPtr pScrn)> range = gtt_size + 4;>> /* new 4 series hardware has seperate GTT stolen with GFX stolen */> - if (IS_G4X(pI830))> - range = 0;> + if (IS_G4X(pI830) || IS_GM45(pI830))> + range = 4;>> if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {> switch (gmch_ctrl & I855_GMCH_GMS_MASK) {>> (Out of the "[git pull] agp patches for 2.6.28-rc1" thread) Something like this might also help. G4x chips do their own memory arbitration management, so we shouldn't tryingto save/restore the DSPARB reg. Jesse diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.hindex f20ffe1..6ba8712 100644--- a/drivers/gpu/drm/i915/i915_drv.h+++ b/drivers/gpu/drm/i915/i915_drv.h@@ -657,6 +657,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev)) +/* dsparb controlled by hw only */+#define DSPARB_HWCONTROL(dev) (IS_G4X(dev) || IS_GM45(dev))+ #define PRIMARY_RINGBUFFER_SIZE (128*1024) #endifdiff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.cindex 603fe74..4bea6ea 100644--- a/drivers/gpu/drm/i915/i915_suspend.c+++ b/drivers/gpu/drm/i915/i915_suspend.c@@ -241,7 +241,8 @@ int i915_save_state(struct drm_device *dev) pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB); /* Display arbitration control */- dev_priv->saveDSPARB = I915_READ(DSPARB);+ if (!DSPARB_HWCONTROL(dev))+ dev_priv->saveDSPARB = I915_READ(DSPARB); /* Pipe & plane A info */ dev_priv->savePIPEACONF = I915_READ(PIPEACONF);@@ -365,7 +366,8 @@ int i915_restore_state(struct drm_device *dev) pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB); - I915_WRITE(DSPARB, dev_priv->saveDSPARB);+ if (!DSPARB_HWCONTROL(dev))+ I915_WRITE(DSPARB, dev_priv->saveDSPARB); /* Pipe & plane A info */ /* Prime the clock */{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I