* [PATCH] drm/fb helper: don't call drm_helper_connector_dpms directly
@ 2012-09-07 8:14 Daniel Vetter
2012-09-07 21:28 ` Jesse Barnes
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2012-09-07 8:14 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, DRI Development
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 <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
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);
}
--
1.7.11.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/fb helper: don't call drm_helper_connector_dpms directly
2012-09-07 8:14 [PATCH] drm/fb helper: don't call drm_helper_connector_dpms directly Daniel Vetter
@ 2012-09-07 21:28 ` Jesse Barnes
2012-09-07 22:52 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Jesse Barnes @ 2012-09-07 21:28 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development, DRI Development
On Fri, 7 Sep 2012 10:14:52 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> 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 <jbarnes@virtuousgeek.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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 <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/fb helper: don't call drm_helper_connector_dpms directly
2012-09-07 21:28 ` Jesse Barnes
@ 2012-09-07 22:52 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2012-09-07 22:52 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Daniel Vetter, Intel Graphics Development, DRI Development
On Fri, Sep 07, 2012 at 02:28:28PM -0700, Jesse Barnes wrote:
> On Fri, 7 Sep 2012 10:14:52 +0200
> Daniel Vetter <daniel.vetter@ffwll.ch> 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 <jbarnes@virtuousgeek.org>
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> > 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 <jbarnes@virtuousgeek.org>
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-07 22:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-07 8:14 [PATCH] drm/fb helper: don't call drm_helper_connector_dpms directly Daniel Vetter
2012-09-07 21:28 ` Jesse Barnes
2012-09-07 22:52 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox