From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 24/81] drm/fb helper: don't call drm_crtc_helper_set_config Date: Wed, 18 Jul 2012 17:49:22 +0200 Message-ID: <20120718154922.GC5348@phenom.ffwll.local> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> <1342016944-23395-25-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 mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E16DA0DA3 for ; Wed, 18 Jul 2012 08:49:17 -0700 (PDT) Received: by wibhq4 with SMTP id hq4so3639543wib.12 for ; Wed, 18 Jul 2012 08:49:16 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1342016944-23395-25-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Hi Dave, Can you please pick this one up for -next? There are a few other issues where the fb helper is a bit too intimate with the crtc helper (i.e. it depends upon callbacks and behaviour only provided when using the crtc helpers). But this one here is the only one I can't work around in i915.ko and hence would block merging the modeset rewrite for 3.7. I've put a todo down to untangle the fb helper a bit better from the crtc helper, but that's for a later patch series. Yours, Daneil PS: Can you also pick up the other drm patch in this series? That unused list_head confused me quite a bit until I've noticed that it's ... unused. On Wed, Jul 11, 2012 at 04:28:07PM +0200, Daniel Vetter wrote: > Go through the interface vtable instead, because not everyone might be > using the crtc helper code. > > Cc: dri-devel@lists.freedesktop.org > Signed-Off-by: Daniel Vetter > --- > drivers/gpu/drm/drm_fb_helper.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 5683b7f..bf97c0a 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -228,7 +228,7 @@ bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper) > int i, ret; > for (i = 0; i < fb_helper->crtc_count; i++) { > struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set; > - ret = drm_crtc_helper_set_config(mode_set); > + ret = mode_set->crtc->funcs->set_config(mode_set); > if (ret) > error = true; > } > -- > 1.7.7.6 > -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48