From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 13/13] drm/i915: check for non-native modes when inheriting a BIOS fb Date: Wed, 20 Mar 2013 14:51:12 +0200 Message-ID: <1363783872.13528.36.camel@intelbox> References: <1361309508-4901-1-git-send-email-jbarnes@virtuousgeek.org> <1361309508-4901-14-git-send-email-jbarnes@virtuousgeek.org> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id CFAC0E5C86 for ; Wed, 20 Mar 2013 05:51:14 -0700 (PDT) In-Reply-To: <1361309508-4901-14-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 2013-02-19 at 13:31 -0800, Jesse Barnes wrote: > If the mode is non-native using the panel fitter, don't try to re-use > the fb the BIOS allocated for it. > > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_fb.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c > index b60f277..9ff12aa 100644 > --- a/drivers/gpu/drm/i915/intel_fb.c > +++ b/drivers/gpu/drm/i915/intel_fb.c > @@ -438,6 +438,18 @@ void intel_fbdev_init_bios(struct drm_device *dev) > width = ((val >> 16) & 0xfff) + 1; > height = ((val >> 0) & 0xfff) + 1; > > + /* Don't bother inheriting panel fitted modes */ > + val = I915_READ(HTOTAL(pipe)); > + if (((val & 0xffff) + 1) != width) { > + DRM_ERROR("BIOS fb not native width (%d vs %d), skipping\n", width, (val & 0xffff) + 1); > + continue; > + } > + val = I915_READ(VTOTAL(pipe)); > + if (((val & 0xffff) + 1) != height) { > + DRM_ERROR("BIOS fb not native width (%d vs %d), skipping\n", height, (val & 0xffff) + 1); s/width/height/ > + continue; > + } > + > DRM_DEBUG_KMS("Found active pipe [%d/%d]: size=%dx%d@%d, offset=%x\n", > pipe, plane, width, height, bpp, offset); > On the series with my comments and the note that I couldn't yet test it: Reviewed-by: Imre Deak