From patchwork Tue Sep 3 19:05:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11128611 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FFBD1398 for ; Tue, 3 Sep 2019 19:06:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17C8921897 for ; Tue, 3 Sep 2019 19:06:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17C8921897 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 950C78970E; Tue, 3 Sep 2019 19:05:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 76F318970E for ; Tue, 3 Sep 2019 19:05:54 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id u6so13683109edq.6 for ; Tue, 03 Sep 2019 12:05:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rMbe/90UeFfqEUrk4ND8PxMTYBDDkx6JYpo4F1BWcC8=; b=OyMRTVRpEgE2YAcjPvv4l6VuihRhUJVMo61pzScfAI0hETA+JzSIiGIbSO+zMR6m6z LG++o1WAsdf4FU0wu/Puq+QALmQ+03gY9RDcgFm4s7xu/Qq3kGLtW2udAppp4N6Zaof9 +y5IMmkMfcV75q3No2VazD+wmDsSsLzDA/e1tRxKPxQUStvTMOHVwHvp25+6JZ1gt0EW OLgaDbBD4HZuq9Ne4O2g3D+nFpH/xEXx33wEn+NAU0UpW8TfjVQwTBhKnpcMDaqNbSoY awPv9gQ1cyw9iXJnr/6QlUwMx3FJ1EHrmvBZwpWBOkBo5B3K2ADWr3s78j9vtsYsSNfu 3E1w== X-Gm-Message-State: APjAAAXSOO4nWoaRHizNxSML7wcQoNJFvJN75nbK4xKpCFlseVtqc7Ea Uj7t+4DOgoUOZN9zVxPVLIn8U1aHNcc= X-Google-Smtp-Source: APXvYqxN/Y6aPD7JASs4itjBnR/gvRxtylDnevVJ/hnjg0KTrnwyas9PoqDn7aPPGvSQlIpIMTlLKQ== X-Received: by 2002:a50:b19c:: with SMTP id m28mr26549237edd.189.1567537552813; Tue, 03 Sep 2019 12:05:52 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id 60sm1766309edg.10.2019.09.03.12.05.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 12:05:52 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/3] drm/atomic: Reject FLIP_ASYNC unconditionally Date: Tue, 3 Sep 2019 21:05:43 +0200 Message-Id: <20190903190545.31852-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rMbe/90UeFfqEUrk4ND8PxMTYBDDkx6JYpo4F1BWcC8=; b=PJ5ZC67poNYVba0KlxW5VX4k9UsYhOC7oyFZHGPHL8WmT0zU4uF+7ou/Z3Lso887c+ AnVR6mTC0FckX2sjbpPR8itM22iXZT3ETuj0USV/+XXti+uBQfsE4EKFYN8Oh5YqC7zw HV0X8JNTlzVuFlyeINVOs/3UjBLPBa95qpxjI= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Intel Graphics Development , Daniel Vetter , Sean Paul , =?utf-8?q?Michel_D=C3=A4nzer?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's never been wired up. Only userspace that tried to use it (and didn't actually check whether anything works, but hey it builds) is the -modesetting atomic implementation. And we just shut that up. If there's anyone else then we need to silently accept this flag no matter what, and find a new one. Because once a flag is tainted, it's lost. Cc: Maarten Lankhorst Cc: Michel Dänzer Cc: Alex Deucher Cc: Adam Jackson Cc: Sean Paul Cc: David Airlie Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic_uapi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 5a5b42db6f2a..7a26bfb5329c 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1305,8 +1305,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, if (arg->reserved) return -EINVAL; - if ((arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) && - !dev->mode_config.async_page_flip) + if (arg->flags & DRM_MODE_PAGE_FLIP_ASYNC) return -EINVAL; /* can't test and expect an event at the same time. */ From patchwork Tue Sep 3 19:05:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11128613 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C12014DE for ; Tue, 3 Sep 2019 19:06:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7F3F21897 for ; Tue, 3 Sep 2019 19:06:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7F3F21897 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5CF37897F6; Tue, 3 Sep 2019 19:05:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E3A7897E0 for ; Tue, 3 Sep 2019 19:05:56 +0000 (UTC) Received: by mail-ed1-x52b.google.com with SMTP id a21so19529982edt.11 for ; Tue, 03 Sep 2019 12:05:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AfggZ0WajqsEsX7GT7/dkVfqgd/d7hv/y36/qpw7Emw=; b=DzoIqBloMlr7y/qnMzWFf8Mbqm03/XLVuxb/13b0FYRoKXCF+b1CMrMnKrVF9SJhWJ X7gBZfZzV+NS5ZKUwwpdDwQdJxjxiYf9jCS0ZBnY57diXIVjHvQ8zwpcq5Nrd9NFtGp1 21KvEi62+NpYFeMkiAp8Jq/kVh+Hh4bm0+TF9ypvoLQ0m4cVW3IcmwgPwZd0OYr3hfQm NcJzlGO2KJsl3q2Y1IeExcu1lc5Bk3Dvq6yP6t1Em/7txqkkFMKnHQXugEpAT0HnA9gl /JtxR+IF0C/oPew/CANwr7pEyVE+bziNtPYG4y8w9TprLYktY58HJ4VPM5j2TAITqHG1 /B3w== X-Gm-Message-State: APjAAAVAVLAiwNKLLjDJClAOvJSXXExxo2s+sxjOgIpgkrYMYjneJ1Il OQU/bP+Y4lvNoPG0h8SgSSfO5D/PocM= X-Google-Smtp-Source: APXvYqyeyE9O0SKjKm5lJztdpbnftfn9vIddbZ8uCzNnuL0Tu+OuyjVa7AFvwEI9g2YCLlJt9CNcuw== X-Received: by 2002:a50:f5ab:: with SMTP id u40mr16022172edm.90.1567537554359; Tue, 03 Sep 2019 12:05:54 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id 60sm1766309edg.10.2019.09.03.12.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 12:05:53 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/3] drm/atomic: Rename crtc_state->pageflip_flags to async_flip Date: Tue, 3 Sep 2019 21:05:44 +0200 Message-Id: <20190903190545.31852-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190903190545.31852-1-daniel.vetter@ffwll.ch> References: <20190903190545.31852-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AfggZ0WajqsEsX7GT7/dkVfqgd/d7hv/y36/qpw7Emw=; b=kbCBMGCfJfSmjR0EFaoHO7xuZhjHn/jKHTfZIcBNeCgx5RzNOKLt17+CkbOmsg8QsZ 4UscypswXsgIgXdfkY2CFSyMBCIrOIjqWE0gt9GRwaLI2PVY2ON8C3luMOX2ruKyyhLF SpBMxbnNNFrjMnOv8YdM9ovYR74/dbWQ/OAEI= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Daniel Vetter , Sam Ravnborg , Sean Paul , David Francis , Maxime Ripard , Ben Skeggs , =?utf-8?q?Michel_D=C3=A4nzer?= , Leo Li , Intel Graphics Development , Bhawanpreet Lakha , Nicholas Kazlauskas , =?utf-8?q?Christian_K?= =?utf-8?q?=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's the only flag anyone actually cares about. Plus if we're unlucky, the atomic ioctl might need a different flag for async flips. So better to abstract this away from the uapi a bit. Cc: Maarten Lankhorst Cc: Michel Dänzer Cc: Alex Deucher Cc: Adam Jackson Cc: Sean Paul Cc: David Airlie Signed-off-by: Daniel Vetter Cc: Maxime Ripard Cc: Daniel Vetter Cc: Nicholas Kazlauskas Cc: Leo Li Cc: Harry Wentland Cc: David Francis Cc: Mario Kleiner Cc: Bhawanpreet Lakha Cc: Ben Skeggs Cc: "Christian König" Cc: Ilia Mirkin Cc: Sam Ravnborg Cc: Chris Wilson --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++--- drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 4 ++-- include/drm/drm_crtc.h | 8 ++++---- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 028a710c1b46..b3c5ab3d09d5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5740,8 +5740,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, * change FB pitch, DCC state, rotation or mirroing. */ bundle->flip_addrs[planes_count].flip_immediate = - (crtc->state->pageflip_flags & - DRM_MODE_PAGE_FLIP_ASYNC) != 0 && + crtc->state->async_flip && acrtc_state->update_type == UPDATE_TYPE_FAST; timestamp_ns = ktime_get_ns(); @@ -6335,7 +6334,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) amdgpu_dm_enable_crtc_interrupts(dev, state, true); for_each_new_crtc_in_state(state, crtc, new_crtc_state, j) - if (new_crtc_state->pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC) + if (new_crtc_state->async_flip) wait_for_vblank = false; /* update planes when needed per crtc*/ diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 9f17746f4251..8dbf416e2807 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3262,7 +3262,7 @@ static int page_flip_common(struct drm_atomic_state *state, return PTR_ERR(crtc_state); crtc_state->event = event; - crtc_state->pageflip_flags = flags; + crtc_state->async_flip = flags & DRM_MODE_PAGE_FLIP_ASYNC; plane_state = drm_atomic_get_plane_state(state, plane); if (IS_ERR(plane_state)) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index 46dc264a248b..d0a937fb0c56 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -128,7 +128,7 @@ void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc, state->zpos_changed = false; state->commit = NULL; state->event = NULL; - state->pageflip_flags = 0; + state->async_flip = false; /* Self refresh should be canceled when a new update is available */ state->active = drm_atomic_crtc_effectively_active(state); diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c index 2db029371c91..5193b6257061 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -267,7 +267,7 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw, bool modeset, asyw->image.pitch[0] = fb->base.pitches[0]; } - if (!(asyh->state.pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC)) + if (!asyh->state.async_flip) asyw->image.interval = 1; else asyw->image.interval = 0; @@ -383,7 +383,7 @@ nv50_wndw_atomic_check_lut(struct nv50_wndw *wndw, } /* Can't do an immediate flip while changing the LUT. */ - asyh->state.pageflip_flags &= ~DRM_MODE_PAGE_FLIP_ASYNC; + asyh->state.async_flip = false; } static int diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 7d14c11bdc0a..c4528eb5d168 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -285,12 +285,12 @@ struct drm_crtc_state { u32 target_vblank; /** - * @pageflip_flags: + * @async_flip: * - * DRM_MODE_PAGE_FLIP_* flags, as passed to the page flip ioctl. - * Zero in any other case. + * This is set when DRM_MODE_PAGE_FLIP_ASYNC is set in the legacy + * PAGE_FLIP IOCTL. It's not wired up for the atomic IOCTL itself yet. */ - u32 pageflip_flags; + bool async_flip; /** * @vrr_enabled: From patchwork Tue Sep 3 19:05:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11128619 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E01091398 for ; Tue, 3 Sep 2019 19:06:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C7DC221897 for ; Tue, 3 Sep 2019 19:06:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7DC221897 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 178E8897DC; Tue, 3 Sep 2019 19:05:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id E7683897E3 for ; Tue, 3 Sep 2019 19:05:56 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id o9so7994339edq.0 for ; Tue, 03 Sep 2019 12:05:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BHSSDEkT7dUoxkAbSUA7HqJarSSXFug0EO2xPu8QeaE=; b=CApGdTNzsdbB9PSrE0kcVgTnHr3g8/EOZ9DhmubC1NUPx7m3UcFpDuhplhESnwzMKs Ea8oPC0KcYSNRSTOei4eho8nZTGl2K/uRFDPpIUVuytd+P2sy2J275tS4Qs20kU+nj5+ N3vL6Y8kuLXcgKXtNW7EVkc4jAESOHuKp54UWZUv2tg6znuAYWEEq100z+GGcZVCHSpS QMNNy1NeOgg/SlrOLGSF3AICZXWa5t8+DLJKr6zlbxJhkFeJvsHKNm9W95A+yd8NAheZ aC2emax2iHuO+iyc7t4L7ipAFsvjKc/C0/o2D9iAaYR7yThkefWA0AgZoBTTHR2N21o4 SrFQ== X-Gm-Message-State: APjAAAVgv8uCYaNkVvSG74cdYCNc0qCMMuuGbhFJP6LKlBdWk9AgGCGZ 1CZ1ewbLIrpIOfZUfyLY8NJH+Xm6EEI= X-Google-Smtp-Source: APXvYqy+JQSGWqGQuMtj6yyu118O5oO+3b1ZZ2WlJR4dfBvOlOeP+4E/+y50Ne51tVTLlxZlhCtQiA== X-Received: by 2002:a50:9438:: with SMTP id p53mr18679424eda.291.1567537555279; Tue, 03 Sep 2019 12:05:55 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id 60sm1766309edg.10.2019.09.03.12.05.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 12:05:54 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/3] fixup Date: Tue, 3 Sep 2019 21:05:45 +0200 Message-Id: <20190903190545.31852-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190903190545.31852-1-daniel.vetter@ffwll.ch> References: <20190903190545.31852-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BHSSDEkT7dUoxkAbSUA7HqJarSSXFug0EO2xPu8QeaE=; b=HhqwnK6bxhtv5asCKJmvx15Fz2sOmNFglhLHa1ykapOOf/Xl0/pUmQnUks/7GirIni i2k9kGXEd/AIGCTVbWZNOn1cCXeFPjt5VBjDxjL6OqghAxBDSCAO7wvAOn1sbYKhwsKz 5XwQbndBw101DBNPm8vhz2fDt/u/kTIHXeMuA= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --- drivers/gpu/drm/drm_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 3c015dd3c94b..1cb7b4c3c87c 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -335,7 +335,7 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) break; case DRM_CLIENT_CAP_ATOMIC: /* The modesetting DDX has a totally broken idea of atomic. */ - if (strstr("X", current->comm)) + if (strstr(current->comm, "X")) return -EOPNOTSUPP; if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) return -EOPNOTSUPP;