From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 2/2] drm/i915: clean up and simplify i9xx_crtc_mode_set wrt PLL handling Date: Fri, 13 Sep 2013 17:47:50 +0300 Message-ID: <20130913144750.GD4531@intel.com> References: <20130913073017.GG20128@intel.com> <1379059389-2890-1-git-send-email-jani.nikula@intel.com> <1379059389-2890-2-git-send-email-jani.nikula@intel.com> <20130913130027.GL5459@phenom.ffwll.local> <87bo3wn8ob.fsf@intel.com> <20130913140719.GA32145@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A3DFE81FD for ; Fri, 13 Sep 2013 07:47:55 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130913140719.GA32145@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: Daniel Vetter Cc: Jani Nikula , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Sep 13, 2013 at 04:07:19PM +0200, Daniel Vetter wrote: > On Fri, Sep 13, 2013 at 04:38:28PM +0300, Jani Nikula wrote: > > On Fri, 13 Sep 2013, Daniel Vetter wrote: > > > On Fri, Sep 13, 2013 at 11:03:09AM +0300, Jani Nikula wrote: > > >> Flat out skip anything to do with PLL if we have a DSI encoder (and = thus > > >> DSI PLL). Also skip PLL computation if the encoder has already set > > >> clocks. This allows for some tidying up of the code, including a > > >> superfluous call to intel_limit() for LVDS downclock path. > > >> = > > >> Signed-off-by: Jani Nikula > > >> Reviewed-by: Ville Syrj=E4l=E4 > > > > > > Tried to merge this but the baseline seems to be off, at least wrt di= nq. > > > Do I miss some patches that I should apply first? > > = > > This one depends on "drm/i915: do not update cursor in crtc mode set" in > > this thread (my patch but with Ville's commit message amendmend). Did > > you push the assert patch before that? It's a good order. > = > I've pushed the assert patch to dinq, the real fixes need to go to -fixes. > Tbh I'm a bit confused about what to put where, so please scream ;-) > = > For Ville's patches I'm waiting a bit for Paulo to take a look and ack > them. For stable we need just (assuming it also fixes Paulo's hangs): drm/i915: do not update cursor in crtc mode set On top of that we can add the cursor assert patch (not sure if we want that to go to stable): drm/i915: add asserts for cursor disabled I get the impression you applied the assert patch alone. That's probably not a very good idea since it will (or at least should) scream every time you do a modeset, unless the other patch is applied as well. -- = Ville Syrj=E4l=E4 Intel OTC