From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752093AbaDWLE2 (ORCPT ); Wed, 23 Apr 2014 07:04:28 -0400 Received: from mga02.intel.com ([134.134.136.20]:5263 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751332AbaDWLEF convert rfc822-to-8bit (ORCPT ); Wed, 23 Apr 2014 07:04:05 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,911,1389772800"; d="scan'208";a="526047052" From: Jani Nikula To: Ville =?utf-8?B?U3lyasOkbMOk?= , Chris Wilson Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Discard BIOS framebuffers too small to accommodate chosen mode In-Reply-To: <20140423082421.GE18465@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20140423071125.GS10722@phenom.ffwll.local> <1398239671-4135-1-git-send-email-chris@chris-wilson.co.uk> <20140423082421.GE18465@intel.com> User-Agent: Notmuch/0.18~rc0+1~g40dc79d6ac82 (http://notmuchmail.org) Emacs/23.4.1 (x86_64-pc-linux-gnu) Date: Wed, 23 Apr 2014 14:03:44 +0300 Message-ID: <87fvl4qpdb.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 23 Apr 2014, Ville Syrjälä wrote: > On Wed, Apr 23, 2014 at 08:54:31AM +0100, Chris Wilson wrote: >> If the inherited BIOS framebuffer is smaller than the mode selected for >> fbdev, then if we continue to use it then we cause display corruption as >> we do not setup the panel fitter to upscale. >> >> Regression from commit d978ef14456a38034f6c0e94a794129501f89200 >> Author: Jesse Barnes >> Date: Fri Mar 7 08:57:51 2014 -0800 >> >> drm/i915: Wrap the preallocated BIOS framebuffer and preserve for KMS fbcon v12 >> >> v2: Add a debug message to track the discard of the BIOS fb. >> v3: Ville pointed out the difference between ref/unref >> >> Reported-by: Knut Petersen >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77767 >> Signed-off-by: Chris Wilson >> Cc: Jesse Barnes >> Reviewed-by: Daniel Vetter > > Reviewed-by: Ville Syrjälä Pushed to -fixes, thanks for the patch and review. BR, Jani. > >> --- >> drivers/gpu/drm/i915/intel_fbdev.c | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c >> index b16116db6c37..fbe7941f88c8 100644 >> --- a/drivers/gpu/drm/i915/intel_fbdev.c >> +++ b/drivers/gpu/drm/i915/intel_fbdev.c >> @@ -133,6 +133,16 @@ static int intelfb_create(struct drm_fb_helper *helper, >> >> mutex_lock(&dev->struct_mutex); >> >> + if (intel_fb && >> + (sizes->fb_width > intel_fb->base.width || >> + sizes->fb_height > intel_fb->base.height)) { >> + DRM_DEBUG_KMS("BIOS fb too small (%dx%d), we require (%dx%d)," >> + " releasing it\n", >> + intel_fb->base.width, intel_fb->base.height, >> + sizes->fb_width, sizes->fb_height); >> + drm_framebuffer_unreference(&intel_fb->base); >> + intel_fb = ifbdev->fb = NULL; >> + } >> if (!intel_fb || WARN_ON(!intel_fb->obj)) { >> DRM_DEBUG_KMS("no BIOS fb, allocating a new one\n"); >> ret = intelfb_alloc(helper, sizes); >> -- >> 1.9.2 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ville Syrjälä > Intel OTC > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Discard BIOS framebuffers too small to accommodate chosen mode Date: Wed, 23 Apr 2014 14:03:44 +0300 Message-ID: <87fvl4qpdb.fsf@intel.com> References: <20140423071125.GS10722@phenom.ffwll.local> <1398239671-4135-1-git-send-email-chris@chris-wilson.co.uk> <20140423082421.GE18465@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 277946E309 for ; Wed, 23 Apr 2014 04:04:05 -0700 (PDT) In-Reply-To: <20140423082421.GE18465@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ville =?utf-8?B?U3lyasOkbMOk?= , Chris Wilson Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCAyMyBBcHIgMjAxNCwgVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4gd3JvdGU6Cj4gT24gV2VkLCBBcHIgMjMsIDIwMTQgYXQgMDg6NTQ6MzFBTSAr MDEwMCwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+PiBJZiB0aGUgaW5oZXJpdGVkIEJJT1MgZnJhbWVi dWZmZXIgaXMgc21hbGxlciB0aGFuIHRoZSBtb2RlIHNlbGVjdGVkIGZvcgo+PiBmYmRldiwgdGhl biBpZiB3ZSBjb250aW51ZSB0byB1c2UgaXQgdGhlbiB3ZSBjYXVzZSBkaXNwbGF5IGNvcnJ1cHRp b24gYXMKPj4gd2UgZG8gbm90IHNldHVwIHRoZSBwYW5lbCBmaXR0ZXIgdG8gdXBzY2FsZS4KPj4g Cj4+IFJlZ3Jlc3Npb24gZnJvbSBjb21taXQgZDk3OGVmMTQ0NTZhMzgwMzRmNmMwZTk0YTc5NDEy OTUwMWY4OTIwMAo+PiBBdXRob3I6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsu b3JnPgo+PiBEYXRlOiAgIEZyaSBNYXIgNyAwODo1Nzo1MSAyMDE0IC0wODAwCj4+IAo+PiAgICAg ZHJtL2k5MTU6IFdyYXAgdGhlIHByZWFsbG9jYXRlZCBCSU9TIGZyYW1lYnVmZmVyIGFuZCBwcmVz ZXJ2ZSBmb3IgS01TIGZiY29uIHYxMgo+PiAKPj4gdjI6IEFkZCBhIGRlYnVnIG1lc3NhZ2UgdG8g dHJhY2sgdGhlIGRpc2NhcmQgb2YgdGhlIEJJT1MgZmIuCj4+IHYzOiBWaWxsZSBwb2ludGVkIG91 dCB0aGUgZGlmZmVyZW5jZSBiZXR3ZWVuIHJlZi91bnJlZgo+PiAKPj4gUmVwb3J0ZWQtYnk6IEtu dXQgUGV0ZXJzZW4gPEtudXRfUGV0ZXJzZW5AdC1vbmxpbmUuZGU+Cj4+IEJ1Z3ppbGxhOiBodHRw czovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD03Nzc2Nwo+PiBTaWduZWQt b2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPj4gQ2M6IEpl c3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsub3JnPgo+PiBSZXZpZXdlZC1ieTogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPgo+IFJldmlld2VkLWJ5OiBWaWxs ZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgoKUHVzaGVkIHRvIC1m aXhlcywgdGhhbmtzIGZvciB0aGUgcGF0Y2ggYW5kIHJldmlldy4KCkJSLApKYW5pLgoKCj4KPj4g LS0tCj4+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIHwgMTAgKysrKysrKysr Kwo+PiAgMSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKykKPj4gCj4+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZmJkZXYuYwo+PiBpbmRleCBiMTYxMTZkYjZjMzcuLmZiZTc5NDFmODhjOCAxMDA2 NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwo+PiArKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCj4+IEBAIC0xMzMsNiArMTMzLDE2IEBA IHN0YXRpYyBpbnQgaW50ZWxmYl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwK Pj4gIAo+PiAgCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKPj4gIAo+PiArCWlmIChp bnRlbF9mYiAmJgo+PiArCSAgICAoc2l6ZXMtPmZiX3dpZHRoID4gaW50ZWxfZmItPmJhc2Uud2lk dGggfHwKPj4gKwkgICAgIHNpemVzLT5mYl9oZWlnaHQgPiBpbnRlbF9mYi0+YmFzZS5oZWlnaHQp KSB7Cj4+ICsJCURSTV9ERUJVR19LTVMoIkJJT1MgZmIgdG9vIHNtYWxsICglZHglZCksIHdlIHJl cXVpcmUgKCVkeCVkKSwiCj4+ICsJCQkgICAgICAiIHJlbGVhc2luZyBpdFxuIiwKPj4gKwkJCSAg ICAgIGludGVsX2ZiLT5iYXNlLndpZHRoLCBpbnRlbF9mYi0+YmFzZS5oZWlnaHQsCj4+ICsJCQkg ICAgICBzaXplcy0+ZmJfd2lkdGgsIHNpemVzLT5mYl9oZWlnaHQpOwo+PiArCQlkcm1fZnJhbWVi dWZmZXJfdW5yZWZlcmVuY2UoJmludGVsX2ZiLT5iYXNlKTsKPj4gKwkJaW50ZWxfZmIgPSBpZmJk ZXYtPmZiID0gTlVMTDsKPj4gKwl9Cj4+ICAJaWYgKCFpbnRlbF9mYiB8fCBXQVJOX09OKCFpbnRl bF9mYi0+b2JqKSkgewo+PiAgCQlEUk1fREVCVUdfS01TKCJubyBCSU9TIGZiLCBhbGxvY2F0aW5n IGEgbmV3IG9uZVxuIik7Cj4+ICAJCXJldCA9IGludGVsZmJfYWxsb2MoaGVscGVyLCBzaXplcyk7 Cj4+IC0tIAo+PiAxLjkuMgo+PiAKPj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KPj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+PiBJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCj4+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngKPgo+IC0tIAo+IFZpbGxlIFN5cmrDpGzDpAo+IEludGVsIE9U Qwo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cgot LSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==