From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.45 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795095394; b=N+fe2GaydMG0iqrIqYDkeSVS3ovFyU3TbNSHrhkMlL8hjnp97MAAE9OfJIoDzEUE65gv io0c6jt8G5VxUgMrRKZhkvK0lptCMwi3eqHcUMG4vGY7/PMfkhT1T0FVQm6lzVATzJJ80 /O+AC6O7yr99rUO/eK7zPi7x+wI+EZ97yoNbyTCgNAR65Mfw8AmGmfPL1DL7VziGfQrgH 9oNR9LOpvnZw/8dzaMrq9fQIcN4jxda1KnP6vMcOcgTQ72AF1cu406eS0DfRE96IuzV3f ERgKWhXaCfm5WY1rgJ05oZ+sZRAq669vFs/4Cqd8jHj22L8koma6AZzEZVy4Wu4dQJw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795095394; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=4LNJl1KvBRoHPGDthD6nMoONkH1GEfbZ05kasQLsnCI=; b=D2fGO3hkhVU+9GFHb6WIaOQcu/yY/A8yEwMhVL75ZLutK52fidf5QyQ0ZGvtxUJJLzlu 8l7Buuis30wKbJl5hDPTf+67pO4JUHlr9vsMhleTu1Fi3iPjbf1XtFXWfCoIOgl5CZn27 XSovHmYne/xMYC/UPpWVWhIIbYR2rY8R69lRB5Qkc9yyG66LHGRtqlUKpbZsGZHiwx1nE AE/5Y3M1yxrlJPET0WHc/M13Ow31Wi3IDcVhNBrHh5jIk0Z+VCLZPKzm17WB3AqS4j/Kx bhuS57Lvy1vmoaw4mz64f/kQtE5N2OXZxHfOrcS2rQOV+PLOlQCSCOzAb51SdM5IXXA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b="lqj/8l+X"; arc=none smtp.remote-ip=209.85.221.45 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0984E606A325 for ; Thu, 19 Nov 2026 13:36:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0984E606A325 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=lqj/8l+X Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-49412eb1474so1398171f8f.3 for ; Thu, 19 Nov 2026 05:36:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1795095392; x=1795700192; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4LNJl1KvBRoHPGDthD6nMoONkH1GEfbZ05kasQLsnCI=; b=lqj/8l+XkyBjYtIZru+ljFagELi5Rb8X6ODw98JdYe+gv/xAyNiyMGnTo6Gg3NqufF E8/+DhU+hOAnOmCWK+/Me6uxkVlUOv9SjTh12CthfYcWxTsNipg+1LijvSUPHjksRQ0q /m6n80d1F10Uc96KPu1tuhDowo10GXp6boU9Yd/o2WzBW8Ak/22BbSSxVCNKV6lsFudo V8ZuZOYIp1LmohbHKGTN/uQe1Vmld/drXJvCYrfV1wDa/X5IJnftct3u6lVzcmq5rx3e HLzwEsrm+nSdh5fHCrC3oQOC65TNfgze+W3CO1/Ai8WxrhvYdrFQRNIqwRSy1U3+jwuK bfPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795095392; x=1795700192; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=4LNJl1KvBRoHPGDthD6nMoONkH1GEfbZ05kasQLsnCI=; b=uDcixntZuurNKXut60mluW7TqsNsnrnItpQbb3RhdZeJWRgFaoH+nfB9iuiTm6MUzF lSM8Fa4S+ZZSnglU7mgQsnSL79Xwvyd7Hygfu5Vzv6ZaIrUErH91ilSEFBjCT+32QfAt 3qjSWN383d/6My0elB9118KAFRnIRESD1lmba99QLbcbx4PND14WoadonpXBPcdOReTN ipEFDiQPLiRv533qLDmoKit+Q68YKdMJmEvdE9jrakaWhX3ebhbNPOWYohUIpsnRzOdR vHSpid/fNetjWoM80BdcrYunXepNmee3ZtXnieZx7FywlAfg2mIAcqHvuH9SFYooj7LV 9+jA== X-Forwarded-Encrypted: i=1; AL+hErHunsGz5nA5hSJVDmPKuvOb5d2q6DU6EzhLunl8XfalVVWspZ1VgS4/IIsdAf+fWn6LJhPaaZa2QR6MI1E=@vger.kernel.org X-Gm-Message-State: APuU4Z+ZEU3LeJVQYwZ5ZBO/wx2aGdRxfglqkKdw+RdYohwmVs1NM+YC AsIJzwcQILLTmrWJrw6JKy4IrAOlF4lImeFS+gjJUsopCwCC0uqX7DZD X-Gm-Gg: AZFdTZf+Ln8nmHEo6X9B+wxRW5QLFreMXuQ+/xUhN1HJDDd8UmucNeITXiYxnz43t2a gH6OJiTuo9raGFKrXpC+ImYWK0AfvdOd+3KRKZYtnRQi1CPvKpPioFuTrQMvX5EZUiNJAGKaT3E F7QUL8kEgFPgW01hLe4kv8ZuR7UcZsdY7/TvUARerHN1yKGbVRAufxfAVr3oXBRfsQxiDqqs7gC A0gVicemS0IoZoTzU+iBr05wuiSQvpYqf5/aSzgSPxcLtdnjUvEkYLudhamFqeEYbIi8BD5CdKP KgTRNsgEveesRmHfor5Yd33JvRxG/qajB4bCNJ733ZxVOfYZZMNGX2ZM9CXm68o4xKpLnZL919y mtwBjpmPLzB1+X642EC5XiwnzLUWZ3IoDJ0G8xRPBxhzOXKebhKZMfjXDy8Dc5jEY1Umswfag4J HWIb+dWmfd/j6DoeX4PCAiR+J5O4uHBMiwswkA9e1rlYA83ddkBOWtteHvqvmyJWbUT58XYTE2L CXelkojfcDKtukMSBJBc3Sdp6pvvVJqX9gZp3XjQkoPTfxLCJv3zdRlOQCvt6CdfNgcVKoStMWF 93fs2tCWMzVwOXGTibKtlnwr5pZgf2DyMqQqBQJeeQ== X-Received: by 2002:a5d:5d81:0:b0:48d:fd4d:7fbe with SMTP id ffacd0b85a97d-4a6346da919mr13526484f8f.2.1795095392379; Thu, 19 Nov 2026 05:36:32 -0800 (PST) Received: from [10.111.176.198] ([2001:19f0:6c01:2c43:5400:5ff:fef6:1b30]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4a6573ba95csm11547911f8f.56.2026.11.19.05.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2026 05:36:31 -0800 (PST) From: Oarora Etimis Date: Thu, 19 Nov 2026 14:36:03 +0100 Subject: [PATCH v3 1/2] drm/vkms: count the composer users X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261119-composer-v3-1-dd470a820303@gmail.com> References: <20261119-composer-v3-0-dd470a820303@gmail.com> In-Reply-To: <20261119-composer-v3-0-dd470a820303@gmail.com> To: Louis Chauvet , Haneen Mohammed , Simona Vetter , Melissa Wen , Oarora Etimis , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Jonathan Corbet , Shuah Khan , Randy Dunlap , Liviu Dudau , Rodrigo Siqueira Cc: dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15.2 The composer has one on/off switch, shared by the CRC reader and the writeback jobs, so either of them can turn it off for the other. Replace the switch with a count of users: - the CRC source takes and drops one reference per open()/release(), which the core always pairs; - a writeback job keeps the value returned by vkms_composer_get() and only drops a reference it actually took, because a job can be cleaned up after a commit that never reached the composer. vkms_set_composer() becomes vkms_composer_get() and vkms_composer_put(). Fixes: dbd9d80c1b2e ("drm/vkms: Add support for writeback") Signed-off-by: Oarora Etimis --- Documentation/gpu/vkms.rst | 5 ----- drivers/gpu/drm/vkms/vkms_composer.c | 33 +++++++++++++++++++++++++-------- drivers/gpu/drm/vkms/vkms_crtc.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.h | 29 +++++++++++++++++++++++++---- drivers/gpu/drm/vkms/vkms_writeback.c | 7 ++++--- 5 files changed, 55 insertions(+), 21 deletions(-) diff --git a/Documentation/gpu/vkms.rst b/Documentation/gpu/vkms.rst index 1e79e62a6bc4..fe7dc8def44a 100644 --- a/Documentation/gpu/vkms.rst +++ b/Documentation/gpu/vkms.rst @@ -246,11 +246,6 @@ module through configfs. Use/Test-cases: Writeback support ----------------- -- The writeback and CRC capture operations share the use of composer_enabled - boolean to ensure vblanks. Probably, when these operations work together, - composer_enabled needs to refcounting the composer state to proper work. - [Good to get started] - - Add support for cloned writeback outputs and related test cases using a cloned output in the IGT kms_writeback. diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index 0fc915a954ba..96c40eeeb61b 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -711,19 +711,33 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *src_name, return 0; } -void vkms_set_composer(struct vkms_output *out, bool enabled) +bool vkms_composer_get(struct vkms_output *out) { - bool old_enabled; + unsigned int users; - if (enabled) - drm_crtc_vblank_get(&out->crtc); + if (drm_crtc_vblank_get(&out->crtc)) + return false; + + spin_lock_irq(&out->lock); + users = out->composer_users++; + spin_unlock_irq(&out->lock); + + /* All users share a single vblank reference. */ + if (users) + drm_crtc_vblank_put(&out->crtc); + + return true; +} + +void vkms_composer_put(struct vkms_output *out) +{ + unsigned int users; spin_lock_irq(&out->lock); - old_enabled = out->composer_enabled; - out->composer_enabled = enabled; + users = --out->composer_users; spin_unlock_irq(&out->lock); - if (old_enabled) + if (!users) drm_crtc_vblank_put(&out->crtc); } @@ -735,7 +749,10 @@ int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) ret = vkms_crc_parse_source(src_name, &enabled); - vkms_set_composer(out, enabled); + if (enabled) + vkms_composer_get(out); + else + vkms_composer_put(out); return ret; } diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index fe17f49305a9..4e15abfd92a0 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -29,7 +29,7 @@ static bool vkms_crtc_handle_vblank_timeout(struct drm_crtc *crtc) state = output->composer_state; spin_unlock(&output->lock); - if (state && output->composer_enabled) { + if (state && READ_ONCE(output->composer_users)) { u64 frame = drm_crtc_accurate_vblank_count(crtc); /* update frame_start only if a queued vkms_composer_worker() diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index dea6cad3f1b9..f245b64f8726 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -89,6 +89,8 @@ struct vkms_writeback_job { struct iosys_map data[DRM_FORMAT_MAX_PLANES]; struct vkms_frame_info wb_frame_info; pixel_write_t pixel_write; + /* Whether this job holds a reference to the composer. */ + bool composer_wb_holds; }; /** @@ -210,8 +212,9 @@ struct vkms_crtc_state { * vblank timestamps * @composer_workq: Ordered workqueue for @composer_state.composer_work. * @lock: Lock used to protect concurrent access to the composer - * @composer_enabled: Protected by @lock, true when the VKMS composer is active (crc needed or - * writeback) + * @composer_users: Number of users that currently hold a composer reference; the composer + * is active only while it is non-zero. Updated under @lock and read with + * READ_ONCE() from the vblank timeout. * @composer_state: Protected by @lock, current state of this VKMS output * @composer_lock: Lock used internally to protect @composer_state members */ @@ -222,7 +225,7 @@ struct vkms_output { struct workqueue_struct *composer_workq; spinlock_t lock; - bool composer_enabled; + unsigned int composer_users; struct vkms_crtc_state *composer_state; spinlock_t composer_lock; @@ -317,7 +320,25 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *source_name, /* Composer Support */ void vkms_composer_worker(struct work_struct *work); -void vkms_set_composer(struct vkms_output *out, bool enabled); + +/** + * vkms_composer_get() - Take a composer reference + * @out: VKMS output + * + * The composer stays active while at least one reference is held. Users + * whose get() and put() calls are not guaranteed to pair have to keep the + * return value and only call vkms_composer_put() for a reference they took. + * + * Returns: false if no reference was taken. + */ +bool vkms_composer_get(struct vkms_output *out); + +/** + * vkms_composer_put() - Drop a composer reference + * @out: VKMS output + */ +void vkms_composer_put(struct vkms_output *out); + void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_buffer *src_buffer, int y); /* Writeback */ diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index 858df1f89f66..8ebeb8ceeaaf 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -118,7 +118,8 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector, drm_framebuffer_put(vkmsjob->wb_frame_info.fb); - vkms_set_composer(vkms_output, false); + if (vkmsjob->composer_wb_holds) + vkms_composer_put(vkms_output); kfree(vkmsjob); } @@ -141,11 +142,11 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn, if (!conn_state) return; - vkms_set_composer(output, true); - active_wb = conn_state->writeback_job->priv; wb_frame_info = &active_wb->wb_frame_info; + active_wb->composer_wb_holds = vkms_composer_get(output); + spin_lock_irq(&output->composer_lock); crtc_state->active_writeback = active_wb; crtc_state->wb_pending = true; -- 2.56.1