From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 01/10] drm/i915: rip out pre-DDI stuff from haswell_crtc_mode_set Date: Thu, 6 Dec 2012 14:25:49 +0100 Message-ID: <20121206132549.GR11556@phenom.ffwll.local> References: <1354201179-14975-1-git-send-email-daniel.vetter@ffwll.ch> <20121203164240.GJ4384@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id B6C14E669E for ; Thu, 6 Dec 2012 05:24:20 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c4so3614330eek.36 for ; Thu, 06 Dec 2012 05:24:20 -0800 (PST) Content-Disposition: inline In-Reply-To: <20121203164240.GJ4384@phenom.ffwll.local> 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: Paulo Zanoni Cc: Daniel Vetter , Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Mon, Dec 03, 2012 at 05:42:40PM +0100, Daniel Vetter wrote: > On Mon, Dec 03, 2012 at 01:03:14PM -0200, Paulo Zanoni wrote: > > Hi > > > > 2012/11/29 Daniel Vetter : > > > Especially getting rid of all things lvds is ... great! > > > > > > v2: Drop the two additional pre-hsw hunks noticed by Paulo Zanoni. > > > > > > v3: > > > - handle DP ports correctly (spoted by Paulo) > > > - don't leave {} behind for a single-line block (again spotted by > > > Paulo) > > > - kill another if (IBX || CPT) block > > > > > > Signed-off-by: Daniel Vetter > > > --- > > > drivers/gpu/drm/i915/intel_display.c | 131 +---------------------------------- > > > 1 file changed, 2 insertions(+), 129 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > > index 3b6e4b0..fecaabc 100644 > > > --- a/drivers/gpu/drm/i915/intel_display.c > > > +++ b/drivers/gpu/drm/i915/intel_display.c > > > @@ -5343,9 +5343,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, > > > num_connectors++; > > > } > > > > > > - WARN(!(HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)), > > > - "Unexpected PCH type %d\n", INTEL_PCH_TYPE(dev)); > > > - > > > > This is patching ironlake_crtc_mode_set, instead of > > haswell_crtc_mode_set, which still includes the following lines: > > > > /* We are not sure yet this won't happen. */ > > WARN(!HAS_PCH_LPT(dev), "Unexpected PCH type %d\n", > > INTEL_PCH_TYPE(dev)); > > Hm, can I blame git rebase on this one? Probably not ;-) I'll fix this > when applying, and we really need to split this stuff up a bit - the > current code is way too confuse, with too many lookalikes all around. > > Thanks for catching this. Actually I've just left this bit of code in there and deleted this hunk from the patch - a bit of paranoid WARN to check that the respective mode_set functions are only called on the right cpu/pch combinations can't hurt. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch