3 files changed, 18 insertions, 17 deletions

diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
index 9817dbfa4ac3..9cb2d3e6e1c0 100644
--- a/drivers/gpu/drm/vc4/vc4_dpi.c
+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
@@ -236,14 +236,12 @@ static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev,
 {
         struct drm_connector *connector = NULL;
         struct vc4_dpi_connector *dpi_connector;
-        int ret = 0;
 
         dpi_connector = devm_kzalloc(dev->dev, sizeof(*dpi_connector),
                                      GFP_KERNEL);
-        if (!dpi_connector) {
-                ret = -ENOMEM;
-                goto fail;
-        }
+        if (!dpi_connector)
+                return ERR_PTR(-ENOMEM);
+
         connector = &dpi_connector->base;
 
         dpi_connector->encoder = dpi->encoder;
@@ -260,12 +258,6 @@ static struct drm_connector *vc4_dpi_connector_init(struct drm_device *dev,
         drm_mode_connector_attach_encoder(connector, dpi->encoder);
 
         return connector;
-
- fail:
-        if (connector)
-                vc4_dpi_connector_destroy(connector);
-
-        return ERR_PTR(ret);
 }
 
 static const struct drm_encoder_funcs vc4_dpi_encoder_funcs = {
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index fd2644d231ff..26b6b067567c 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -465,12 +465,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
         if (IS_ERR(hdmi->hd_regs))
                 return PTR_ERR(hdmi->hd_regs);
 
-        ddc_node = of_parse_phandle(dev->of_node, "ddc", 0);
-        if (!ddc_node) {
-                DRM_ERROR("Failed to find ddc node in device tree\n");
-                return -ENODEV;
-        }
-
         hdmi->pixel_clock = devm_clk_get(dev, "pixel");
         if (IS_ERR(hdmi->pixel_clock)) {
                 DRM_ERROR("Failed to get pixel clock\n");
@@ -482,7 +476,14 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
                 return PTR_ERR(hdmi->hsm_clock);
         }
 
+        ddc_node = of_parse_phandle(dev->of_node, "ddc", 0);
+        if (!ddc_node) {
+                DRM_ERROR("Failed to find ddc node in device tree\n");
+                return -ENODEV;
+        }
+
         hdmi->ddc = of_find_i2c_adapter_by_node(ddc_node);
+        of_node_put(ddc_node);
         if (!hdmi->ddc) {
                 DRM_DEBUG("Failed to get ddc i2c adapter by node\n");
                 return -EPROBE_DEFER;
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 4037b52fde31..b12deef2527d 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -94,6 +94,14 @@ static const struct hvs_format {
                 .pixel_order = HVS_PIXEL_ORDER_ABGR, .has_alpha = true,
         },
         {
+                .drm = DRM_FORMAT_ABGR8888, .hvs = HVS_PIXEL_FORMAT_RGBA8888,
+                .pixel_order = HVS_PIXEL_ORDER_ARGB, .has_alpha = true,
+        },
+        {
+                .drm = DRM_FORMAT_XBGR8888, .hvs = HVS_PIXEL_FORMAT_RGBA8888,
+                .pixel_order = HVS_PIXEL_ORDER_ARGB, .has_alpha = false,
+        },
+        {
                 .drm = DRM_FORMAT_RGB565, .hvs = HVS_PIXEL_FORMAT_RGB565,
                 .pixel_order = HVS_PIXEL_ORDER_XRGB, .has_alpha = false,
         },