[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1385978429.2972.8.camel@x41.thuisdomein>
Date: Mon, 02 Dec 2013 11:00:29 +0100
From: Paul Bolle <pebolle@...cali.nl>
To: ville.syrjala@...ux.intel.com
Cc: intel-gfx@...ts.freedesktop.org, Daniel Vetter <daniel@...ll.ch>,
Dave Airlie <airlied@...hat.com>, linux-kernel@...r.kernel.org,
dri-devel@...ts.freedesktop.org
Subject: Re: [PATCH] drm/i915: Take modeset locks around
intel_modeset_setup_hw_state()
On Mon, 2013-12-02 at 11:08 +0200, ville.syrjala@...ux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@...ux.intel.com>
>
> Some lower level things get angry if we don't have modeset locks
> during intel_modeset_setup_hw_state(). Actually the resume and
> lid_notify codepaths alreday hold the locks, but the init codepath
> doesn't, so fix that.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@...ux.intel.com>
> ---
> Totally untested, but looks correct to me.
I assume I need to test this, on top of 7c063c725987 ("drm/i915: take
mode config lock around crtc disable at suspend"), to see if this makes
the WARNING that I currently see at boot go away?
Paul Bolle
> drivers/gpu/drm/i915/intel_display.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 080f6fd..114db51 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11046,7 +11046,9 @@ void intel_modeset_gem_init(struct drm_device *dev)
>
> intel_setup_overlay(dev);
>
> + drm_modeset_lock_all(dev);
> intel_modeset_setup_hw_state(dev, false);
> + drm_modeset_unlock_all(dev);
> }
>
> void intel_modeset_cleanup(struct drm_device *dev)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists