Merge branch 'rpi-6.18.y' into rpi-6.18-sr9900

Author: zjzhao-eda

drivers/gpu/drm/vc4/vc4_hdmi.c

@@ -841,14 +841,12 @@ static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder,
 
 	mutex_lock(&vc4_hdmi->mutex);
 
-	vc4_hdmi->packet_ram_enabled = false;
-
 	if (!drm_dev_enter(drm, &idx))
 		goto out;
 
 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
 
-	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, 0);
+	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, VC4_HDMI_RAM_PACKET_ENABLE);
 
 	HDMI_WRITE(HDMI_VID_CTL, HDMI_READ(HDMI_VID_CTL) | VC4_HD_VID_CTL_CLRRGB);
 
@@ -1622,9 +1620,6 @@ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
 		WARN_ONCE(ret, "Timeout waiting for "
 			  "VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE\n");
 	} else {
-		HDMI_WRITE(HDMI_RAM_PACKET_CONFIG,
-			   HDMI_READ(HDMI_RAM_PACKET_CONFIG) &
-			   ~(VC4_HDMI_RAM_PACKET_ENABLE));
 		HDMI_WRITE(HDMI_SCHEDULER_CONTROL,
 			   HDMI_READ(HDMI_SCHEDULER_CONTROL) &
 			   ~VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI);
@@ -1643,11 +1638,7 @@ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
 		WARN_ON(!(HDMI_READ(HDMI_SCHEDULER_CONTROL) &
 			  VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE));
 
-		HDMI_WRITE(HDMI_RAM_PACKET_CONFIG,
-			   VC4_HDMI_RAM_PACKET_ENABLE);
-
 		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
-		vc4_hdmi->packet_ram_enabled = true;
 
 		drm_atomic_helper_connector_hdmi_update_infoframes(connector, state);
 	}
@@ -3107,6 +3098,12 @@ static int vc5_hdmi_init_resources(struct drm_device *drm,
 static int vc4_hdmi_runtime_suspend(struct device *dev)
 {
 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
+	unsigned long flags;
+
+	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, 0);
+	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+
 
 	clk_disable_unprepare(vc4_hdmi->audio_clock);
 	/* we no longer require a minimum clock rate */
@@ -3119,7 +3116,7 @@ static int vc4_hdmi_runtime_suspend(struct device *dev)
 static int vc4_hdmi_runtime_resume(struct device *dev)
 {
 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
-	unsigned long __maybe_unused flags;
+	unsigned long flags;
 	u32 __maybe_unused value;
 	unsigned long rate;
 	int ret;
@@ -3167,6 +3164,11 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
 	}
 #endif
 
+	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG,
+		   VC4_HDMI_RAM_PACKET_ENABLE);
+	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+
 	return 0;
 
 err_disable_clk:

drivers/gpu/drm/vc4/vc4_hdmi.h

@@ -192,12 +192,6 @@ struct vc4_hdmi {
 	 */
 	struct drm_display_mode saved_adjusted_mode;
 
-	/**
-	 * @packet_ram_enabled: Is the HDMI controller packet RAM currently
-	 * on? Protected by @mutex.
-	 */
-	bool packet_ram_enabled;
-
 	/**
 	 * @scdc_enabled: Is the HDMI controller currently running with
 	 * the scrambler on? Protected by @mutex.

drivers/media/i2c/tc358743.c

@@ -756,7 +756,6 @@ static void tc358743_set_ref_clk(struct v4l2_subdev *sd)
 static void tc358743_set_csi_color_space(struct v4l2_subdev *sd)
 {
 	struct tc358743_state *state = to_state(sd);
-	struct device *dev = &state->i2c_client->dev;
 
 	switch (state->mbus_fmt_code) {
 	case MEDIA_BUS_FMT_UYVY8_1X16:
@@ -772,17 +771,7 @@ static void tc358743_set_csi_color_space(struct v4l2_subdev *sd)
 		mutex_unlock(&state->confctl_mutex);
 		break;
 	case MEDIA_BUS_FMT_RGB888_1X24:
-		/*
-		 * The driver was initially introduced with RGB888
-		 * support, but CSI really means BGR.
-		 *
-		 * Since we might have applications that would have
-		 * hard-coded the RGB888, let's support both.
-		 */
-		dev_warn_once(dev, "RGB format isn't actually supported by the hardware. The application should be fixed to use BGR.");
-		fallthrough;
-	case MEDIA_BUS_FMT_BGR888_1X24:
-		v4l2_dbg(2, debug, sd, "%s: BGR 888 24-bit\n", __func__);
+		v4l2_dbg(2, debug, sd, "%s: RGB 888 24-bit\n", __func__);
 		i2c_wr8_and_or(sd, VOUT_SET2,
 				~(MASK_SEL422 | MASK_VOUT_422FIL_100) & 0xff,
 				0x00);
@@ -1443,26 +1432,11 @@ static int tc358743_log_status(struct v4l2_subdev *sd)
 	v4l2_info(sd, "Stopped: %s\n",
 			(i2c_rd16(sd, CSI_STATUS) & MASK_S_HLT) ?
 			"yes" : "no");
-
-	switch (state->mbus_fmt_code) {
-	case MEDIA_BUS_FMT_BGR888_1X24:
-		/*
-		 * The driver was initially introduced with RGB888
-		 * support, but CSI really means BGR.
-		 *
-		 * Since we might have applications that would have
-		 * hard-coded the RGB888, let's support both.
-		 */
-	case MEDIA_BUS_FMT_RGB888_1X24:
-		v4l2_info(sd, "Color space: BGR 888 24-bit\n");
-		break;
-	case MEDIA_BUS_FMT_UYVY8_1X16:
-		v4l2_info(sd, "Color space: YCbCr 422 16-bit\n");
-		break;
-	default:
-		v4l2_info(sd, "Color space: Unsupported\n");
-		break;
-	}
+	v4l2_info(sd, "Color space: %s\n",
+			state->mbus_fmt_code == MEDIA_BUS_FMT_UYVY8_1X16 ?
+			"YCbCr 422 16-bit" :
+			state->mbus_fmt_code == MEDIA_BUS_FMT_RGB888_1X24 ?
+			"RGB 888 24-bit" : "Unsupported");
 
 	v4l2_info(sd, "-----%s status-----\n", is_hdmi(sd) ? "HDMI" : "DVI-D");
 	v4l2_info(sd, "HDCP encrypted content: %s\n",
@@ -1799,18 +1773,11 @@ static int tc358743_enum_mbus_code(struct v4l2_subdev *sd,
 {
 	switch (code->index) {
 	case 0:
-		code->code = MEDIA_BUS_FMT_BGR888_1X24;
+		code->code = MEDIA_BUS_FMT_RGB888_1X24;
 		break;
 	case 1:
 		code->code = MEDIA_BUS_FMT_UYVY8_1X16;
 		break;
-	case 2:
-		/*
-		 * We need to keep RGB888 for backward compatibility,
-		 * but we should list it last for userspace to pick BGR.
-		 */
-		code->code = MEDIA_BUS_FMT_RGB888_1X24;
-		break;
 	default:
 		return -EINVAL;
 	}
@@ -1820,7 +1787,6 @@ static int tc358743_enum_mbus_code(struct v4l2_subdev *sd,
 static u32 tc358743_g_colorspace(u32 code)
 {
 	switch (code) {
-	case MEDIA_BUS_FMT_BGR888_1X24:
 	case MEDIA_BUS_FMT_RGB888_1X24:
 		return V4L2_COLORSPACE_SRGB;
 	case MEDIA_BUS_FMT_UYVY8_1X16:
@@ -1858,8 +1824,7 @@ static int tc358743_set_fmt(struct v4l2_subdev *sd,
 	u32 code = format->format.code; /* is overwritten by get_fmt */
 	int ret = tc358743_get_fmt(sd, sd_state, format);
 
-	if (code == MEDIA_BUS_FMT_BGR888_1X24 ||
-	    code == MEDIA_BUS_FMT_RGB888_1X24 ||
+	if (code == MEDIA_BUS_FMT_RGB888_1X24 ||
 	    code == MEDIA_BUS_FMT_UYVY8_1X16)
 		format->format.code = code;
 	format->format.colorspace = tc358743_g_colorspace(format->format.code);
@@ -2279,7 +2244,7 @@ static int tc358743_probe(struct i2c_client *client)
 	if (err < 0)
 		goto err_hdl;
 
-	state->mbus_fmt_code = MEDIA_BUS_FMT_BGR888_1X24;
+	state->mbus_fmt_code = MEDIA_BUS_FMT_RGB888_1X24;
 
 	sd->dev = &client->dev;
 

drivers/media/platform/broadcom/bcm2835-unicam.c

@@ -342,12 +342,12 @@ static const struct unicam_format_info unicam_image_formats[] = {
 		.csi_dt		= MIPI_CSI2_DT_RGB565,
 	}, {
 		.fourcc		= V4L2_PIX_FMT_RGB24, /* rgb */
-		.code		= MEDIA_BUS_FMT_RGB888_1X24,
+		.code		= MEDIA_BUS_FMT_BGR888_1X24,
 		.depth		= 24,
 		.csi_dt		= MIPI_CSI2_DT_RGB888,
 	}, {
 		.fourcc		= V4L2_PIX_FMT_BGR24, /* bgr */
-		.code		= MEDIA_BUS_FMT_BGR888_1X24,
+		.code		= MEDIA_BUS_FMT_RGB888_1X24,
 		.depth		= 24,
 		.csi_dt		= MIPI_CSI2_DT_RGB888,
 	}, {
@@ -2148,22 +2148,45 @@ static int unicam_video_link_validate(struct media_link *link)
 		const struct v4l2_pix_format *fmt = &node->fmt.fmt.pix;
 		const struct unicam_format_info *fmtinfo;
 
-		fmtinfo = unicam_find_format_by_fourcc(fmt->pixelformat,
-						       UNICAM_SD_PAD_SOURCE_IMAGE);
+		fmtinfo = unicam_find_format_by_code(format->code,
+						     UNICAM_SD_PAD_SOURCE_IMAGE);
 		if (WARN_ON(!fmtinfo)) {
 			ret = -EPIPE;
 			goto out;
 		}
 
-		if (fmtinfo->code != format->code ||
-		    fmt->height != format->height ||
+		/*
+		 * Unicam initially associated BGR24 to BGR888_1X24 and RGB24 to
+		 * RGB888_1X24.
+		 *
+		 * In order to allow the applications using the old behaviour to
+		 * run, let's accept the old combination, but warn about it.
+		 */
+		if (fmtinfo->fourcc != fmt->pixelformat) {
+			if ((fmt->pixelformat == V4L2_PIX_FMT_BGR24 &&
+			     format->code == MEDIA_BUS_FMT_BGR888_1X24) ||
+			    (fmt->pixelformat == V4L2_PIX_FMT_RGB24 &&
+			     format->code == MEDIA_BUS_FMT_RGB888_1X24)) {
+				dev_warn_once(node->dev->dev,
+					      "Incorrect pixel format %p4cc for 0x%04x. Fix your application to use %p4cc.\n",
+					      &fmt->pixelformat, format->code, &fmtinfo->fourcc);
+			} else {
+				dev_dbg(node->dev->dev,
+					"image: format mismatch: 0x%04x <=> %p4cc\n",
+					format->code, &fmt->pixelformat);
+				ret = -EPIPE;
+				goto out;
+			}
+		}
+
+		if (fmt->height != format->height ||
 		    fmt->width != format->width ||
 		    fmt->field != format->field) {
 			dev_dbg(node->dev->dev,
-				"image: (%u x %u) 0x%08x %s != (%u x %u) 0x%08x %s\n",
-				fmt->width, fmt->height, fmtinfo->code,
+				"image: (%u x %u) %s != (%u x %u) %s\n",
+				fmt->width, fmt->height,
 				v4l2_field_names[fmt->field],
-				format->width, format->height, format->code,
+				format->width, format->height,
 				v4l2_field_names[format->field]);
 			ret = -EPIPE;
 		}

drivers/media/platform/raspberrypi/rp1-cfe/cfe-fmts.h

@@ -62,13 +62,13 @@ static const struct cfe_fmt formats[] = {
 	},
 	{
 		.fourcc = V4L2_PIX_FMT_RGB24, /* rgb */
-		.code = MEDIA_BUS_FMT_RGB888_1X24,
+		.code = MEDIA_BUS_FMT_BGR888_1X24,
 		.depth = 24,
 		.csi_dt = MIPI_CSI2_DT_RGB888,
 	},
 	{
 		.fourcc = V4L2_PIX_FMT_BGR24, /* bgr */
-		.code = MEDIA_BUS_FMT_BGR888_1X24,
+		.code = MEDIA_BUS_FMT_RGB888_1X24,
 		.depth = 24,
 		.csi_dt = MIPI_CSI2_DT_RGB888,
 	},

drivers/media/platform/raspberrypi/rp1-cfe/cfe.c

@@ -1807,13 +1807,30 @@ static int cfe_video_link_validate(struct media_link *link)
 			goto out;
 		}
 
-		fmt = find_format_by_code_and_fourcc(source_fmt->code,
-						     pix_fmt->pixelformat);
+		fmt = find_format_by_code(source_fmt->code);
+
 		if (!fmt) {
-			cfe_err(cfe, "Format mismatch!\n");
+			cfe_err(cfe, "Format mismatch - unknown code!\n");
 			ret = -EINVAL;
 			goto out;
 		}
+
+		if (fmt->fourcc != pix_fmt->pixelformat) {
+			if ((pix_fmt->pixelformat == V4L2_PIX_FMT_BGR24 &&
+			     source_fmt->code == MEDIA_BUS_FMT_BGR888_1X24) ||
+			    (pix_fmt->pixelformat == V4L2_PIX_FMT_RGB24 &&
+			     source_fmt->code == MEDIA_BUS_FMT_RGB888_1X24)) {
+				dev_warn_once(&cfe->pdev->dev,
+					      "Incorrect pixel format %p4cc for 0x%04x. Fix your application to use %p4cc.\n",
+					      &pix_fmt->pixelformat,
+					      source_fmt->code, &fmt->fourcc);
+			} else {
+				cfe_err(cfe, "Format mismatch! Code %u fourcc %p4cc\n",
+					source_fmt->code, &pix_fmt->pixelformat);
+				ret = -EINVAL;
+				goto out;
+			}
+		}
 	} else if (is_csi2_node(node) && is_meta_output_node(node)) {
 		struct v4l2_meta_format *meta_fmt = &node->meta_fmt.fmt.meta;
 		const struct cfe_fmt *fmt;

drivers/media/platform/raspberrypi/rp1_cfe/cfe.c

@@ -1676,7 +1676,6 @@ static int cfe_video_link_validate(struct cfe_node *node,
 	if (is_image_output_node(node)) {
 		struct v4l2_pix_format *pix_fmt = &node->vid_fmt.fmt.pix;
 		const struct cfe_fmt *fmt = NULL;
-		unsigned int i;
 
 		if (remote_fmt->width != pix_fmt->width ||
 		    remote_fmt->height != pix_fmt->height) {
@@ -1687,17 +1686,29 @@ static int cfe_video_link_validate(struct cfe_node *node,
 			return -EINVAL;
 		}
 
-		for (i = 0; i < ARRAY_SIZE(formats); i++) {
-			if (formats[i].code == remote_fmt->code &&
-			    formats[i].fourcc == pix_fmt->pixelformat) {
-				fmt = &formats[i];
-				break;
-			}
-		}
+		fmt = find_format_by_code(remote_fmt->code);
+
 		if (!fmt) {
-			cfe_err("Format mismatch!\n");
+			cfe_err("Format not found. %08x %p4cc\n",
+				remote_fmt->code, &pix_fmt->pixelformat);
 			return -EINVAL;
 		}
+
+		if (fmt->fourcc != pix_fmt->pixelformat) {
+			if ((pix_fmt->pixelformat == V4L2_PIX_FMT_BGR24 &&
+			     remote_fmt->code == MEDIA_BUS_FMT_BGR888_1X24) ||
+			    (pix_fmt->pixelformat == V4L2_PIX_FMT_RGB24 &&
+			     remote_fmt->code == MEDIA_BUS_FMT_RGB888_1X24)) {
+				dev_warn_once(&cfe->pdev->dev,
+					      "Incorrect pixel format %p4cc for 0x%04x. Fix your application to use %p4cc.\n",
+					      &pix_fmt->pixelformat,
+					      remote_fmt->code, &fmt->fourcc);
+			} else {
+				cfe_err("Format mismatch! Code %u fourcc %p4cc\n",
+					remote_fmt->code, &pix_fmt->pixelformat);
+				return -EINVAL;
+			}
+		}
 	} else if (is_csi2_node(node) && is_meta_output_node(node)) {
 		struct v4l2_meta_format *meta_fmt = &node->meta_fmt.fmt.meta;
 		const struct cfe_fmt *fmt;

drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h

@@ -63,13 +63,13 @@ static const struct cfe_fmt formats[] = {
 	},
 	{
 		.fourcc = V4L2_PIX_FMT_RGB24, /* rgb */
-		.code = MEDIA_BUS_FMT_RGB888_1X24,
+		.code = MEDIA_BUS_FMT_BGR888_1X24,
 		.depth = 24,
 		.csi_dt = MIPI_CSI2_DT_RGB888,
 	},
 	{
 		.fourcc = V4L2_PIX_FMT_BGR24, /* bgr */
-		.code = MEDIA_BUS_FMT_BGR888_1X24,
+		.code = MEDIA_BUS_FMT_RGB888_1X24,
 		.depth = 24,
 		.csi_dt = MIPI_CSI2_DT_RGB888,
 	},

drivers/pwm/pwm-pio-rp1.c

@@ -224,7 +224,6 @@ static int pwm_pio_rp1_probe(struct platform_device *pdev)
 	pwm_pio_resolution = (1000u * 1000 * 1000 * pwm_loop_ticks) / clock_get_hz(clk_sys);
 
 	chip->ops = &pwm_pio_rp1_ops;
-	chip->atomic = true;
 	chip->npwm = 1;
 
 	platform_set_drvdata(pdev, ppwm);