From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4102FC43140 for ; Sat, 7 Sep 2019 02:42:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D0BA21848 for ; Sat, 7 Sep 2019 02:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567824148; bh=toSRagTMqabMqLXvW50GgNaZxkMxrcFG2c34XWZ4mos=; h=From:To:Cc:Subject:Date:List-ID:From; b=t9RVVUKG35EBm3TDLIRUNgc5be8Te3xc5ZxP2/DALCj/jMwZmVGbNRNWZhbFTADTi Fevuhrxoizm8VoZL2FoO67P9ks/rulw6c/PQCS4GPqMABNJcEu7iAx6Z9he6/ZuoHA NgiW+0oGD8ChKiw+JZWFieqXb3cnn5+D0WmnVylA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393630AbfIGCmY (ORCPT ); Fri, 6 Sep 2019 22:42:24 -0400 Received: from mail-io1-f68.google.com ([209.85.166.68]:46077 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732173AbfIGCmY (ORCPT ); Fri, 6 Sep 2019 22:42:24 -0400 Received: by mail-io1-f68.google.com with SMTP id f12so17166436iog.12 for ; Fri, 06 Sep 2019 19:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=i+500GMq6P99fNxlW2c42WQfDahuR4DKMMEYhycI1s8=; b=Q/hjPJAjWIS1vBCaIihzrqvHRU6XvHcMhq0Di45vLHCvOoonblbaR/ux03o8cGOE4p Mcb9jIOPb/egJkhwi2y1xWet9dC4rjKDTP/u2vFFLGoHqqoOgJJ4PvIxeVjecw2ue+6D brGjyAzyW0H/JSsnQSmQWaH96sUuYIH3U77nM= 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=i+500GMq6P99fNxlW2c42WQfDahuR4DKMMEYhycI1s8=; b=MnUi1Zff5LbKGdU+lX95liyowCWYCn6LpkxaiT5oVL7PxwjQ7ZWcyoufSum9uCSpcU k9tRhNg/NkgHcNrFnF6xvs/LDMrAiDDuj4KS6Tm/o8bEXGehtx94C1bkSOd7Qj4uTVqi Oj8ELA0wlkZudCHHZnCmhySg8LbKOXNdvFQHFWOnVPWvPy95/cnc46twhce16vlKY+Hk GoqOgDicd4EQB8UwBQ8JLPLzdHvw1HvQNZyJ79pocLD3jvEXaxuf4TREmRcetdhBd2Va kbWf+NVn33dLL8egOS1iWyr7HSpCXV5Z5ah6DlBAcuPHEJvXgdByVtjYD/yaPPpgkjIi BokQ== X-Gm-Message-State: APjAAAXrlee9JuzLGToVkKHWCCU78EsDsk0fHUmGoeDXdd5rS1ELtLBU NG6XLljwHWcJ7972hj57HV8AkQ== X-Google-Smtp-Source: APXvYqz2zGIbYdIHsayf3iELWr9oBYKvE4ZzxaOzAU+BaeA9sH2croTqr+848agQa//uBazi8sHR6g== X-Received: by 2002:a6b:620f:: with SMTP id f15mr13162320iog.190.1567824143179; Fri, 06 Sep 2019 19:42:23 -0700 (PDT) Received: from shuah-t480s.internal (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id b7sm6441427iod.78.2019.09.06.19.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 19:42:22 -0700 (PDT) From: Shuah Khan To: mchehab@kernel.org, helen.koike@collabora.com, skhan@linuxfoundation.org, andrealmeid@collabora.com, dafna.hirschfeld@collabora.com, hverkuil-cisco@xs4all.nl, davem@davemloft.net, gregkh@linuxfoundation.org, nicolas.ferre@microchip.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 0/5] Collapse vimc into single monolithic driver Date: Fri, 6 Sep 2019 20:42:14 -0600 Message-Id: X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org vimc uses Component API to split the driver into functional components. The real hardware resembles a monolith structure than component and component structure added a level of complexity making it hard to maintain without adding any real benefit. The sensor is one vimc component that would makes sense to be a separate module to closely align with the real hardware. It would be easier to collapse vimc into single monolithic driver first and then split the sensor off as a separate module. This patch series removes the component API and makes minimal changes to the code base preserving the functional division of the code structure. Preserving the functional structure allows us to split the sensor off as a separate module in the future. The following configure and stream test works on all devices. media-ctl -d platform:vimc -V '"Sensor A":0[fmt:SBGGR8_1X8/640x480]' media-ctl -d platform:vimc -V '"Debayer A":0[fmt:SBGGR8_1X8/640x480]' media-ctl -d platform:vimc -V '"Sensor B":0[fmt:SBGGR8_1X8/640x480]' media-ctl -d platform:vimc -V '"Debayer B":0[fmt:SBGGR8_1X8/640x480]' v4l2-ctl -z platform:vimc -d "RGB/YUV Capture" -v width=1920,height=1440 v4l2-ctl -z platform:vimc -d "Raw Capture 0" -v pixelformat=BA81 v4l2-ctl -z platform:vimc -d "Raw Capture 1" -v pixelformat=BA81 v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video1 v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video2 v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video3 The second patch in the series fixes a general protection fault found when rmmod is done while stream is active. - rmmod while streaming returns vimc is in use - rmmod without active stream works correctly Changed since v3: (5 patches) Patch 1: - Main change is adding an array of struct vimc_ent_device(s) to save vimc_ent_device(s), subdevs create in their "add" hooks. These get used to create links and removing the subdevs. vimc-core allocates this array which sized to number of entries in the topology defined in the vimc_pipeline_config structure. - Remove links when register fails before registering the media device. In this case, entity links need to be removed from error paths. Patch 2: no change. New patch 3: - Cleaning up duplicated IS_SRC and IS_SINK defines and moving them to common header. New patch 4: - Documentation module parameter usage updates. New patch 5: - Lastly adding myself as a reviewers to MAINTAINERS file for vimc Changes since v2: - Rebase to media master on top of vimc reverts - Rename "vent" variable to "vcfg" to reflect config and standout from "ved" - Error handling when adding subdevs fails to remove already added subdevs, do other clean-up and bail out. Changes since v1: Patch 1 & 2: (patch 1 in this series) - Collapsed the two patches into one - Added common defines (vimc_device and vimc_ent_config) to vimc-common.h based on our discussion. - Addressed review comments from Helen and Laurent - Use vimc-common.h instead of creating a new file. - Other minor comments from Helen on int vs. unsigned int and not needing to initialize ret in vimc_add_subdevs() Patch 3 (patch 2 in this series): - The second patch is the fix for gpf. Updated the patch after looking at the test results from Andre and Helen. This problem is in a common code and impacts all subdevs. The fix addresses the core problem and fixes it. Fix removes pads release from v4l2_device_unregister_subdev() and pads are now released from the sd release handler with all other resources. Outstanding: - Update documentation with the correct topology. - There is one outstanding gpf remaining in the unbind path. I will fix that in a separate patch. This is an existing problem and will be easier to fix on top of this patch series. vimc_print_dot (--print-dot) topology after this change: (no change compared to media master) digraph board { rankdir=TB n00000001 [label="{{} | Sensor A\n/dev/v4l-subdev0 | { 0}}", shape=Mrecord, style=filled, fillcolor=green] n00000001:port0 -> n00000005:port0 [style=bold] n00000001:port0 -> n0000000b [style=bold] n00000003 [label="{{} | Sensor B\n/dev/v4l-subdev1 | { 0}}", shape=Mrecord, style=filled, fillcolor=green] n00000003:port0 -> n00000008:port0 [style=bold] n00000003:port0 -> n0000000f [style=bold] n00000005 [label="{{ 0} | Debayer A\n/dev/v4l-subdev2 | { 1}}", shape=Mrecord, style=filled, fillcolor=green] n00000005:port1 -> n00000015:port0 n00000008 [label="{{ 0} | Debayer B\n/dev/v4l-subdev3 | { 1}}", shape=Mrecord, style=filled, fillcolor=green] n00000008:port1 -> n00000015:port0 [style=dashed] n0000000b [label="Raw Capture 0\n/dev/video0", shape=box, style=filled, fillcolor=yellow] n0000000f [label="Raw Capture 1\n/dev/video1", shape=box, style=filled, fillcolor=yellow] n00000013 [label="{{} | RGB/YUV Input\n/dev/v4l-subdev4 | { 0}}", shape=Mrecord, style=filled, fillcolor=green] n00000013:port0 -> n00000015:port0 [style=dashed] n00000015 [label="{{ 0} | Scaler\n/dev/v4l-subdev5 | { 1}}", shape=Mrecord, style=filled, fillcolor=green] n00000015:port1 -> n00000018 [style=bold] n00000018 [label="RGB/YUV Capture\n/dev/video2", shape=box, style=filled, fillcolor=yellow] } Shuah Khan (5): media: vimc: Collapse component structure into a single monolithic driver media: vimc: Fix gpf in rmmod path when stream is active vimc: move duplicated IS_SRC and IS_SINK to common header doc: media: vimc: Update module parameter usage information MAINTAINERS: Add reviewer to vimc driver Documentation/media/v4l-drivers/vimc.rst | 12 +- MAINTAINERS | 1 + drivers/media/platform/vimc/Makefile | 7 +- drivers/media/platform/vimc/vimc-capture.c | 81 ++------ drivers/media/platform/vimc/vimc-common.c | 3 +- drivers/media/platform/vimc/vimc-common.h | 58 ++++++ drivers/media/platform/vimc/vimc-core.c | 216 +++++++++------------ drivers/media/platform/vimc/vimc-debayer.c | 81 ++------ drivers/media/platform/vimc/vimc-scaler.c | 82 ++------ drivers/media/platform/vimc/vimc-sensor.c | 74 ++----- 10 files changed, 215 insertions(+), 400 deletions(-) -- 2.20.1