Skip to contentSkip to conversation

drm: Fix error path in drm_mode_page_flip_ioctl()

PATCH Applied Imre Deak 4 participants 4 messages Sep 7, 2016 – Sep 8, 2016

Subsystems (2)
lore
Share & tools
lore

Imre Deak

author
#0 lore raw

PATCH 1/1 drm: Fix error path in drm_mode_page_flip_ioctl()

This fixes the error path for platforms that don't define the new page_flip_target() hook.

Fixes c229bfbbd04 ("drm: Add page_flip_target CRTC hook v2")

Testcase: igt/kms_flip/basic-flip-vs-dpms

CC Michel Dänzer <[email protected]>
---
 drivers/gpu/drm/drm_crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_crtc.c +1 -1
index 0f797ee..d84a0ea 100644
@@ -2047,7 +2047,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
 	}
 
 out:
-	if (ret)
+	if (ret && crtc->funcs->page_flip_target)
 		drm_crtc_vblank_put(crtc);
 	if (fb)
 		drm_framebuffer_unreference(fb);
Signature · 6 lines
2.5.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

✗ Fi.CI.BAT: failure for drm: Fix error path in drm_mode_page_flip_ioctl()

== Series Details ==

== Series Details ==

Series: drm: Fix error path in drm_mode_page_flip_ioctl()
URL : https://patchwork.freedesktop.org/series/12129/
State : failure

== Summary ==

Series 12129v1 drm: Fix error path in drm_mode_page_flip_ioctl()
http://patchwork.freedesktop.org/api/1.0/series/12129/revisions/1/mbox/

Test kms_flip:

        Subgroup basic-flip-vs-dpms:
                dmesg-fail -> PASS       (fi-snb-2600)
                dmesg-fail -> PASS       (fi-ivb-3520m)
                dmesg-fail -> PASS       (fi-bdw-5557u)
                dmesg-fail -> PASS       (fi-hsw-4770r)
                dmesg-fail -> PASS       (fi-snb-2520m)
                dmesg-fail -> PASS       (fi-ivb-3770)
                dmesg-fail -> PASS       (fi-skl-6700k)
                dmesg-fail -> PASS       (fi-ilk-650)
                dmesg-fail -> PASS       (fi-hsw-4770k)
                dmesg-fail -> PASS       (fi-bsw-n3050)
                dmesg-fail -> PASS       (fi-skl-6260u)
        Subgroup basic-flip-vs-modeset:
                dmesg-warn -> PASS       (fi-snb-2600)
                dmesg-warn -> PASS       (fi-ivb-3520m)
                dmesg-warn -> PASS       (fi-bdw-5557u)
                dmesg-warn -> PASS       (fi-hsw-4770r)
                dmesg-warn -> PASS       (fi-snb-2520m)
                dmesg-warn -> PASS       (fi-ivb-3770)
                dmesg-warn -> PASS       (fi-skl-6700k)
                dmesg-warn -> PASS       (fi-ilk-650)
                dmesg-warn -> PASS       (fi-hsw-4770k)
                dmesg-warn -> PASS       (fi-bsw-n3050)
                dmesg-warn -> PASS       (fi-skl-6260u)
        Subgroup basic-flip-vs-wf_vblank:
                dmesg-warn -> PASS       (fi-snb-2600)
                dmesg-warn -> PASS       (fi-ivb-3520m)
                dmesg-warn -> PASS       (fi-bdw-5557u)
                dmesg-warn -> PASS       (fi-hsw-4770r)
                dmesg-warn -> PASS       (fi-ivb-3770)
                dmesg-warn -> PASS       (fi-skl-6700k)
                dmesg-warn -> PASS       (fi-ilk-650)
                dmesg-warn -> PASS       (fi-hsw-4770k)
                dmesg-warn -> PASS       (fi-skl-6260u)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                pass       -> INCOMPLETE (fi-hsw-4770k)
fi-bdw-5557u     total:252  pass:236  dwarn:0   dfail:0   fail:1   skip:15 
fi-bsw-n3050     total:252  pass:205  dwarn:0   dfail:0   fail:1   skip:46 
fi-hsw-4770k     total:216  pass:195  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:252  pass:225  dwarn:0   dfail:0   fail:1   skip:26 
fi-ilk-650       total:252  pass:182  dwarn:0   dfail:0   fail:3   skip:67 
fi-ivb-3520m     total:252  pass:220  dwarn:0   dfail:0   fail:1   skip:31 
fi-ivb-3770      total:252  pass:220  dwarn:0   dfail:0   fail:1   skip:31 
fi-skl-6260u     total:252  pass:237  dwarn:0   dfail:0   fail:1   skip:14 
fi-skl-6700k     total:252  pass:222  dwarn:1   dfail:0   fail:1   skip:28 
fi-snb-2520m     total:252  pass:207  dwarn:0   dfail:0   fail:2   skip:43 
fi-snb-2600      total:252  pass:208  dwarn:0   dfail:0   fail:1   skip:43 

Results at /archive/results/CI_IGT_test/Patchwork_2483/

7f8bc957b96e7e5f4923a8d0eed2875869073c2a drm-intel-nightly: 2016y-09m-07d-14h-47m-42s UTC integration manifest 340aaf1 drm: Fix error path in drm_mode_page_flip_ioctl()

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Imre Deak
Quoted 17 lines · Imre Deak

This fixes the error path for platforms that don't define the new page_flip_target() hook.

Fixes c229bfbbd04 ("drm: Add page_flip_target CRTC hook v2")

Testcase: igt/kms_flip/basic-flip-vs-dpms

CC Michel Dänzer <[email protected]>
---
 drivers/gpu/drm/drm_crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_crtc.c +0 -0
index 0f797ee..d84a0ea 100644

drivers/gpu/drm/drm_crtc.c int drm_mode_page_flip_ioctl(struct drm_device *dev, · line 2053

Quoted 8 lines
drivers/gpu/drm/drm_crtc.c +1 -1
@@ -2047,7 +2047,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
 	}
 
 out:
-	if (ret)
+	if (ret && crtc->funcs->page_flip_target)
 		drm_crtc_vblank_put(crtc);
 	if (fb)
 		drm_framebuffer_unreference(fb);

Nice catch, thanks!

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Applied
#3 lore raw
Quoted 29 lines · Michel Dänzer
Quoted 17 lines · Imre Deak

This fixes the error path for platforms that don't define the new page_flip_target() hook.

Fixes c229bfbbd04 ("drm: Add page_flip_target CRTC hook v2")

Testcase: igt/kms_flip/basic-flip-vs-dpms

CC Michel Dänzer <[email protected]>
---
 drivers/gpu/drm/drm_crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_crtc.c +0 -0
index 0f797ee..d84a0ea 100644

drivers/gpu/drm/drm_crtc.c int drm_mode_page_flip_ioctl(struct drm_device *dev, · line 2053

Quoted 8 lines
drivers/gpu/drm/drm_crtc.c +1 -1
@@ -2047,7 +2047,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
 	}
 
 out:
-	if (ret)
+	if (ret && crtc->funcs->page_flip_target)
 		drm_crtc_vblank_put(crtc);
 	if (fb)
 		drm_framebuffer_unreference(fb);

Nice catch, thanks!

Quoted 1 line

Picked up to drm-misc, thanks for the patch and review.

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx