From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/fb helper: don't call drm_helper_connector_dpms directly Date: Sat, 8 Sep 2012 00:52:19 +0200 Message-ID: <20120907225219.GC5511@phenom.ffwll.local> References: <1347005692-1459-1-git-send-email-daniel.vetter@ffwll.ch> <20120907142828.5ee29d91@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20120907142828.5ee29d91@jbarnes-desktop> 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: Daniel Vetter , Intel Graphics Development , DRI Development List-Id: dri-devel@lists.freedesktop.org On Fri, Sep 07, 2012 at 02:28:28PM -0700, Jesse Barnes wrote: > On Fri, 7 Sep 2012 10:14:52 +0200 > Daniel Vetter wrote: > > > Yet again a case where the fb helper is too intimate with the crtc > > helper and calls a crtc helepr function directly instead of going > > through the interface vtable. > > > > This fixes console blanking in drm/i915 with the new i915-specific > > modeset code. > > > > Reported-by: Jesse Barnes > > Signed-off-by: Daniel Vetter > > --- > > drivers/gpu/drm/drm_fb_helper.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > > index eb79515..b5d05f5 100644 > > --- a/drivers/gpu/drm/drm_fb_helper.c > > +++ b/drivers/gpu/drm/drm_fb_helper.c > > @@ -330,7 +330,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) > > /* Walk the connectors & encoders on this fb turning them on/off */ > > for (j = 0; j < fb_helper->connector_count; j++) { > > connector = fb_helper->connector_info[j]->connector; > > - drm_helper_connector_dpms(connector, dpms_mode); > > + connector->funcs->dpms(connector, dpms_mode); > > drm_connector_property_set_value(connector, > > dev->mode_config.dpms_property, dpms_mode); > > } > > Tested-by: Jesse Barnes Applied with Dave's irc-ack, thanks for yelling&testing. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch