Re: [PATCH 24/81] drm/fb helper: don't call drm_crtc_helper_set_config

Daniel Vetter
2012-07-18T15:49:22Z

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 <daniel.vetter@ffwll.ch>
> ---
> 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