From nobody Sun Apr 5 13:04:56 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 D9F27397E93 for ; Fri, 13 Mar 2026 13:20:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408041; cv=none; b=jBhhejx75SIX2zykchEg5JBDet/ePKrEMHFD/OovTPj3/iVsuenfnSCopQmC6H2B/VBt1ROvhjLzroHbDFS0BGyieLxzh+Ya42fVL3hAlHUo1SSvsOC3CSYk9Dke9++JNm2EiuqAW0HpeLOin489UpYdvQSuRDRfbNSPce4XPiw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408041; c=relaxed/simple; bh=OxEeucEk6xEbfwApx73QjPbvH1DJC0PQUFwitZIlIww=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HZfnpGxmIujpLf04gnAHUM5MiDzBselwU7RJ0znFpZBfritbE2oZSw+VHrVxtIJbMDS/PLj21Arm9pugeyayUl89E3AZh8ENz7cUo2KSXW1h2Ol9KK1kmrQgYgDV/HyrN7n+ZJ9qVXPbcWpfm+vUgKvbeq7wqrCUqXHisDgOlyM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Esd7kJFb; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=JMqHyUtR; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Esd7kJFb"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="JMqHyUtR" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62D7JZgP241135 for ; Fri, 13 Mar 2026 13:20:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= vQ6529GjGImdh1dpkhQ1AlRFese4u9KeMQ697DAVkoY=; b=Esd7kJFbF/Qzw2kz eTtxdk6Q8kqGWMdK6Zsa82Hs9aFe9dRnBqVpmwaE99ARz5+lSmJrv5hxTijrnadn OXn0p5/fO3T66wc7dM0Qkz8vqKP1hQE04O2OMLLZMfIIX78ix4z/ao7stR/HD4I1 YunILS7U5KnWkbdi9q+k+2SR5Vy9innQljjBUuXdtOUqzJtBE1y2xXTekwJ7x39k szKsLvVT/d0ZdWtF+OreFXOlVTiWi5fEaE7KE6sqeVTsVny3nLBsNdqZKjubxhgv NMapgowvx6lhS5TRHX4IEax2m15dT5qrC8FynVtl6m76S7xE0omlcuayHtI/6ljA HfFjEg== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cve3d984w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 13 Mar 2026 13:20:39 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-82a0686edbcso1180508b3a.3 for ; Fri, 13 Mar 2026 06:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773408039; x=1774012839; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vQ6529GjGImdh1dpkhQ1AlRFese4u9KeMQ697DAVkoY=; b=JMqHyUtReRZuiB63ShNMjGOJwc2/MdxcYolXnJcqY+434Bd1zNO6B0OD5F9a76j6Nh HulkPMz7f5+lsv+z5kQXWDfw3nC1WawV4RCQwOD803PiVJ0D8MXODR4ARquocmIKocQ8 7FqTJ6BFQN6+vmJtLOU1Xjt79TCcp691sVnZzqOCkha9ZxPKCTmp+UMQ0LtfpUeEBU6s lEzpG4NboXL6LiC3OmZY6eHNVFdUFwja+SeHbqVImTs9m1+nt0UCSkFn6uliPYKxFNEx +jLt4AB8stbhvo6CbpGNV8sNtGKxzzz2r6KXW/oDHkvmou014jVrsoRB5vFn2L2p2QVM xtsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773408039; x=1774012839; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=vQ6529GjGImdh1dpkhQ1AlRFese4u9KeMQ697DAVkoY=; b=dBL6jM8PRLNiWiquyTGxruWuqJ7SsUpHA0oqpjgvBesgMwRe0NLtkY7Z2q3dn9kFHN oBHy334SAfZjeaygpTLVWFPnELzPTtTl8tPRZPVMYD643+BAf/WTKHYuw+/uBLMT4Rnb oq7GsYKwvpXe2v52JF52JmVPrq5q55EfSy0w2/KmVyYqekB7WPQprgPXxK0NQrNonhGl Vkf1k7AK0XPU9TTf1VOR7HMz6mTqH4Tm/NXCdMcpMlNR6TwhqiBYs5Io25sdks8O8vMK Gc36cxqyRO3KglqT0ue87NHExKYztS5Kyk+n1vtmw3x//KcmSbIa8ilyD9oAnrcGr4D+ 1DsQ== X-Forwarded-Encrypted: i=1; AJvYcCXcD7fBjvW1hHjjxr7W52yNxK5p6+vyT/7iyOqIcJYZWZE2H5oRFPWfnVAbNT9uK/XT7yJC9VhdLULSQxk=@vger.kernel.org X-Gm-Message-State: AOJu0YwxSogk9DsHNYscph+RAtlxkRE44ZEMlDpZwLJaRdpr81eMNIt8 +A70WIo5d2NaMQssxmISqinFlVV5ahbsSJ6NpuTqo+cGBHNI4Re+D9rijO+/p8ycKEVqyHCesWX OW2OhYeKRZaRarL4DUk+1i2vVfh9HrdZ0rqI+rjO67yFjpJPqzgEz6WMkkFoU4R1nIp0= X-Gm-Gg: ATEYQzwoO/qZCl10hJLQTMuk8R7kKbhGaTk8xa1lZz81TB04Gt1KGyey4TgAobNqIoz bkmpd/+u75Ry9doxLaGB+7gUDHk4JvgMra8BlwtIfvn9cJhstpA6rX/45qa55oC6t53y7T4XPnF RXWTy4GeywO2kup2Z4KpyZqT/9l/tnuR5xT7NsFCh7B+5QfaqDSHwnANKrZdpr8Pps81Ack8OHA /NiaQVA8tQKltCmAerXqmxishyYhODwRlhdG0LElgs/BhPDyrUOMWNFgz3YOBaK6AzAu8YTYKTy OVpeGhpr4saVZh5OnCpZmryv2ggJTLY6vdg98+oG2IE4rZk9HC2zP9sp96mC9hwxIJPp8nzXs1y Tng7z4QUQYhi+TkRjcVLsJq49KqMGNnSm/O717RbNXQD4LeNUWzQ1WF+3 X-Received: by 2002:a05:6a00:84c:b0:829:86a5:d30f with SMTP id d2e1a72fcca58-82a19703a46mr2918850b3a.11.1773408038340; Fri, 13 Mar 2026 06:20:38 -0700 (PDT) X-Received: by 2002:a05:6a00:84c:b0:829:86a5:d30f with SMTP id d2e1a72fcca58-82a19703a46mr2918826b3a.11.1773408037753; Fri, 13 Mar 2026 06:20:37 -0700 (PDT) Received: from hu-vgarodia-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a0724407csm5775254b3a.8.2026.03.13.06.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 06:20:37 -0700 (PDT) From: Vikash Garodia Date: Fri, 13 Mar 2026 18:49:39 +0530 Subject: [PATCH v3 5/7] media: iris: add helper to select context bank device Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260313-kaanapali-iris-v3-5-9c0d1a67af4b@oss.qualcomm.com> References: <20260313-kaanapali-iris-v3-0-9c0d1a67af4b@oss.qualcomm.com> In-Reply-To: <20260313-kaanapali-iris-v3-0-9c0d1a67af4b@oss.qualcomm.com> To: Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Dmitry Baryshkov , Conor Dooley , Saravana Kannan , Joerg Roedel , Will Deacon , Robin Murphy , Stefan Schmidt , Hans Verkuil , Krzysztof Kozlowski , Vishnu Reddy , Hans Verkuil Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, Bryan O'Donoghue , Vikash Garodia X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773407994; l=8958; i=vikash.garodia@oss.qualcomm.com; s=20241104; h=from:subject:message-id; bh=OxEeucEk6xEbfwApx73QjPbvH1DJC0PQUFwitZIlIww=; b=aZudF84kBeMD27WJMiI10AY/lSCL9tzRxbiloVXThVyiuattTDPQ0bT6RDtEUevKd0eM61lu7 BCTzhsg+YNXCfi9MFBJNZ9zkbn3TTwlwr6CHzejeU/dWQrGXYW2jb3n X-Developer-Key: i=vikash.garodia@oss.qualcomm.com; a=ed25519; pk=LY9Eqp4KiHWxzGNKGHbwRFEJOfRCSzG/rxQNmvZvaKE= X-Proofpoint-ORIG-GUID: INv7qYjV58ODZkCuJQcQJec1MZRCNHkj X-Authority-Analysis: v=2.4 cv=FLwWBuos c=1 sm=1 tr=0 ts=69b40f27 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=oSQLiBfSod8WWzwNvhoA:9 a=QEXdDO2ut3YA:10 a=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEzMDEwNiBTYWx0ZWRfXxklkD+CUvNGP FXGgm+mAMY8GPFYu+VJvgN3gsCHSeBtoBcw6rU8dAO99UXndU3Og/3lUFFZN8FfDNZNyWvI+kVi 4KbTYdIaPzM5enspiJGZxEKwV1IicMTaj5s1L1Z7Ueea8YcTDcNw784TLKlmgYzaY3/uD0dUgCi 3eq3dBlgS1b3TCuM994RfWbVOQvzY2KaJ86vJB969IDS5ivYp/sv1KIXw+PqV6kK2cCod3rmsgi uOCymWc2hVzuR6uJJW6C4yBtl1SOn0+IPh5GYkQegVu3qjn54JxL9J7to4QhigAXeYuGUQVDpts +FWfTvtizrh5N7wIWIbbnbrg/umTbtYhz1MAdG3sp6Ps5grTJyLlnITfurC6QLTfNtpDC5YnJ4O k3lDbs67KdFyDL6LB41NnZfRQ1w/MXY+d2855881NgPAHx2XUTpc4V5BLLN3KHdo18l7zFJqlkp fRv824bn3BveEL9VDKA== X-Proofpoint-GUID: INv7qYjV58ODZkCuJQcQJec1MZRCNHkj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-13_02,2026-03-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 bulkscore=0 malwarescore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603130106 Depending on the buffer type (input, output, internal and interface queues), associated context bank is selected, if available. Fallback to parent device for backward compatibility. Co-developed-by: Vishnu Reddy Signed-off-by: Vishnu Reddy Signed-off-by: Vikash Garodia --- drivers/media/platform/qcom/iris/iris_buffer.c | 7 ++-- drivers/media/platform/qcom/iris/iris_hfi_queue.c | 16 +++++---- drivers/media/platform/qcom/iris/iris_resources.c | 41 +++++++++++++++++++= ++++ drivers/media/platform/qcom/iris/iris_resources.h | 2 ++ drivers/media/platform/qcom/iris/iris_vidc.c | 4 +-- 5 files changed, 58 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media= /platform/qcom/iris/iris_buffer.c index 9151f43bc6b9c2c34c803de4231d1e6de0bec6c4..a016eaa4e02fe78aeefd97cc3cf= f51aec25778ff 100644 --- a/drivers/media/platform/qcom/iris/iris_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_buffer.c @@ -335,8 +335,8 @@ void iris_get_internal_buffers(struct iris_inst *inst, = u32 plane) static int iris_create_internal_buffer(struct iris_inst *inst, enum iris_buffer_type buffer_type, u32 index) { + struct device *dev =3D iris_get_cb_dev(inst->core, iris_get_region(inst, = buffer_type)); struct iris_buffers *buffers =3D &inst->buffers[buffer_type]; - struct iris_core *core =3D inst->core; struct iris_buffer *buffer; =20 if (!buffers->size) @@ -352,7 +352,7 @@ static int iris_create_internal_buffer(struct iris_inst= *inst, buffer->buffer_size =3D buffers->size; buffer->dma_attrs =3D DMA_ATTR_WRITE_COMBINE | DMA_ATTR_NO_KERNEL_MAPPING; =20 - buffer->kvaddr =3D dma_alloc_attrs(core->dev, buffer->buffer_size, + buffer->kvaddr =3D dma_alloc_attrs(dev, buffer->buffer_size, &buffer->device_addr, GFP_KERNEL, buffer->dma_attrs); if (!buffer->kvaddr) { kfree(buffer); @@ -490,9 +490,10 @@ int iris_queue_internal_buffers(struct iris_inst *inst= , u32 plane) int iris_destroy_internal_buffer(struct iris_inst *inst, struct iris_buffe= r *buffer) { struct iris_core *core =3D inst->core; + struct device *dev =3D iris_get_cb_dev(core, iris_get_region(inst, buffer= ->type)); =20 list_del(&buffer->list); - dma_free_attrs(core->dev, buffer->buffer_size, buffer->kvaddr, + dma_free_attrs(dev, buffer->buffer_size, buffer->kvaddr, buffer->device_addr, buffer->dma_attrs); kfree(buffer); =20 diff --git a/drivers/media/platform/qcom/iris/iris_hfi_queue.c b/drivers/me= dia/platform/qcom/iris/iris_hfi_queue.c index b3ed06297953b902d5ea6c452385a88d5431ac66..b8179b2c0ee9d13ff4294922d74= 767825069683b 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_queue.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_queue.c @@ -245,25 +245,26 @@ static void iris_hfi_queue_deinit(struct iris_iface_q= _info *iface_q) =20 int iris_hfi_queues_init(struct iris_core *core) { + struct device *dev =3D iris_get_cb_dev(core, IRIS_NON_PIXEL_REGION); struct iris_hfi_queue_table_header *q_tbl_hdr; u32 queue_size; =20 /* Iris hardware requires 4K queue alignment */ queue_size =3D ALIGN((sizeof(*q_tbl_hdr) + (IFACEQ_QUEUE_SIZE * IFACEQ_NU= MQ)), SZ_4K); - core->iface_q_table_vaddr =3D dma_alloc_attrs(core->dev, queue_size, + core->iface_q_table_vaddr =3D dma_alloc_attrs(dev, queue_size, &core->iface_q_table_daddr, GFP_KERNEL, DMA_ATTR_WRITE_COMBINE); if (!core->iface_q_table_vaddr) { - dev_err(core->dev, "queues alloc and map failed\n"); + dev_err(dev, "queues alloc and map failed\n"); return -ENOMEM; } =20 - core->sfr_vaddr =3D dma_alloc_attrs(core->dev, SFR_SIZE, + core->sfr_vaddr =3D dma_alloc_attrs(dev, SFR_SIZE, &core->sfr_daddr, GFP_KERNEL, DMA_ATTR_WRITE_COMBINE); if (!core->sfr_vaddr) { - dev_err(core->dev, "sfr alloc and map failed\n"); - dma_free_attrs(core->dev, sizeof(*q_tbl_hdr), core->iface_q_table_vaddr, + dev_err(dev, "sfr alloc and map failed\n"); + dma_free_attrs(dev, sizeof(*q_tbl_hdr), core->iface_q_table_vaddr, core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE); return -ENOMEM; } @@ -291,6 +292,7 @@ int iris_hfi_queues_init(struct iris_core *core) =20 void iris_hfi_queues_deinit(struct iris_core *core) { + struct device *dev =3D iris_get_cb_dev(core, IRIS_NON_PIXEL_REGION); u32 queue_size; =20 if (!core->iface_q_table_vaddr) @@ -300,7 +302,7 @@ void iris_hfi_queues_deinit(struct iris_core *core) iris_hfi_queue_deinit(&core->message_queue); iris_hfi_queue_deinit(&core->command_queue); =20 - dma_free_attrs(core->dev, SFR_SIZE, core->sfr_vaddr, + dma_free_attrs(dev, SFR_SIZE, core->sfr_vaddr, core->sfr_daddr, DMA_ATTR_WRITE_COMBINE); =20 core->sfr_vaddr =3D NULL; @@ -309,7 +311,7 @@ void iris_hfi_queues_deinit(struct iris_core *core) queue_size =3D ALIGN(sizeof(struct iris_hfi_queue_table_header) + (IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ), SZ_4K); =20 - dma_free_attrs(core->dev, queue_size, core->iface_q_table_vaddr, + dma_free_attrs(dev, queue_size, core->iface_q_table_vaddr, core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE); =20 core->iface_q_table_vaddr =3D NULL; diff --git a/drivers/media/platform/qcom/iris/iris_resources.c b/drivers/me= dia/platform/qcom/iris/iris_resources.c index a2e648f4cdb8c63db89396d49f32bbc06d870ea5..9a896271c21187ecda25be86c1a= bd2e905e32d8a 100644 --- a/drivers/media/platform/qcom/iris/iris_resources.c +++ b/drivers/media/platform/qcom/iris/iris_resources.c @@ -13,6 +13,7 @@ #include =20 #include "iris_core.h" +#include "iris_instance.h" #include "iris_resources.h" =20 #define BW_THRESHOLD 50000 @@ -187,3 +188,43 @@ int iris_create_child_device_and_map(struct iris_core = *core, const struct iris_c =20 return 0; } + +enum iris_buffer_region iris_get_region(struct iris_inst *inst, enum iris_= buffer_type buffer_type) +{ + switch (buffer_type) { + case BUF_INPUT: + if (inst->domain =3D=3D ENCODER) + return IRIS_PIXEL_REGION; + else + return IRIS_BITSTREAM_REGION; + case BUF_OUTPUT: + if (inst->domain =3D=3D ENCODER) + return IRIS_BITSTREAM_REGION; + else + return IRIS_PIXEL_REGION; + case BUF_BIN: + return IRIS_BITSTREAM_REGION; + case BUF_DPB: + case BUF_PARTIAL: + case BUF_SCRATCH_2: + case BUF_VPSS: + return IRIS_PIXEL_REGION; + case BUF_ARP: + case BUF_COMV: + case BUF_LINE: + case BUF_NON_COMV: + case BUF_PERSIST: + return IRIS_NON_PIXEL_REGION; + default: + dev_err(inst->core->dev, "unknown buffer type: %d\n", buffer_type); + return IRIS_UNKNOWN_REGION; + } +} + +struct device *iris_get_cb_dev(struct iris_core *core, enum iris_buffer_re= gion region) +{ + if (core->cb_devs[region]) + return core->cb_devs[region]; + + return core->dev; +} diff --git a/drivers/media/platform/qcom/iris/iris_resources.h b/drivers/me= dia/platform/qcom/iris/iris_resources.h index c573016535b87d4fd140cad967d926cc1de63382..2d0447309ca4e7833db2fa57ef8= fc3758e9802a9 100644 --- a/drivers/media/platform/qcom/iris/iris_resources.h +++ b/drivers/media/platform/qcom/iris/iris_resources.h @@ -16,5 +16,7 @@ int iris_set_icc_bw(struct iris_core *core, unsigned long= icc_bw); int iris_disable_unprepare_clock(struct iris_core *core, enum platform_clk= _type clk_type); int iris_prepare_enable_clock(struct iris_core *core, enum platform_clk_ty= pe clk_type); int iris_create_child_device_and_map(struct iris_core *core, const struct = iris_context_bank *cb); +enum iris_buffer_region iris_get_region(struct iris_inst *inst, enum iris_= buffer_type buffer_type); +struct device *iris_get_cb_dev(struct iris_core *core, enum iris_buffer_re= gion buffer_type); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/p= latform/qcom/iris/iris_vidc.c index bd38d84c9cc79d15585ed5dd5f905a37521cb6dc..40744d487fbf1520c5e359d536c= ddb1c5ab0a706 100644 --- a/drivers/media/platform/qcom/iris/iris_vidc.c +++ b/drivers/media/platform/qcom/iris/iris_vidc.c @@ -107,7 +107,7 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_v= q, struct vb2_queue *dst_ src_vq->drv_priv =3D inst; src_vq->buf_struct_size =3D sizeof(struct iris_buffer); src_vq->min_reqbufs_allocation =3D MIN_BUFFERS; - src_vq->dev =3D inst->core->dev; + src_vq->dev =3D iris_get_cb_dev(inst->core, iris_get_region(inst, BUF_INP= UT)); src_vq->lock =3D &inst->ctx_q_lock; ret =3D vb2_queue_init(src_vq); if (ret) @@ -121,7 +121,7 @@ iris_m2m_queue_init(void *priv, struct vb2_queue *src_v= q, struct vb2_queue *dst_ dst_vq->drv_priv =3D inst; dst_vq->buf_struct_size =3D sizeof(struct iris_buffer); dst_vq->min_reqbufs_allocation =3D MIN_BUFFERS; - dst_vq->dev =3D inst->core->dev; + dst_vq->dev =3D iris_get_cb_dev(inst->core, iris_get_region(inst, BUF_OUT= PUT)); dst_vq->lock =3D &inst->ctx_q_lock; =20 return vb2_queue_init(dst_vq); --=20 2.34.1