From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>

There were two paths for fb and !fb.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
Cc: chandra konduru <chandra.kond...@intel.com>
Cc: Thomas Wood <thomas.w...@intel.com>
---
 lib/igt_kms.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 33d437d..b5ba273 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1765,14 +1765,6 @@ void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb 
*fb)
        plane->fb = fb;
        /* hack to keep tests working that don't call igt_plane_set_size() */
        if (fb) {
-               plane->crtc_w = fb->width;
-               plane->crtc_h = fb->height;
-       } else {
-               plane->crtc_w = 0;
-               plane->crtc_h = 0;
-       }
-
-       if (fb) {
                /* set default plane pos/size as fb size */
                plane->crtc_x = 0;
                plane->crtc_y = 0;
@@ -1784,6 +1776,9 @@ void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb 
*fb)
                fb->src_y = 0;
                fb->src_w = fb->width;
                fb->src_h = fb->height;
+       } else {
+               plane->crtc_w = 0;
+               plane->crtc_h = 0;
        }
 
        plane->fb_changed = true;
-- 
2.3.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to