Merge tag 'hdlcd-for-v4.13-v3' of git://linux-arm.org/linux-ld into drm-next

hdlcd fixes.

* tag 'hdlcd-for-v4.13-v3' of git://linux-arm.org/linux-ld:
  drm/arm: hdlcd: remove unused variables
  drm/arm: hdlcd: Use CMA helper for plane buffer address calculation
  drm/arm: hdlcd: Set the CRTC's port before binding the encoder.

2 files changed, 11 insertions, 9 deletions

diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c
index 1a3359c0f6cd..d67b6f15e8b8 100644
--- a/drivers/gpu/drm/arm/hdlcd_crtc.c
+++ b/drivers/gpu/drm/arm/hdlcd_crtc.c
@@ -261,21 +261,14 @@ static void hdlcd_plane_atomic_update(struct drm_plane *plane,
 {
         struct drm_framebuffer *fb = plane->state->fb;
         struct hdlcd_drm_private *hdlcd;
-        struct drm_gem_cma_object *gem;
-        u32 src_x, src_y, dest_h;
+        u32 dest_h;
         dma_addr_t scanout_start;
 
         if (!fb)
                 return;
 
-        src_x = plane->state->src.x1 >> 16;
-        src_y = plane->state->src.y1 >> 16;
         dest_h = drm_rect_height(&plane->state->dst);
-        gem = drm_fb_cma_get_gem_obj(fb, 0);
-
-        scanout_start = gem->paddr + fb->offsets[0] +
-                        src_y * fb->pitches[0] +
-                        src_x * fb->format->cpp[0];
+        scanout_start = drm_fb_cma_get_gem_addr(fb, plane->state, 0);
 
         hdlcd = plane->dev->dev_private;
         hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, fb->pitches[0]);
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index 345c8357b273..d3da87fbd85a 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -297,6 +297,9 @@ static int hdlcd_drm_bind(struct device *dev)
         if (ret)
                 goto err_free;
 
+        /* Set the CRTC's port so that the encoder component can find it */
+        hdlcd->crtc.port = of_graph_get_port_by_id(dev->of_node, 0);
+
         ret = component_bind_all(dev, drm);
         if (ret) {
                 DRM_ERROR("Failed to bind all components\n");
@@ -340,11 +343,14 @@ err_register:
         }
 err_fbdev:
         drm_kms_helper_poll_fini(drm);
+        drm_vblank_cleanup(drm);
 err_vblank:
         pm_runtime_disable(drm->dev);
 err_pm_active:
         component_unbind_all(dev, drm);
 err_unload:
+        of_node_put(hdlcd->crtc.port);
+        hdlcd->crtc.port = NULL;
         drm_irq_uninstall(drm);
         of_reserved_mem_device_release(drm->dev);
 err_free:
@@ -367,6 +373,9 @@ static void hdlcd_drm_unbind(struct device *dev)
         }
         drm_kms_helper_poll_fini(drm);
         component_unbind_all(dev, drm);
+        of_node_put(hdlcd->crtc.port);
+        hdlcd->crtc.port = NULL;
+        drm_vblank_cleanup(drm);
         pm_runtime_get_sync(drm->dev);
         drm_irq_uninstall(drm);
         pm_runtime_put_sync(drm->dev);