From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping Date: Thu, 8 Oct 2015 07:45:48 -0700 Message-ID: <5616819C.2050003@virtuousgeek.org> References: <20151006082524.GQ3383@phenom.ffwll.local> <1444242857-10349-1-git-send-email-wayne.boyer@intel.com> <20151008090737.GJ27939@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4B626ECF2 for ; Thu, 8 Oct 2015 07:45:10 -0700 (PDT) Received: by pacex6 with SMTP id ex6so57106097pac.0 for ; Thu, 08 Oct 2015 07:45:10 -0700 (PDT) In-Reply-To: <20151008090737.GJ27939@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , Wayne Boyer , intel-gfx@lists.freedesktop.org, "Goel, Akash" , Daniel Vetter , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gMTAvMDgvMjAxNSAwMjowNyBBTSwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+IE9uIFdlZCwgT2N0 IDA3LCAyMDE1IGF0IDExOjM0OjE3QU0gLTA3MDAsIFdheW5lIEJveWVyIHdyb3RlOgo+PiBGcm9t OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPj4KPj4gQSBsb25nIHRp bWUgYWdvIChiZWZvcmUgMy4xNCkgd2UgcmVsaWVkIG9uIGEgcGVybWFuZW50IHBpbm5pbmcgb2Yg dGhlCj4+IGlmYmRldiB0byBsb2NrIHRoZSBmYiBpbiBwbGFjZSBpbnNpZGUgdGhlIEdHVFQuIEhv d2V2ZXIsIHRoZQo+PiBpbnRyb2R1Y3Rpb24gb2Ygc3RlYWxpbmcgdGhlIEJJT1MgZnJhbWVidWZm ZXIgYW5kIHJldXNpbmcgaXRzIGFkZHJlc3MgaW4KPj4gdGhlIEdHVFQgZm9yIHRoZSBmYmRldiBo YXMgbXVkZGllZCB3YXRlcnMgYW5kIHdlIHVzZSBhbiBpbmhlcml0ZWQgZmIuCj4+IEhvd2V2ZXIs IHRoZSBpbmhlcml0ZWQgZmIgaXMgb25seSBwaW5uZWQgd2hpbHN0IGl0IGlzIGFjdGl2ZSBhbmQg d2Ugbm8KPj4gbG9uZ2VyIGhhdmUgYW4gZXhwbGljaXQgcGluIGZvciB0aGUgaW5mby0+c3lzdGVt X2Jhc2UgbW1hcHBpbmcgdXNlZCBieQo+PiB0aGUgZmJkZXYuIFRoZSByZXN1bHQgaXMgdGhhdCBh ZnRlciBzb21lIGFwZXJ0dXJlIHByZXNzdXJlIHRoZSBmYmRldiBtYXkKPj4gYmUgZXZpY3RlZCwg YnV0IHdlIGNvbnRpbnVlIHRvIHdyaXRlIHRoZSBmYmNvbiBpbnRvIHRoZSBzYW1lIEdHVFQKPj4g YWRkcmVzcyAtIG92ZXJ3cml0aW5nIGFueXRoaW5nIGVsc2UgdGhhdCBtYXkgYmUgcHV0IGludG8g dGhhdCBvZmZzZXQuCj4+IFRoZSBlZmZlY3QgaXMgbW9zdCBwcm9ub3VuY2VkIGFjcm9zcyBzdXNw ZW5kL3Jlc3VtZSBhcwo+PiBpbnRlbF9mYmRldl9zZXRfc3VzcGVuZCgpIGRvZXMgYSBmdWxsIGNs ZWFyIG92ZXIgdGhlIHdob2xlIHNjYW5vdXQuCj4+Cj4+IHYyOiByZWJhc2VkIG9uIGxhdGVzdCBu aWdodGx5IChXYXluZSkKPj4KPj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj aHJpcy13aWxzb24uY28udWs+Cj4+IENjOiAiR29lbCwgQWthc2giIDxha2FzaC5nb2VsQGludGVs LmNvbT4KPj4gQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cj4+IENj OiBKZXNzZSBCYXJuZXMgPGpiYXJuZXNAdmlydHVvdXNnZWVrLm9yZz4KPj4gQ2M6IHN0YWJsZUB2 Z2VyLmtlcm5lbC5vcmcKPj4gUmV2aWV3ZWQtYnk6IERlZXBhayBTIDxkZWVwYWsuc0BsaW51eC5p bnRlbC5jb20+Cj4+IFNpZ25lZC1vZmYtYnk6IFdheW5lIEJveWVyIDx3YXluZS5ib3llckBpbnRl bC5jb20+Cj4+IC0tLQo+PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyB8IDE1 ICsrKysrKysrKysrKysrKwo+PiAgMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKykKPj4K Pj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCj4+IGluZGV4IDY1MzI5MTIuLmM2YWE0Zjkg MTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKPj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwo+PiBAQCAtMjE1LDYgKzIxNSwx NiBAQCBzdGF0aWMgaW50IGludGVsZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxw ZXIsCj4+ICAJb2JqID0gaW50ZWxfZmItPm9iajsKPj4gIAlzaXplID0gb2JqLT5iYXNlLnNpemU7 Cj4+ICAKPj4gKwkvKiBUaGUgZmIgY29uc3RydWN0b3Igd2lsbCBoYXZlIGFscmVhZHkgcGlubmVk IHVzIChvciBpbmhlcml0ZWQgYQo+PiArCSAqIEdHVFQgcmVnaW9uIGZyb20gdGhlIEJJT1MpIHN1 aXRhYmxlIGZvciBhIHNjYW5vdXQsIHNvCj4+ICsJICogdGhpcyBzaG91bGQganVzdCBiZSBhIG5v LW9wIGFuZCBpbmNyZW1lbnQgdGhlIHBpbiBjb3VudCBmb3IgdGhlCj4+ICsJICogZmJkZXYgbW1h cHBpbmcuIEl0IGRvZXMgaGF2ZSBhIHVzZWZ1bCBzaWRlLWVmZmVjdCBvZiB2YWxpZGF0aW5nCj4+ ICsJICogdGhlIHBpbiBmb3IgZmJkZXYncyB1c2UgdmlhIGEgR0dUVCBtbWFwcGluZy4KPj4gKwkg Ki8KPj4gKwlyZXQgPSBpOTE1X2dlbV9vYmplY3RfZ2d0dF9waW4ob2JqLCBOVUxMLCAwLCBQSU5f TUFQUEFCTEUpOwo+IAo+IFRoaXMgc2hvdWxkIGJlIGk5MTVfZ2VtX29ial9nZ3R0X3BpbihvYmos IDAsIFBJTl9NQVBQQUJMRSk7Cj4gQXQgd2hpY2ggcG9pbnQgSSBqdXN0IHJhZ2UgcXVpdC4KCkxP TCBHRU0gbmFtaW5nIHN0cmlrZXMgYWdhaW4hCgpKZXNzZQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f48.google.com ([209.85.220.48]:33724 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933520AbbJHOpK (ORCPT ); Thu, 8 Oct 2015 10:45:10 -0400 Received: by pacex6 with SMTP id ex6so57106096pac.0 for ; Thu, 08 Oct 2015 07:45:10 -0700 (PDT) Subject: Re: [PATCH] drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping To: Chris Wilson , Wayne Boyer , intel-gfx@lists.freedesktop.org, "Goel, Akash" , Daniel Vetter , stable@vger.kernel.org References: <20151006082524.GQ3383@phenom.ffwll.local> <1444242857-10349-1-git-send-email-wayne.boyer@intel.com> <20151008090737.GJ27939@nuc-i3427.alporthouse.com> From: Jesse Barnes Message-ID: <5616819C.2050003@virtuousgeek.org> Date: Thu, 8 Oct 2015 07:45:48 -0700 MIME-Version: 1.0 In-Reply-To: <20151008090737.GJ27939@nuc-i3427.alporthouse.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: On 10/08/2015 02:07 AM, Chris Wilson wrote: > On Wed, Oct 07, 2015 at 11:34:17AM -0700, Wayne Boyer wrote: >> From: Chris Wilson >> >> A long time ago (before 3.14) we relied on a permanent pinning of the >> ifbdev to lock the fb in place inside the GGTT. However, the >> introduction of stealing the BIOS framebuffer and reusing its address in >> the GGTT for the fbdev has muddied waters and we use an inherited fb. >> However, the inherited fb is only pinned whilst it is active and we no >> longer have an explicit pin for the info->system_base mmapping used by >> the fbdev. The result is that after some aperture pressure the fbdev may >> be evicted, but we continue to write the fbcon into the same GGTT >> address - overwriting anything else that may be put into that offset. >> The effect is most pronounced across suspend/resume as >> intel_fbdev_set_suspend() does a full clear over the whole scanout. >> >> v2: rebased on latest nightly (Wayne) >> >> Signed-off-by: Chris Wilson >> Cc: "Goel, Akash" >> Cc: Daniel Vetter >> Cc: Jesse Barnes >> Cc: stable@vger.kernel.org >> Reviewed-by: Deepak S >> Signed-off-by: Wayne Boyer >> --- >> drivers/gpu/drm/i915/intel_fbdev.c | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c >> index 6532912..c6aa4f9 100644 >> --- a/drivers/gpu/drm/i915/intel_fbdev.c >> +++ b/drivers/gpu/drm/i915/intel_fbdev.c >> @@ -215,6 +215,16 @@ static int intelfb_create(struct drm_fb_helper *helper, >> obj = intel_fb->obj; >> size = obj->base.size; >> >> + /* The fb constructor will have already pinned us (or inherited a >> + * GGTT region from the BIOS) suitable for a scanout, so >> + * this should just be a no-op and increment the pin count for the >> + * fbdev mmapping. It does have a useful side-effect of validating >> + * the pin for fbdev's use via a GGTT mmapping. >> + */ >> + ret = i915_gem_object_ggtt_pin(obj, NULL, 0, PIN_MAPPABLE); > > This should be i915_gem_obj_ggtt_pin(obj, 0, PIN_MAPPABLE); > At which point I just rage quit. LOL GEM naming strikes again! Jesse