From patchwork Fri Feb 28 13:08:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 869481 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAA1626B2D7 for ; Fri, 28 Feb 2025 13:08:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748125; cv=none; b=Fav8EdNpwxxIJIdViymEMLwyuuU7R29MKm7IC+SxRxJ0Cm55W/v5R/ojL1dNzAlUFiWW47v6FTPdCQhhbxph6k8tYAtmYppmml/aeF/NKMdMs4t2Cb9YRfr7o48OQ88Vx4P2NnVbTiQfJJZj8Y9Wqs42ZTgWnEJcb2MEh9S+h9U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748125; c=relaxed/simple; bh=jVfySmtCKc+rDgzWs0d1iuV0e5AynR7YjDkBSBs9NGs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XimH9KWlSH0K9mRHhsxPqM4RKs59dFDFDUEl2J6o13j+pZ/bNR0/ThAMKfJALIHFjJQcujjAxxeL00WgS2oFEV+L1jyB6XwwOVxHv7Yz+AEvYPcBBgbusX7hOHSoyIsdMY7LW27GjeeJMC6LC7zXFZTiCI9QxR7L8L954DpdncA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=YFsaHaZw; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="YFsaHaZw" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6e88f3159e3so17204946d6.2 for ; Fri, 28 Feb 2025 05:08:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740748122; x=1741352922; 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=Wu47y/gfGsHXETXnfAoCaDWBGszfC1szAfoQtY44QlE=; b=YFsaHaZwAS7/RSOvekzrehdKITfXj39H8qQLLq0o+DHWrVmlpe8Zq+RdcihRh/1zdQ jakjJKcDz5X89wVAvVhUCan5ov6Csa6JR/2ucF4b4cdYwpLCQ9EQl2YgesHjwSINHKzo CfhtABdnGR4j826PPhPE6UlhL6FBmco7wiT24= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740748122; x=1741352922; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wu47y/gfGsHXETXnfAoCaDWBGszfC1szAfoQtY44QlE=; b=cVpWKUikHEm9cJzQVrn417DLiCOvC34FCrC/C1Q+APPHQ+RMeWu6NTiU3oPu/05KIW y0BOKek7YJschyez9clvzjRZgGo+7lobS0GkQ6eRU6um3MAXjv90/NnmYDw8uwX83As5 XxYcjCvbNnZMNjSgbELkaUvKqMGB7ztBVwC30NjSoWe7uP1It4h3rQe8pDBS2GdQY3lp XfxKASIuZbsaWxaO6jF31W8e1V2EUQGxac7/G5DUnlf8lKPYivOLC92Pz9zSXTnhR30e 4V928gTvyo6/itnyWDfTuFJe+PeUenSi0oA/QHDCPstqEcpIM+6C00rxIBnLB3C9YPsz B93w== X-Gm-Message-State: AOJu0YwaxyHMTkRMcHvVIRHmp0DLwHgd0JmrQRWfllVHDEUQylJzq3I+ ITsb0TH4W09pIW424meE8ptipJ4b3ldGvZnhOWQGr8CGjgmE7STr3um08GefUA== X-Gm-Gg: ASbGncvnT8EItyEqQ/+PDgrEjtMion+etl0YiVZ19pOrb8IroQOffUR0T7zD02Lb9tj RYKdKkppssqBXQRlwbchxfvBai5AQAqZQjDVyCEBthRq/PK4r7hQRrPL4r7jwYiu4XdTcbVeXBH WmtkDLjaSe6Y9uQOKtXT7lNONmSmoJ8SR3eUSMvMn7XdQI3HrRIRkquBqjcmDEOR5tCKh7wV2kx sToMH0HNrVsERqbe0JWVfxsXiS1N7UvMWHVFP8/Zm6OCIlOp6IbSnkOdaZZUFK6SkehRO57mst2 RS/14uIgsbWkypu2IjtGHUZf13rzs+PgKsBHk+WOLYXvVdiV+WEhDasNPVYhOaHcmBI9IBzCGmS KT9M= X-Google-Smtp-Source: AGHT+IGREZ8d3y7LZ4jLIKH/UvjI1lqtGi9/ApBsqfvwniiJKDUn2mxes6cCfftxvK2FRlPK1865eQ== X-Received: by 2002:ad4:5c64:0:b0:6e6:6535:17df with SMTP id 6a1803df08f44-6e8a0cd3e3amr54758336d6.2.1740748122614; Fri, 28 Feb 2025 05:08:42 -0800 (PST) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e8976d9fe1sm21938046d6.102.2025.02.28.05.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 05:08:42 -0800 (PST) From: Ricardo Ribalda Date: Fri, 28 Feb 2025 13:08:38 +0000 Subject: [PATCH 1/2] media: vivid: Move all fb_info references into vivid-osd Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250228-vivid-osd-v1-1-16963a0a0ab7@chromium.org> References: <20250228-vivid-osd-v1-0-16963a0a0ab7@chromium.org> In-Reply-To: <20250228-vivid-osd-v1-0-16963a0a0ab7@chromium.org> To: Hans Verkuil , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Slawomir Rosek , Hidenori Kobayashi , Ricardo Ribalda X-Mailer: b4 0.14.1 Most references to fb_info are already within vivid-osd.c. This patch moves the remaining references into vivid-osd.c. This is a preparation patch to make CONFIG_FB optional for vivid. Signed-off-by: Ricardo Ribalda --- drivers/media/test-drivers/vivid/vivid-core.c | 10 ++-------- drivers/media/test-drivers/vivid/vivid-osd.c | 13 ++++++++++++- drivers/media/test-drivers/vivid/vivid-osd.h | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/test-drivers/vivid/vivid-core.c index 7477ac8cb955..10f5bef3f49c 100644 --- a/drivers/media/test-drivers/vivid/vivid-core.c +++ b/drivers/media/test-drivers/vivid/vivid-core.c @@ -1410,8 +1410,6 @@ static int vivid_create_queues(struct vivid_dev *dev) ret = vivid_fb_init(dev); if (ret) return ret; - v4l2_info(&dev->v4l2_dev, "Framebuffer device registered as fb%d\n", - dev->fb_info.node); } return 0; } @@ -2197,12 +2195,8 @@ static void vivid_remove(struct platform_device *pdev) video_device_node_name(&dev->radio_tx_dev)); video_unregister_device(&dev->radio_tx_dev); } - if (dev->has_fb) { - v4l2_info(&dev->v4l2_dev, "unregistering fb%d\n", - dev->fb_info.node); - unregister_framebuffer(&dev->fb_info); - vivid_fb_release_buffers(dev); - } + if (dev->has_fb) + vivid_fb_deinit(dev); if (dev->has_meta_cap) { v4l2_info(&dev->v4l2_dev, "unregistering %s\n", video_device_node_name(&dev->meta_cap_dev)); diff --git a/drivers/media/test-drivers/vivid/vivid-osd.c b/drivers/media/test-drivers/vivid/vivid-osd.c index 5c931b94a7b5..043ffccbc6af 100644 --- a/drivers/media/test-drivers/vivid/vivid-osd.c +++ b/drivers/media/test-drivers/vivid/vivid-osd.c @@ -333,7 +333,7 @@ static int vivid_fb_init_vidmode(struct vivid_dev *dev) } /* Release any memory we've grabbed */ -void vivid_fb_release_buffers(struct vivid_dev *dev) +static void vivid_fb_release_buffers(struct vivid_dev *dev) { if (dev->video_vbase == NULL) return; @@ -380,6 +380,17 @@ int vivid_fb_init(struct vivid_dev *dev) /* Set the card to the requested mode */ vivid_fb_set_par(&dev->fb_info); + + v4l2_info(&dev->v4l2_dev, "Framebuffer device registered as fb%d\n", + dev->fb_info.node); + return 0; } + +void vivid_fb_deinit(struct vivid_dev *dev) +{ + v4l2_info(&dev->v4l2_dev, "unregistering fb%d\n", dev->fb_info.node); + unregister_framebuffer(&dev->fb_info); + vivid_fb_release_buffers(dev); +} diff --git a/drivers/media/test-drivers/vivid/vivid-osd.h b/drivers/media/test-drivers/vivid/vivid-osd.h index f9ac1af25dd3..883459552fa9 100644 --- a/drivers/media/test-drivers/vivid/vivid-osd.h +++ b/drivers/media/test-drivers/vivid/vivid-osd.h @@ -9,7 +9,7 @@ #define _VIVID_OSD_H_ int vivid_fb_init(struct vivid_dev *dev); -void vivid_fb_release_buffers(struct vivid_dev *dev); +void vivid_fb_deinit(struct vivid_dev *dev); void vivid_clear_fb(struct vivid_dev *dev); #endif From patchwork Fri Feb 28 13:08:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 870361 Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6D6126BDA4 for ; Fri, 28 Feb 2025 13:08:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748127; cv=none; b=l3DvYJONgLdad9isWzDTCmtPbrA72ajuWPIX7P8AoHrHJ9lmRRuelvSJC+LxNrqZjeH9MM+349wIsJnFVrSu/wAMaYhfPG2Hhclch6PYGjXIjEYhcOabikr7r6Kt0tvutDeooOeEeebnjtmlyfv+9D6IXUpY/NNH3kZ71S+d8kg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740748127; c=relaxed/simple; bh=F8eNSy1cVFa82SUn9oBgWI8lkzQbk3HPpuXl9dYwcVY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HexA5m6EgcRmEdII5dMLhSQ1ykcVAu/WhEZe5DwebPYauXWHfwO1W3E3s9ixbPg+Q0nUoN4qrK9ODgmc4OdMm6WpwS+oq60x6Ihsnocj+9rd7VWaRJY9IcXm5ZSw0awOwWwjhuMvjIudJOfowBMZ66otX+2FR0gH1HV8ta66bSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=LZIFMs4b; arc=none smtp.client-ip=209.85.219.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="LZIFMs4b" Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-6e89bce647fso15089186d6.3 for ; Fri, 28 Feb 2025 05:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740748125; x=1741352925; 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=NSkWiHfj8zFyE3PkFRF3vUoZzQbgweuuC9qsrjLMGFY=; b=LZIFMs4bUUgEHKSRbbRxFCoVlZood/jVIBkoJjCKmBjaO0WA/3Okosfb2jQpjuEu93 lFlUCYarJ1+pIHA7BalPgEzCAIWdGyea5tzLkH2B7I6ThtowprRXUZTgHaL+Xsm1U97+ 4c50c8PAEFTIPFAiqEqPB95VHIXLHpTx+R11Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740748125; x=1741352925; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NSkWiHfj8zFyE3PkFRF3vUoZzQbgweuuC9qsrjLMGFY=; b=RI3D1gV2YZI+UiVNW4CxdM1q43Z0E2vz+EbEUxOYb8qiLi+LaeSuk0UIX4tRalhf7c FlqsIyQGeUJKfMRsjcZ6K6hoOUMiJ/fW9CL0fCXGM4SS9iexuvAKprpkKY6xEsqcMOOm IKzMmXP04MD3o8rOzM4G/hoCouUTT8BejKkjyvMoUZPzoGTn42lNLZaad0qLH/fbzR0+ tKIq6W6rWj3bAMpVwBJEc3PgSpEHb2tpd6dogZYXxXJLTilSdtbOVJhr865/oxd5ryUX fqZhRed9hdSMOzOn0IHkzPWTHkCpq00RyuBsF2kxaggD0oo3JnF+WK+oBQ7LjKtEqsN2 M3yg== X-Gm-Message-State: AOJu0Yy4Niz9aY6QdtmuxX5SSvMpTFgH8T2TvU/+387naDi6vpSUT7BT IZWbA4f/aHtzQi0Nf/WnOVm/sd6a8uubM5dwYHekhHjaPewZEIyIfJao8aYA/Q== X-Gm-Gg: ASbGncvBoeslFhhVCNwPohXCisOWA6S2iocALt/94T7phnMNhfh/yXEWecfPsqj+O+z j+4BENs90HFtddwBV+4ZksypivzI3hRgQ1a4VKi1Pp6tmeP/nfiBYXdnfgh++mhtzAiq6XL8BnJ knFUWtYYvYsaFnbHXU15aLUVcWxSKxziHWKbh/EfvuscszOF6YhhO2Vs+SrleK3B3SWJB83NsCW y8KqU1DsRifU0VuOG+pNmMlXdtYkkMVS8QLczy0KeWv0deG+s8shTBk46P6HpoJDL1uJgbhfePd HfDIfMwMoibDxJ2T+tfmhOJUJZUO8G2uW0uDb5CVCCJX9BMM8s+aC8yRiokoy+n17RCOdfExdFN OmkY= X-Google-Smtp-Source: AGHT+IEW4reuGtssjwVSPN6ulRTiNwk4RQ19u8otKf5gm2KujnCQn8IrfiQIAgJ7r9MSx1uVBYjc4g== X-Received: by 2002:ad4:5f0a:0:b0:6e4:4331:aadf with SMTP id 6a1803df08f44-6e8a0d05614mr53010216d6.23.1740748124735; Fri, 28 Feb 2025 05:08:44 -0800 (PST) Received: from denia.c.googlers.com (15.237.245.35.bc.googleusercontent.com. [35.245.237.15]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e8976d9fe1sm21938046d6.102.2025.02.28.05.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 05:08:43 -0800 (PST) From: Ricardo Ribalda Date: Fri, 28 Feb 2025 13:08:39 +0000 Subject: [PATCH 2/2] media: vivid: Introduce VIDEO_VIVID_OSD Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250228-vivid-osd-v1-2-16963a0a0ab7@chromium.org> References: <20250228-vivid-osd-v1-0-16963a0a0ab7@chromium.org> In-Reply-To: <20250228-vivid-osd-v1-0-16963a0a0ab7@chromium.org> To: Hans Verkuil , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Slawomir Rosek , Hidenori Kobayashi , Ricardo Ribalda X-Mailer: b4 0.14.1 vivid-osd depends on CONFIG_FB, which can be a large dependency. Introduce CONFIG_VIDEO_VIVID_OSD to control enabling support for testing output overlay. Suggested-by: Slawomir Rosek Co-developed-by: Slawomir Rosek Signed-off-by: Slawomir Rosek Signed-off-by: Ricardo Ribalda --- drivers/media/test-drivers/vivid/Kconfig | 12 ++++++++++-- drivers/media/test-drivers/vivid/Makefile | 5 ++++- drivers/media/test-drivers/vivid/vivid-core.c | 4 ++++ drivers/media/test-drivers/vivid/vivid-core.h | 2 ++ drivers/media/test-drivers/vivid/vivid-osd.h | 11 +++++++++++ drivers/media/test-drivers/vivid/vivid-vid-out.c | 7 ++++--- 6 files changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/media/test-drivers/vivid/Kconfig b/drivers/media/test-drivers/vivid/Kconfig index ec2e71d76965..e95edc0f22bf 100644 --- a/drivers/media/test-drivers/vivid/Kconfig +++ b/drivers/media/test-drivers/vivid/Kconfig @@ -1,9 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only config VIDEO_VIVID tristate "Virtual Video Test Driver" - depends on VIDEO_DEV && !SPARC32 && !SPARC64 && FB + depends on VIDEO_DEV && !SPARC32 && !SPARC64 depends on HAS_DMA - select FB_IOMEM_HELPERS select FONT_SUPPORT select FONT_8x16 select VIDEOBUF2_VMALLOC @@ -31,6 +30,15 @@ config VIDEO_VIVID_CEC When selected the vivid module will emulate the optional HDMI CEC feature. +config VIDEO_VIVID_OSD + bool "Enable Framebuffer for testing Output Overlay" + depends on VIDEO_VIVID && FB + default y + select FB_IOMEM_HELPERS + help + When selected the vivid module will emulate a Framebuffer for + testing Output Overlay. + config VIDEO_VIVID_MAX_DEVS int "Maximum number of devices" depends on VIDEO_VIVID diff --git a/drivers/media/test-drivers/vivid/Makefile b/drivers/media/test-drivers/vivid/Makefile index b12ad0152a3e..284a59e97335 100644 --- a/drivers/media/test-drivers/vivid/Makefile +++ b/drivers/media/test-drivers/vivid/Makefile @@ -3,10 +3,13 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o vivid-meta-cap.o vivid-meta-out.o \ + vivid-meta-cap.o vivid-meta-out.o \ vivid-kthread-touch.o vivid-touch-cap.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif +ifeq ($(CONFIG_VIDEO_VIVID_OSD),y) + vivid-objs += vivid-osd.o +endif obj-$(CONFIG_VIDEO_VIVID) += vivid.o diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/test-drivers/vivid/vivid-core.c index 10f5bef3f49c..6af12a76a067 100644 --- a/drivers/media/test-drivers/vivid/vivid-core.c +++ b/drivers/media/test-drivers/vivid/vivid-core.c @@ -125,7 +125,9 @@ MODULE_PARM_DESC(node_types, " node types, default is 0xe1d3d. Bitmask with the "\t\t bit 8: Video Output node\n" "\t\t bit 10-11: VBI Output node: 0 = none, 1 = raw vbi, 2 = sliced vbi, 3 = both\n" "\t\t bit 12: Radio Transmitter node\n" +#if IS_ENABLED(CONFIG_VIDEO_VIVID_OSD) "\t\t bit 16: Framebuffer for testing output overlays\n" +#endif "\t\t bit 17: Metadata Capture node\n" "\t\t bit 18: Metadata Output node\n" "\t\t bit 19: Touch Capture node\n"); @@ -1071,9 +1073,11 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst, /* do we have a modulator? */ *has_modulator = dev->has_radio_tx; +#if IS_ENABLED(CONFIG_VIDEO_VIVID_OSD) if (dev->has_vid_cap) /* do we have a framebuffer for overlay testing? */ dev->has_fb = node_type & 0x10000; +#endif /* can we do crop/compose/scaling while capturing? */ if (no_error_inj && *ccs_cap == -1) diff --git a/drivers/media/test-drivers/vivid/vivid-core.h b/drivers/media/test-drivers/vivid/vivid-core.h index d2d52763b119..72bd48031ba0 100644 --- a/drivers/media/test-drivers/vivid/vivid-core.h +++ b/drivers/media/test-drivers/vivid/vivid-core.h @@ -403,9 +403,11 @@ struct vivid_dev { int display_byte_stride; int bits_per_pixel; int bytes_per_pixel; +#if IS_ENABLED(CONFIG_VIDEO_VIVID_OSD) struct fb_info fb_info; struct fb_var_screeninfo fb_defined; struct fb_fix_screeninfo fb_fix; +#endif /* Error injection */ bool disconnect_error; diff --git a/drivers/media/test-drivers/vivid/vivid-osd.h b/drivers/media/test-drivers/vivid/vivid-osd.h index 883459552fa9..6830e6d63dc5 100644 --- a/drivers/media/test-drivers/vivid/vivid-osd.h +++ b/drivers/media/test-drivers/vivid/vivid-osd.h @@ -8,8 +8,19 @@ #ifndef _VIVID_OSD_H_ #define _VIVID_OSD_H_ +#if IS_ENABLED(CONFIG_VIDEO_VIVID_OSD) int vivid_fb_init(struct vivid_dev *dev); void vivid_fb_deinit(struct vivid_dev *dev); void vivid_clear_fb(struct vivid_dev *dev); +#else +static inline int vivid_fb_init(struct vivid_dev *dev) +{ + return -ENODEV; +} + +static inline void vivid_fb_deinit(struct vivid_dev *dev) {} + +static inline void vivid_clear_fb(struct vivid_dev *dev) {} +#endif #endif diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c b/drivers/media/test-drivers/vivid/vivid-vid-out.c index 5ec84db934d6..75b24751b9a4 100644 --- a/drivers/media/test-drivers/vivid/vivid-vid-out.c +++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c @@ -907,10 +907,11 @@ int vivid_vid_out_g_fbuf(struct file *file, void *fh, a->base = (void *)dev->video_pbase; a->fmt.width = dev->display_width; a->fmt.height = dev->display_height; - if (dev->fb_defined.green.length == 5) - a->fmt.pixelformat = V4L2_PIX_FMT_ARGB555; - else + a->fmt.pixelformat = V4L2_PIX_FMT_ARGB555; +#if IS_ENABLED(CONFIG_VIDEO_VIVID_FB) + if (dev->fb_defined.green.length != 5) a->fmt.pixelformat = V4L2_PIX_FMT_RGB565; +#endif a->fmt.bytesperline = dev->display_byte_stride; a->fmt.sizeimage = a->fmt.height * a->fmt.bytesperline; a->fmt.field = V4L2_FIELD_NONE;