drivers/gpu/drm/openchrome/via_crtc.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
New commits: commit f61dbdf46c4aeb6654ef2f6237997f4fe0f5799d Author: Kevin Brace <kevinbr...@gmx.com> Date: Fri Aug 25 00:38:42 2017 -0700 Remove no long necessary reference to the display controller number Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c index d84b88f129d2..645e00451d41 100644 --- a/drivers/gpu/drm/openchrome/via_crtc.c +++ b/drivers/gpu/drm/openchrome/via_crtc.c @@ -1054,7 +1054,6 @@ drm_mode_crtc_load_lut(struct drm_crtc *crtc) static void via_iga1_crtc_dpms(struct drm_crtc *crtc, int mode) { - struct via_crtc *iga = container_of(crtc, struct via_crtc, base); struct via_device *dev_priv = crtc->dev->dev_private; DRM_DEBUG("Entered via_iga1_crtc_dpms.\n"); @@ -1086,8 +1085,6 @@ via_iga1_crtc_dpms(struct drm_crtc *crtc, int mode) static void via_iga1_crtc_disable(struct drm_crtc *crtc) { - struct via_crtc *iga = container_of(crtc, struct via_crtc, base); - DRM_DEBUG("Entered via_iga1_crtc_disable.\n"); drm_crtc_vblank_off(crtc); @@ -1340,7 +1337,6 @@ via_iga1_mode_set_base_atomic(struct drm_crtc *crtc, static void via_iga2_crtc_dpms(struct drm_crtc *crtc, int mode) { - struct via_crtc *iga = container_of(crtc, struct via_crtc, base); struct via_device *dev_priv = crtc->dev->dev_private; DRM_DEBUG("Entered via_iga2_crtc_dpms.\n"); @@ -1372,8 +1368,6 @@ via_iga2_crtc_dpms(struct drm_crtc *crtc, int mode) static void via_iga2_crtc_disable(struct drm_crtc *crtc) { - struct via_crtc *iga = container_of(crtc, struct via_crtc, base); - DRM_DEBUG("Entered via_iga2_crtc_disable.\n"); drm_crtc_vblank_off(crtc); commit 975d7b7ec948320ebf7e2f8b932a820ff038008a Author: Kevin Brace <kevinbr...@gmx.com> Date: Fri Aug 25 00:03:11 2017 -0700 Directly reference drm_crtc_helper_funcs Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c index 44c973bd5c5f..d84b88f129d2 100644 --- a/drivers/gpu/drm/openchrome/via_crtc.c +++ b/drivers/gpu/drm/openchrome/via_crtc.c @@ -1151,7 +1151,6 @@ via_iga1_crtc_mode_set(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *fb) { struct via_crtc *iga = container_of(crtc, struct via_crtc, base); - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; struct via_device *dev_priv = crtc->dev->dev_private; struct drm_device *dev = crtc->dev; u8 reg_value = 0; @@ -1227,7 +1226,7 @@ via_iga1_crtc_mode_set(struct drm_crtc *crtc, via_set_vclock(crtc, pll_regs); } - ret = crtc_funcs->mode_set_base(crtc, x, y, fb); + ret = crtc->helper_private->mode_set_base(crtc, x, y, fb); exit: DRM_DEBUG("Exiting via_iga1_crtc_mode_set.\n"); @@ -1238,7 +1237,6 @@ static int via_iga1_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; struct ttm_buffer_object *bo; struct via_framebuffer *via_fb = container_of(crtc->primary->fb, struct via_framebuffer, fb); @@ -1267,7 +1265,7 @@ via_iga1_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, return ret; } - ret = crtc_funcs->mode_set_base_atomic(crtc, new_fb, x, y, + ret = crtc->helper_private->mode_set_base_atomic(crtc, new_fb, x, y, ENTER_ATOMIC_MODE_SET); if (unlikely(ret)) { DRM_DEBUG("failed to set new framebuffer\n"); @@ -1439,7 +1437,6 @@ via_iga2_crtc_mode_set(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *fb) { struct via_crtc *iga = container_of(crtc, struct via_crtc, base); - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; struct via_device *dev_priv = crtc->dev->dev_private; struct drm_device *dev = crtc->dev; int ret; @@ -1544,7 +1541,7 @@ via_iga2_crtc_mode_set(struct drm_crtc *crtc, via_set_vclock(crtc, pll_regs); } - ret = crtc_funcs->mode_set_base(crtc, x, y, fb); + ret = crtc->helper_private->mode_set_base(crtc, x, y, fb); exit: DRM_DEBUG("Exiting via_iga2_crtc_mode_set.\n"); @@ -1555,7 +1552,6 @@ static int via_iga2_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; struct ttm_buffer_object *bo; struct via_framebuffer *via_fb = container_of(crtc->primary->fb, struct via_framebuffer, fb); @@ -1584,7 +1580,7 @@ via_iga2_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, return ret; } - ret = crtc_funcs->mode_set_base_atomic(crtc, new_fb, x, y, + ret = crtc->helper_private->mode_set_base_atomic(crtc, new_fb, x, y, ENTER_ATOMIC_MODE_SET); if (unlikely(ret)) { DRM_DEBUG("failed to set new framebuffer\n"); _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel