On Wed, Jun 29, 2011 at 8:44 AM, Keith Packard <keithp at keithp.com> wrote:
> On Wed, 29 Jun 2011 06:27:53 +0100, Marcin Nowakowski <marcin.nowakowski.000 
> at gmail.com> wrote:
>
>> There was an enormous amount of such warnings in rc3/rc4, but with the
>> latest fixes the number is significantly reduced - some still
>> remaining though:
>
> Thanks for finding a few more. Here's a patch which fixes these on my
> system:
>
> From 84a46e9ba3c077535c22a006c5da9988524a6b8b Mon Sep 17 00:00:00 2001
> From: Keith Packard <keithp at keithp.com>
> Date: Wed, 29 Jun 2011 00:30:34 -0700
> Subject: [PATCH] drm/i915: Hold struct_mutex during
> ?i915_save_state/i915_restore_state
>
> Lots of register access in these functions, some of which requires the
> struct mutex.
>
> These functions now hold the struct mutex across the calls to
> i915_save_display and i915_restore_display, and so the internal mutex
> calls in those functions have been removed. To ensure that no-one else
> was calling them (and hence violating the new required locking
> invarient), those functions have been made static.
>
> gen6_enable_rps locks the struct mutex, and so i915_restore_state
> unlocks the mutex around calls to that function.
>
> Signed-off-by: Keith Packard <keithp at keithp.com>


All warnings now gone, thanks.

What about the *ERROR* lines I mentioned in the first email? This
patch doesn't address those - are they anything serious (otherwise
they probably wouldn't be marked as errors)?

Marcin

Reply via email to