From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9755C15ADB9; Wed, 10 Apr 2024 10:35:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712745349; cv=none; b=oyHEEAZQQ8oh1GMJSR+YWtchQHOhD6wYV411jcagYPGKOMrnT0Wk/9zLNQ7kmKqnmCb3kZylyair+TLeyrdEiMKVZwOEcV2WVj7Bdw64DizUFfwGVie4K7zAmURxSv1eXa3pVX+tF1BRgrKPQca/chQjLyC3APalGv2rg1yfNFU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712745349; c=relaxed/simple; bh=PLav8fE5EeCAklg43QqEIoof0rzFGWoRWIjUmj3QOLk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=RrwZB9vV03Rlfzi31i/KTilZtduX6qVRmGDtbM4RkUgdVu2VhdS/D4JDBbEH9J9pfsAQssvabBo3KC/1viZIwqPVQPyoSUfG1ks1Hedb0TZlFfspkr+2xNaQ50kGXb9FL5fORBabRYT3Ri9hKQ8Qmrj9Eqsk02yy49x3zsjUv3M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=lRpI9/Wv; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="lRpI9/Wv" Received: from [192.168.88.20] (91-154-34-181.elisa-laajakaista.fi [91.154.34.181]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 38B658BE; Wed, 10 Apr 2024 12:35:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1712745302; bh=PLav8fE5EeCAklg43QqEIoof0rzFGWoRWIjUmj3QOLk=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=lRpI9/WvK/Abs/cf7Q4r1SG3xCOGljK8Rp6sPfaHYq3datN2+ZzcWqRo2JzJhQFvp u86I9df2d96Nde59mXEQVN7u6G9+3H/1sY9fsejMVW/fefHDaVMY8S9lYE19ntNkTp SQMisJNoNcPKdsYr+IlGGHEWDkWPS8CcuQZKmFnI= Message-ID: Date: Wed, 10 Apr 2024 13:35:41 +0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 8/9] media: subdev: Refactor v4l2_subdev_enable/disable_streams() To: Sakari Ailus Cc: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Umang Jain , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org References: <20240405-enable-streams-impro-v2-0-22bca967665d@ideasonboard.com> <20240405-enable-streams-impro-v2-8-22bca967665d@ideasonboard.com> Content-Language: en-US From: Tomi Valkeinen Autocrypt: addr=tomi.valkeinen@ideasonboard.com; keydata= xsFNBE6ms0cBEACyizowecZqXfMZtnBniOieTuFdErHAUyxVgtmr0f5ZfIi9Z4l+uUN4Zdw2 wCEZjx3o0Z34diXBaMRJ3rAk9yB90UJAnLtb8A97Oq64DskLF81GCYB2P1i0qrG7UjpASgCA Ru0lVvxsWyIwSfoYoLrazbT1wkWRs8YBkkXQFfL7Mn3ZMoGPcpfwYH9O7bV1NslbmyJzRCMO eYV258gjCcwYlrkyIratlHCek4GrwV8Z9NQcjD5iLzrONjfafrWPwj6yn2RlL0mQEwt1lOvn LnI7QRtB3zxA3yB+FLsT1hx0va6xCHpX3QO2gBsyHCyVafFMrg3c/7IIWkDLngJxFgz6DLiA G4ld1QK/jsYqfP2GIMH1mFdjY+iagG4DqOsjip479HCWAptpNxSOCL6z3qxCU8MCz8iNOtZk DYXQWVscM5qgYSn+fmMM2qN+eoWlnCGVURZZLDjg387S2E1jT/dNTOsM/IqQj+ZROUZuRcF7 0RTtuU5q1HnbRNwy+23xeoSGuwmLQ2UsUk7Q5CnrjYfiPo3wHze8avK95JBoSd+WIRmV3uoO rXCoYOIRlDhg9XJTrbnQ3Ot5zOa0Y9c4IpyAlut6mDtxtKXr4+8OzjSVFww7tIwadTK3wDQv Bus4jxHjS6dz1g2ypT65qnHen6mUUH63lhzewqO9peAHJ0SLrQARAQABzTBUb21pIFZhbGtl aW5lbiA8dG9taS52YWxrZWluZW5AaWRlYXNvbmJvYXJkLmNvbT7CwY4EEwEIADgWIQTEOAw+ ll79gQef86f6PaqMvJYe9QUCX/HruAIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRD6 PaqMvJYe9WmFD/99NGoD5lBJhlFDHMZvO+Op8vCwnIRZdTsyrtGl72rVh9xRfcSgYPZUvBuT VDxE53mY9HaZyu1eGMccYRBaTLJSfCXl/g317CrMNdY0k40b9YeIX10feiRYEWoDIPQ3tMmA 0nHDygzcnuPiPT68JYZ6tUOvAt7r6OX/litM+m2/E9mtp8xCoWOo/kYO4mOAIoMNvLB8vufi uBB4e/AvAjtny4ScuNV5c5q8MkfNIiOyag9QCiQ/JfoAqzXRjVb4VZG72AKaElwipiKCWEcU R4+Bu5Qbaxj7Cd36M/bI54OrbWWETJkVVSV1i0tghCd6HHyquTdFl7wYcz6cL1hn/6byVnD+ sR3BLvSBHYp8WSwv0TCuf6tLiNgHAO1hWiQ1pOoXyMEsxZlgPXT+wb4dbNVunckwqFjGxRbl Rz7apFT/ZRwbazEzEzNyrBOfB55xdipG/2+SmFn0oMFqFOBEszXLQVslh64lI0CMJm2OYYe3 PxHqYaztyeXsx13Bfnq9+bUynAQ4uW1P5DJ3OIRZWKmbQd/Me3Fq6TU57LsvwRgE0Le9PFQs dcP2071rMTpqTUteEgODJS4VDf4lXJfY91u32BJkiqM7/62Cqatcz5UWWHq5xeF03MIUTqdE qHWk3RJEoWHWQRzQfcx6Fn2fDAUKhAddvoopfcjAHfpAWJ+ENc7BTQROprNHARAAx0aat8GU hsusCLc4MIxOQwidecCTRc9Dz/7U2goUwhw2O5j9TPqLtp57VITmHILnvZf6q3QAho2QMQyE DDvHubrdtEoqaaSKxKkFie1uhWNNvXPhwkKLYieyL9m2JdU+b88HaDnpzdyTTR4uH7wk0bBa KbTSgIFDDe5lXInypewPO30TmYNkFSexnnM3n1PBCqiJXsJahE4ZQ+WnV5FbPUj8T2zXS2xk 0LZ0+DwKmZ0ZDovvdEWRWrz3UzJ8DLHb7blPpGhmqj3ANXQXC7mb9qJ6J/VSl61GbxIO2Dwb xPNkHk8fwnxlUBCOyBti/uD2uSTgKHNdabhVm2dgFNVuS1y3bBHbI/qjC3J7rWE0WiaHWEqy UVPk8rsph4rqITsj2RiY70vEW0SKePrChvET7D8P1UPqmveBNNtSS7In+DdZ5kUqLV7rJnM9 /4cwy+uZUt8cuCZlcA5u8IsBCNJudxEqBG10GHg1B6h1RZIz9Q9XfiBdaqa5+CjyFs8ua01c 9HmyfkuhXG2OLjfQuK+Ygd56mV3lq0aFdwbaX16DG22c6flkkBSjyWXYepFtHz9KsBS0DaZb 4IkLmZwEXpZcIOQjQ71fqlpiXkXSIaQ6YMEs8WjBbpP81h7QxWIfWtp+VnwNGc6nq5IQDESH mvQcsFS7d3eGVI6eyjCFdcAO8eMAEQEAAcLBXwQYAQIACQUCTqazRwIbDAAKCRD6PaqMvJYe 9fA7EACS6exUedsBKmt4pT7nqXBcRsqm6YzT6DeCM8PWMTeaVGHiR4TnNFiT3otD5UpYQI7S suYxoTdHrrrBzdlKe5rUWpzoZkVK6p0s9OIvGzLT0lrb0HC9iNDWT3JgpYDnk4Z2mFi6tTbq xKMtpVFRA6FjviGDRsfkfoURZI51nf2RSAk/A8BEDDZ7lgJHskYoklSpwyrXhkp9FHGMaYII m9EKuUTX9JPDG2FTthCBrdsgWYPdJQvM+zscq09vFMQ9Fykbx5N8z/oFEUy3ACyPqW2oyfvU CH5WDpWBG0s5BALp1gBJPytIAd/pY/5ZdNoi0Cx3+Z7jaBFEyYJdWy1hGddpkgnMjyOfLI7B CFrdecTZbR5upjNSDvQ7RG85SnpYJTIin+SAUazAeA2nS6gTZzumgtdw8XmVXZwdBfF+ICof 92UkbYcYNbzWO/GHgsNT1WnM4sa9lwCSWH8Fw1o/3bX1VVPEsnESOfxkNdu+gAF5S6+I6n3a ueeIlwJl5CpT5l8RpoZXEOVtXYn8zzOJ7oGZYINRV9Pf8qKGLf3Dft7zKBP832I3PQjeok7F yjt+9S+KgSFSHP3Pa4E7lsSdWhSlHYNdG/czhoUkSCN09C0rEK93wxACx3vtxPLjXu6RptBw 3dRq7n+mQChEB1am0BueV1JZaBboIL0AGlSJkm23kw== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/04/2024 13:13, Sakari Ailus wrote: > Moi, > > Thank you for working on this. > > On Fri, Apr 05, 2024 at 12:14:26PM +0300, Tomi Valkeinen wrote: >> Add two internal helper functions, v4l2_subdev_collect_streams() and >> v4l2_subdev_set_streams_enabled(), which allows us to refactor >> v4l2_subdev_enable/disable_streams() functions. >> >> This (I think) makes the code a bit easier to read, and lets us more >> easily add new functionality in the helper functions in the following >> patch. >> >> Signed-off-by: Tomi Valkeinen >> --- >> drivers/media/v4l2-core/v4l2-subdev.c | 111 +++++++++++++++++++--------------- >> 1 file changed, 62 insertions(+), 49 deletions(-) >> >> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c >> index 015f2fb423c9..6c3c9069f1e2 100644 >> --- a/drivers/media/v4l2-core/v4l2-subdev.c >> +++ b/drivers/media/v4l2-core/v4l2-subdev.c >> @@ -2099,6 +2099,44 @@ int v4l2_subdev_routing_validate(struct v4l2_subdev *sd, >> } >> EXPORT_SYMBOL_GPL(v4l2_subdev_routing_validate); >> >> +static void v4l2_subdev_collect_streams(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, >> + u32 pad, u64 streams_mask, >> + u64 *found_streams, >> + u64 *enabled_streams) >> +{ >> + *found_streams = 0; >> + *enabled_streams = 0; >> + >> + for (unsigned int i = 0; i < state->stream_configs.num_configs; ++i) { >> + const struct v4l2_subdev_stream_config *cfg; >> + >> + cfg = &state->stream_configs.configs[i]; > > You can do the assignment in declaration. I can, but you want the lines to be split at 80, so that'll end up being in two lines, which, I think, looks messier than the one above. Usually I think doing initialization when declaring the variable is best done if it fits into one line. Tomi > > Same for streams_enabled() below. > >> + >> + if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) >> + continue; >> + >> + *found_streams |= BIT_ULL(cfg->stream); >> + if (cfg->enabled) >> + *enabled_streams |= BIT_ULL(cfg->stream); >> + } >> +} >> + >> +static void v4l2_subdev_set_streams_enabled(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, >> + u32 pad, u64 streams_mask, >> + bool enabled) >> +{ >> + for (unsigned int i = 0; i < state->stream_configs.num_configs; ++i) { >> + struct v4l2_subdev_stream_config *cfg; >> + >> + cfg = &state->stream_configs.configs[i]; >> + >> + if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) >> + cfg->enabled = enabled; >> + } >> +} >> + >> static int v4l2_subdev_enable_streams_fallback(struct v4l2_subdev *sd, u32 pad, >> u64 streams_mask) >> { >> @@ -2150,8 +2188,8 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, >> struct device *dev = sd->entity.graph_obj.mdev->dev; >> struct v4l2_subdev_state *state; >> bool already_streaming; >> - u64 found_streams = 0; >> - unsigned int i; >> + u64 enabled_streams; >> + u64 found_streams; >> int ret; >> >> /* A few basic sanity checks first. */ >> @@ -2172,22 +2210,9 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, >> * Verify that the requested streams exist and that they are not >> * already enabled. >> */ >> - for (i = 0; i < state->stream_configs.num_configs; ++i) { >> - struct v4l2_subdev_stream_config *cfg = >> - &state->stream_configs.configs[i]; >> >> - if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) >> - continue; >> - >> - found_streams |= BIT_ULL(cfg->stream); >> - >> - if (cfg->enabled) { >> - dev_dbg(dev, "stream %u already enabled on %s:%u\n", >> - cfg->stream, sd->entity.name, pad); >> - ret = -EALREADY; >> - goto done; >> - } >> - } >> + v4l2_subdev_collect_streams(sd, state, pad, streams_mask, >> + &found_streams, &enabled_streams); >> >> if (found_streams != streams_mask) { >> dev_dbg(dev, "streams 0x%llx not found on %s:%u\n", >> @@ -2196,6 +2221,13 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, >> goto done; >> } >> >> + if (enabled_streams) { >> + dev_dbg(dev, "streams 0x%llx already enabled on %s:%u\n", >> + enabled_streams, sd->entity.name, pad); >> + ret = -EINVAL; >> + goto done; >> + } >> + >> dev_dbg(dev, "enable streams %u:%#llx\n", pad, streams_mask); >> >> already_streaming = v4l2_subdev_is_streaming(sd); >> @@ -2213,13 +2245,7 @@ int v4l2_subdev_enable_streams(struct v4l2_subdev *sd, u32 pad, >> } >> >> /* Mark the streams as enabled. */ >> - for (i = 0; i < state->stream_configs.num_configs; ++i) { >> - struct v4l2_subdev_stream_config *cfg = >> - &state->stream_configs.configs[i]; >> - >> - if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) >> - cfg->enabled = true; >> - } >> + v4l2_subdev_set_streams_enabled(sd, state, pad, streams_mask, true); >> >> done: >> if (ret && !already_streaming) >> @@ -2281,8 +2307,8 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, >> { >> struct device *dev = sd->entity.graph_obj.mdev->dev; >> struct v4l2_subdev_state *state; >> - u64 found_streams = 0; >> - unsigned int i; >> + u64 enabled_streams; >> + u64 found_streams; >> int ret; >> >> /* A few basic sanity checks first. */ >> @@ -2303,22 +2329,9 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, >> * Verify that the requested streams exist and that they are not >> * already disabled. >> */ >> - for (i = 0; i < state->stream_configs.num_configs; ++i) { >> - struct v4l2_subdev_stream_config *cfg = >> - &state->stream_configs.configs[i]; >> >> - if (cfg->pad != pad || !(streams_mask & BIT_ULL(cfg->stream))) >> - continue; >> - >> - found_streams |= BIT_ULL(cfg->stream); >> - >> - if (!cfg->enabled) { >> - dev_dbg(dev, "stream %u already disabled on %s:%u\n", >> - cfg->stream, sd->entity.name, pad); >> - ret = -EALREADY; >> - goto done; >> - } >> - } >> + v4l2_subdev_collect_streams(sd, state, pad, streams_mask, >> + &found_streams, &enabled_streams); >> >> if (found_streams != streams_mask) { >> dev_dbg(dev, "streams 0x%llx not found on %s:%u\n", >> @@ -2327,6 +2340,13 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, >> goto done; >> } >> >> + if (enabled_streams != streams_mask) { >> + dev_dbg(dev, "streams 0x%llx already disabled on %s:%u\n", >> + streams_mask & ~enabled_streams, sd->entity.name, pad); >> + ret = -EINVAL; >> + goto done; >> + } >> + >> dev_dbg(dev, "disable streams %u:%#llx\n", pad, streams_mask); >> >> /* Call the .disable_streams() operation. */ >> @@ -2338,14 +2358,7 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, >> goto done; >> } >> >> - /* Mark the streams as disabled. */ >> - for (i = 0; i < state->stream_configs.num_configs; ++i) { >> - struct v4l2_subdev_stream_config *cfg = >> - &state->stream_configs.configs[i]; >> - >> - if (cfg->pad == pad && (streams_mask & BIT_ULL(cfg->stream))) >> - cfg->enabled = false; >> - } >> + v4l2_subdev_set_streams_enabled(sd, state, pad, streams_mask, false); >> >> done: >> if (!v4l2_subdev_is_streaming(sd)) >> >