On Wed, May 27, 2020 at 8:51 AM Maxime Ripard maxime@cerno.tech wrote:
the vc4_hdmi driver has some custom structures to hold the data it needs to associate with the drm_encoder and drm_connector structures.
However, it allocates them separately from the vc4_hdmi structure which makes it more complicated than it needs to be.
Move those structures to be contained by vc4_hdmi and update the code accordingly.
@@ -1220,7 +1219,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = drm->dev_private; struct vc4_hdmi *hdmi;
struct vc4_hdmi_encoder *vc4_hdmi_encoder;
struct drm_encoder *encoder; struct device_node *ddc_node; u32 value; int ret;@@ -1229,14 +1228,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (!hdmi) return -ENOMEM;
vc4_hdmi_encoder = devm_kzalloc(dev, sizeof(*vc4_hdmi_encoder),GFP_KERNEL);if (!vc4_hdmi_encoder)return -ENOMEM;vc4_hdmi_encoder->base.type = VC4_ENCODER_TYPE_HDMI0;hdmi->encoder = &vc4_hdmi_encoder->base.base;hdmi->pdev = pdev;
encoder = &hdmi->encoder.base.base;encoder->base.type = VC4_ENCODER_TYPE_HDMI0;
Wait, does this patch build? setting struct drm_encoder->base.type = VC4_* seems very wrong, when previously we were setting struct vc4_hdmi_encoder->base.type (struct vc4_encoder->type).
Other than this, patch 68-78 r-b.