Skip to contentSkip to conversation

drm/i915: Remove dummy i915_kick_out_firmware_fb

PATCH In review Daniel Vetter 4 participants 4 messages Nov 30, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Remove dummy i915_kick_out_firmware_fb

Since

commit 44adece57e2604cec8527a499b48e4d584ab53b8

Author: Daniel Vetter <[email protected]>
Date:   Wed Aug 10 18:52:34 2016 +0200

drm/fb-helper: Add a dummy remove_conflicting_framebuffers

the drm helpers take care of this for us.

---
 drivers/gpu/drm/i915/i915_drv.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -7
index 8dac298461c0..dc80c8ff54e3 100644
@@ -643,7 +643,6 @@ static int i915_load_modeset_init(struct drm_device *dev)
 	return ret;
 }
 
-#if IS_ENABLED(CONFIG_FB)
 static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
 {
 	struct apertures_struct *ap;
@@ -668,12 +667,6 @@ static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
 
 	return ret;
 }
-#else
-static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
-{
-	return 0;
-}
-#endif
 
 #if !defined(CONFIG_VGA_CONSOLE)
 static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
Signature · 6 lines
2.10.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Daniel Vetter

Since

commit 44adece57e2604cec8527a499b48e4d584ab53b8

Author: Daniel Vetter <[email protected]>
Date:   Wed Aug 10 18:52:34 2016 +0200
Quoted 6 lines

drm/fb-helper: Add a dummy remove_conflicting_framebuffers

the drm helpers take care of this for us.

Still compiles without CONFIG_FB, so

-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 9 lines · Chris Wilson
Quoted 8 lines · Daniel Vetter

Since

commit 44adece57e2604cec8527a499b48e4d584ab53b8

Author: Daniel Vetter <[email protected]>
Date:   Wed Aug 10 18:52:34 2016 +0200

drm/fb-helper: Add a dummy remove_conflicting_framebuffers

Quoted 7 lines
Quoted 4 lines

the drm helpers take care of this for us.

Still compiles without CONFIG_FB, so

Thanks for double-checking, applied to dinq.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

✗ Fi.CI.BAT: warning for drm/i915: Remove dummy i915_kick_out_firmware_fb

In reply to Daniel Vetter
== Series Details ==

== Series Details ==

Series: drm/i915: Remove dummy i915_kick_out_firmware_fb
URL : https://patchwork.freedesktop.org/series/16158/
State : warning

== Summary ==

Series 16158v1 drm/i915: Remove dummy i915_kick_out_firmware_fb
https://patchwork.freedesktop.org/api/1.0/series/16158/revisions/1/mbox/

Test kms_busy:

        Subgroup basic-flip-default-a:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup basic-flip-default-b:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup basic-flip-default-c:
                skip       -> PASS       (fi-ivb-3770)
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup basic-busy-flip-before-cursor-varying-size:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup basic-flip-after-cursor-legacy:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup basic-flip-after-cursor-varying-size:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup basic-flip-before-cursor-legacy:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup basic-flip-before-cursor-varying-size:
                skip       -> PASS       (fi-ivb-3770)
Test kms_force_connector_basic:
        Subgroup force-connector-state:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup force-edid:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup force-load-detect:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup prune-stale-modes:
                skip       -> PASS       (fi-ivb-3770)
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup nonblocking-crc-pipe-a:
                pass       -> DMESG-WARN (fi-ilk-650)
        Subgroup suspend-read-crc-pipe-a:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup suspend-read-crc-pipe-b:
                skip       -> PASS       (fi-ivb-3770)
        Subgroup suspend-read-crc-pipe-c:
                skip       -> PASS       (fi-ivb-3770)
Test prime_vgem:
        Subgroup basic-fence-flip:
                skip       -> PASS       (fi-ivb-3770)
fi-bdw-5557u     total:245  pass:230  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:245  pass:205  dwarn:0   dfail:0   fail:0   skip:40 
fi-byt-j1900     total:245  pass:217  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-n2820     total:245  pass:213  dwarn:0   dfail:0   fail:0   skip:32 
fi-hsw-4770      total:245  pass:225  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:245  pass:225  dwarn:0   dfail:0   fail:0   skip:20 
fi-ilk-650       total:245  pass:191  dwarn:1   dfail:0   fail:0   skip:53 
fi-ivb-3520m     total:245  pass:223  dwarn:0   dfail:0   fail:0   skip:22 
fi-ivb-3770      total:245  pass:223  dwarn:0   dfail:0   fail:0   skip:22 
fi-kbl-7500u     total:245  pass:223  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6260u     total:245  pass:231  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:245  pass:224  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6700k     total:245  pass:223  dwarn:1   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:245  pass:231  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:245  pass:213  dwarn:0   dfail:0   fail:0   skip:32 
fi-snb-2600      total:245  pass:212  dwarn:0   dfail:0   fail:0   skip:33 

51c6c255aa05775bcfb3f5790a3b9249e5990f3e drm-tip: 2016y-11m-30d-16h-12m-19s UTC integration manifest 0178177 drm/i915: Remove dummy i915_kick_out_firmware_fb

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3150/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx