From patchwork Fri Sep 1 01:50:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo F. Padovan" X-Patchwork-Id: 43673 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dnb6w-0002eG-Cu; Fri, 01 Sep 2017 01:51:06 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751457AbdIABvE (ORCPT + 1 other); Thu, 31 Aug 2017 21:51:04 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:35277 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751395AbdIABvE (ORCPT ); Thu, 31 Aug 2017 21:51:04 -0400 Received: by mail-qt0-f193.google.com with SMTP id u11so1008836qtu.2 for ; Thu, 31 Aug 2017 18:51:03 -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; bh=XG3acp0zG4eAibnE433nHv9u5kx8xwEavy/Ob6VaSJM=; b=aEqUBxy8mNeUACRAk1D5sPceEWtvd4CIOCzLYY01Kk0hjn+sogguLgpPkW2VZ2Xr9E oGlICDCCHRasMr5g6nMnNx9z1AEzp32aMhAalkNu0vtMVeXoLh25r4MZWvLyGnhc5XFZ 1NFb2MpT29wKHjzmZJbKS5JbXRcqS43Pp5LQWGCU84QUB4grME8WeZe2RuIcTLznmjiN 6J/mIh7/7somddXJ88q/G/gJDBunF9pzUA+1KA880XYLOR+1WuitTlGpPMRO9BmUBLOb qmaUIQSjwjkP2jtTV55firbVo79PGNcb8v5wIPWPKMYb5cI38xt+k9rzGiFvnLgulIzF QOiA== X-Gm-Message-State: AHPjjUjZXZMstTfkUkAeSfbqI9KV5aQY9YW0M+stiTDKc1zWEG/0NL4O 0F92mbQL2vYfsLw4960= X-Google-Smtp-Source: ADKCNb7vDhZLzDkjkHRZeILJ0na2cDBT/0GXK4XlzTXBmrAlyUZ4us5DZjsB3Tl3+pkHPjwuNyqtCQ== X-Received: by 10.237.35.220 with SMTP id k28mr508123qtc.337.1504230663220; Thu, 31 Aug 2017 18:51:03 -0700 (PDT) Received: from localhost.localdomain ([187.10.21.246]) by smtp.gmail.com with ESMTPSA id o17sm6366232qkl.52.2017.08.31.18.51.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2017 18:51:02 -0700 (PDT) From: Gustavo Padovan To: linux-media@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Shuah Khan , Gustavo Padovan Subject: [PATCH v2 05/14] [media] vivid: assign the specific device to the vb2_queue->dev Date: Thu, 31 Aug 2017 22:50:32 -0300 Message-Id: <20170901015041.7757-6-gustavo@padovan.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170901015041.7757-1-gustavo@padovan.org> References: <20170901015041.7757-1-gustavo@padovan.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Gustavo Padovan Instead of assigning the global v4l2 device, assign the specific device. This was causing trouble when using using V4L2 events with vivid devices. The device's queue should be the same we opened in userspace. This is needed for the upcoming V4L2_EVENT_BUF_QUEUED support. The current vivid code isn't wrong, it just needs to be changed so V4L2_EVENT_BUF_QUEUED can be supported. The change doesn't affect any other behaviour of vivid. Signed-off-by: Gustavo Padovan Acked-by: Hans Verkuil --- drivers/media/platform/vivid/vivid-core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index 5f316a5e38db..608bcceed463 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -1070,7 +1070,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 2; q->lock = &dev->mutex; - q->dev = dev->v4l2_dev.dev; + q->dev = &dev->vid_cap_dev.dev; ret = vb2_queue_init(q); if (ret) @@ -1090,7 +1090,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 2; q->lock = &dev->mutex; - q->dev = dev->v4l2_dev.dev; + q->dev = &dev->vid_out_dev.dev; ret = vb2_queue_init(q); if (ret) @@ -1110,7 +1110,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 2; q->lock = &dev->mutex; - q->dev = dev->v4l2_dev.dev; + q->dev = &dev->vbi_cap_dev.dev; ret = vb2_queue_init(q); if (ret) @@ -1130,7 +1130,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 2; q->lock = &dev->mutex; - q->dev = dev->v4l2_dev.dev; + q->dev = &dev->vbi_out_dev.dev; ret = vb2_queue_init(q); if (ret) @@ -1149,7 +1149,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 8; q->lock = &dev->mutex; - q->dev = dev->v4l2_dev.dev; + q->dev = &dev->sdr_cap_dev.dev; ret = vb2_queue_init(q); if (ret)