drivers/gpu/drm/openchrome/via_crtc.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 0644b15e11a6a9e46e2b7fb42c6d3dd2b730f8b8
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 11 18:21:27 2017 -0700
Fixing local *mode_set_base functions to use old_fb rather than fb
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 1d3608a84b03..7ab1de3d9de4 100644
--- a/drivers/gpu/drm/openchrome/via_crtc.c
+++ b/drivers/gpu/drm/openchrome/via_crtc.c
@@ -1232,7 +1232,7 @@ exit:
static int
via_iga1_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
- struct drm_framebuffer *fb)
+ struct drm_framebuffer *old_fb)
{
struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
struct drm_framebuffer *new_fb = crtc->primary->fb;
@@ -1249,7 +1249,7 @@ via_iga1_crtc_mode_set_base(struct drm_crtc *crtc, int x,
int y,
}
/* No reason to reset the display surface again */
- if (new_fb == fb)
+ if (new_fb == old_fb)
return ret;
obj = new_fb->helper_private;
@@ -1270,8 +1270,8 @@ via_iga1_crtc_mode_set_base(struct drm_crtc *crtc, int x,
int y,
}
/* Free the old framebuffer if it exist */
- if (fb) {
- obj = fb->helper_private;
+ if (old_fb) {
+ obj = old_fb->helper_private;
bo = ttm_gem_mapping(obj);
ret = via_bo_unpin(bo, NULL);
@@ -1543,7 +1543,7 @@ exit:
static int
via_iga2_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
- struct drm_framebuffer *fb)
+ struct drm_framebuffer *old_fb)
{
struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
struct drm_framebuffer *new_fb = crtc->primary->fb;
@@ -1560,7 +1560,7 @@ via_iga2_crtc_mode_set_base(struct drm_crtc *crtc, int x,
int y,
}
/* No reason to reset the display surface again */
- if (new_fb == fb)
+ if (new_fb == old_fb)
return ret;
obj = new_fb->helper_private;
@@ -1581,8 +1581,8 @@ via_iga2_crtc_mode_set_base(struct drm_crtc *crtc, int x,
int y,
}
/* Free the old framebuffer if it exist */
- if (fb) {
- obj = fb->helper_private;
+ if (old_fb) {
+ obj = old_fb->helper_private;
bo = ttm_gem_mapping(obj);
ret = via_bo_unpin(bo, NULL);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
