Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 347d761c authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: rcar-du: Don't fail probe in case of partial encoder init error 



If an encoder fails to initialize the device can still be used without
the failed encoder. Don't propagate the error out of the probe function
but just skip the failed encoder.

As a special case a deferred probe request from the encoder is still
propagated out of the probe function in order not to break the deferred
probing mechanism.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 3b2b36e5

drivers/gpu/drm/rcar-du/rcar_du_encoder.c

+21 −7
Original line number Diff line number Diff line
@@ -193,32 +193,46 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, 
		if (renc->lvds) {

			dev_err(rcdu->dev,

				"Chaining LVDS and HDMI encoders not supported\n");

			return -EINVAL;

			ret = -EINVAL;

			goto done;

		}



		ret = rcar_du_hdmienc_init(rcdu, renc, enc_node);

		if (ret < 0)

			return ret;

			goto done;

	} else {

		ret = drm_encoder_init(rcdu->ddev, encoder, &encoder_funcs,

				       encoder_type);

		if (ret < 0)

			return ret;

			goto done;



		drm_encoder_helper_add(encoder, &encoder_helper_funcs);

	}



	switch (encoder_type) {

	case DRM_MODE_ENCODER_LVDS:

		return rcar_du_lvds_connector_init(rcdu, renc, con_node);

		ret = rcar_du_lvds_connector_init(rcdu, renc, con_node);

		break;



	case DRM_MODE_ENCODER_DAC:

		return rcar_du_vga_connector_init(rcdu, renc);

		ret = rcar_du_vga_connector_init(rcdu, renc);

		break;



	case DRM_MODE_ENCODER_TMDS:

		return rcar_du_hdmi_connector_init(rcdu, renc);

		ret = rcar_du_hdmi_connector_init(rcdu, renc);

		break;



	default:

		return -EINVAL;

		ret = -EINVAL;

		break;

	}



done:

	if (ret < 0) {

		if (encoder->name)

			encoder->funcs->destroy(encoder);

		devm_kfree(rcdu->dev, renc);

	}



	return ret;

}

drivers/gpu/drm/rcar-du/rcar_du_kms.c

+13 −2
Original line number Diff line number Diff line
@@ -346,10 +346,16 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) 
		/* Process the output pipeline. */

		ret = rcar_du_encoders_init_one(rcdu, output, &ep);

		if (ret < 0) {

			if (ret == -EPROBE_DEFER) {

				of_node_put(ep_node);

				return ret;

			}



			dev_info(rcdu->dev,

				 "encoder initialization failed, skipping\n");

			continue;

		}



		num_encoders += ret;

	}
@@ -413,6 +419,11 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) 
	if (ret < 0)

		return ret;



	if (ret == 0) {

		dev_err(rcdu->dev, "error: no encoder could be initialized\n");

		return -EINVAL;

	}



	num_encoders = ret;



	/* Set the possible CRTCs and possible clones. There's always at least