drm/atomic: Call ww_acquire_done after drm_modeset_lock_all
diff mbox

Message ID 20180221152331.9212-1-maarten.lankhorst@linux.intel.com
State New
Headers show

Commit Message

Maarten Lankhorst Feb. 21, 2018, 3:23 p.m. UTC
After we acquired all generic modeset locks in drm_modeset_lock_all, it's
unsafe acquire any other so just mark acquisition as done.

Atomic drivers shouldn't use drm_modeset_lock_all.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/drm_modeset_lock.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Daniel Vetter Feb. 21, 2018, 6:36 p.m. UTC | #1
On Wed, Feb 21, 2018 at 04:23:31PM +0100, Maarten Lankhorst wrote:
> After we acquired all generic modeset locks in drm_modeset_lock_all, it's
> unsafe acquire any other so just mark acquisition as done.
> 
> Atomic drivers shouldn't use drm_modeset_lock_all.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Also, I'm pretty much expecting to regret this like all the other
ww_acquire_done patches I've acked, but where's the fun in not trying :-)

Cheers, Daniel

> ---
>  drivers/gpu/drm/drm_modeset_lock.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 963e23db0fe7..8a5100685875 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -113,6 +113,7 @@ void drm_modeset_lock_all(struct drm_device *dev)
>  		kfree(ctx);
>  		return;
>  	}
> +	ww_acquire_done(&ctx->ww_ctx);
>  
>  	WARN_ON(config->acquire_ctx);
>  
> -- 
> 2.16.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Harry Wentland Feb. 21, 2018, 7:39 p.m. UTC | #2
On 2018-02-21 01:36 PM, Daniel Vetter wrote:
> On Wed, Feb 21, 2018 at 04:23:31PM +0100, Maarten Lankhorst wrote:
>> After we acquired all generic modeset locks in drm_modeset_lock_all, it's
>> unsafe acquire any other so just mark acquisition as done.
>>
>> Atomic drivers shouldn't use drm_modeset_lock_all.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> 
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> Also, I'm pretty much expecting to regret this like all the other
> ww_acquire_done patches I've acked, but where's the fun in not trying :-)
> 

This shouldn't really hurt anything, other than throw DEBUG warnings if DEBUG_MUTEXES is on.

Acked-by: Harry Wentland <harry.wentland@amd.com>

Harry

> Cheers, Daniel
> 
>> ---
>>  drivers/gpu/drm/drm_modeset_lock.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
>> index 963e23db0fe7..8a5100685875 100644
>> --- a/drivers/gpu/drm/drm_modeset_lock.c
>> +++ b/drivers/gpu/drm/drm_modeset_lock.c
>> @@ -113,6 +113,7 @@ void drm_modeset_lock_all(struct drm_device *dev)
>>  		kfree(ctx);
>>  		return;
>>  	}
>> +	ww_acquire_done(&ctx->ww_ctx);
>>  
>>  	WARN_ON(config->acquire_ctx);
>>  
>> -- 
>> 2.16.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
Maarten Lankhorst March 5, 2018, 9:51 a.m. UTC | #3
Op 21-02-18 om 20:39 schreef Harry Wentland:
> On 2018-02-21 01:36 PM, Daniel Vetter wrote:
>> On Wed, Feb 21, 2018 at 04:23:31PM +0100, Maarten Lankhorst wrote:
>>> After we acquired all generic modeset locks in drm_modeset_lock_all, it's
>>> unsafe acquire any other so just mark acquisition as done.
>>>
>>> Atomic drivers shouldn't use drm_modeset_lock_all.
>>>
>>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>>
>> Also, I'm pretty much expecting to regret this like all the other
>> ww_acquire_done patches I've acked, but where's the fun in not trying :-)
>>
> This shouldn't really hurt anything, other than throw DEBUG warnings if DEBUG_MUTEXES is on.
>
> Acked-by: Harry Wentland <harry.wentland@amd.com>
>
> Harry
>
>> Cheers, Daniel
>>
>>> ---
>>>  drivers/gpu/drm/drm_modeset_lock.c | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
>>> index 963e23db0fe7..8a5100685875 100644
>>> --- a/drivers/gpu/drm/drm_modeset_lock.c
>>> +++ b/drivers/gpu/drm/drm_modeset_lock.c
>>> @@ -113,6 +113,7 @@ void drm_modeset_lock_all(struct drm_device *dev)
>>>  		kfree(ctx);
>>>  		return;
>>>  	}
>>> +	ww_acquire_done(&ctx->ww_ctx);
>>>  
>>>  	WARN_ON(config->acquire_ctx);
>>>  
>>> -- 
>>> 2.16.1
>>>
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Thanks, pushed.

Patch
diff mbox

diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index 963e23db0fe7..8a5100685875 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -113,6 +113,7 @@  void drm_modeset_lock_all(struct drm_device *dev)
 		kfree(ctx);
 		return;
 	}
+	ww_acquire_done(&ctx->ww_ctx);
 
 	WARN_ON(config->acquire_ctx);