Op 30-01-18 om 16:21 schreef Harry Wentland:
> On 2018-01-30 05:27 AM, Maarten Lankhorst wrote:
>> Userspace can set a FB_ID on a plane without setting CRTC_ID, which
>> will fail with -EINVAL, but the kernel shouldn't warn about that.
>>
>> Same for !FB_ID and CRTC_ID being set.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
>> Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch>
> Reviewed-by: Harry Wentland <harry.wentl...@amd.com>
>
> Harry
Thanks, pushed!

~Maarten
>> Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
>> ---
>>  drivers/gpu/drm/drm_atomic.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
>> index 51a848c553b9..7d9ad20040a1 100644
>> --- a/drivers/gpu/drm/drm_atomic.c
>> +++ b/drivers/gpu/drm/drm_atomic.c
>> @@ -863,10 +863,10 @@ static int drm_atomic_plane_check(struct drm_plane 
>> *plane,
>>      int ret;
>>  
>>      /* either *both* CRTC and FB must be set, or neither */
>> -    if (WARN_ON(state->crtc && !state->fb)) {
>> +    if (state->crtc && !state->fb) {
>>              DRM_DEBUG_ATOMIC("CRTC set but no FB\n");
>>              return -EINVAL;
>> -    } else if (WARN_ON(state->fb && !state->crtc)) {
>> +    } else if (state->fb && !state->crtc) {
>>              DRM_DEBUG_ATOMIC("FB set but no CRTC\n");
>>              return -EINVAL;
>>      }
>>

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to