From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 39/58] drm/i915: implement crtc helper semantics relied upon by the fb helper Date: Wed, 5 Sep 2012 09:45:29 -0700 Message-ID: <20120905094529.4e257398@jbarnes-desktop> References: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> <1345403595-9678-40-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy9.bluehost.com (oproxy9.bluehost.com [69.89.24.6]) by gabe.freedesktop.org (Postfix) with SMTP id CC9589E802 for ; Wed, 5 Sep 2012 09:45:29 -0700 (PDT) In-Reply-To: <1345403595-9678-40-git-send-email-daniel.vetter@ffwll.ch> 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: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Sun, 19 Aug 2012 21:12:56 +0200 Daniel Vetter wrote: > Yikes! > > But yeah, we have to do this until someone volunteers to clean up the > fb helper and rid it of its incetious relationship with the crtc > helper code. > > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/intel_display.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 3cedc89..4b2b17f 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6933,6 +6933,12 @@ static int intel_crtc_set_config(struct drm_mode_set *set) > if (!set->mode) > set->fb = NULL; > > + /* The fb helper likes to play gross jokes with ->mode_set_config. > + * Unfortunately the crtc helper doesn't do much at all for this case, > + * so we have to cope with this madness until the fb helper is fixed up. */ > + if (set->fb && set->num_connectors == 0) > + return 0; > + > if (set->fb) { > DRM_DEBUG_KMS("[CRTC:%d] [FB:%d] #connectors=%d (x y) (%i %i)\n", > set->crtc->base.id, set->fb->base.id, I wonder if this belongs earlier in the series? But either way: Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center