drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
Subsystems (2)
PATCH 1/1 drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
Move the outcast intel_fbdev_output_poll_changed() stub for CONFIG_DRM_FBDEV_EMULATION=n next to its friends.
--- drivers/gpu/drm/i915/intel_display.c | 6 ------ drivers/gpu/drm/i915/intel_drv.h | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -6
@@ -15837,12 +15837,6 @@ intel_user_framebuffer_create(struct drm_device *dev,return fb; } -#ifndef CONFIG_DRM_FBDEV_EMULATION -static inline void intel_fbdev_output_poll_changed (struct drm_device *dev) -{ -} -#endif -static const struct drm_mode_config_funcs intel_mode_funcs = { .fb_create = intel_user_framebuffer_create, .output_poll_changed = intel_fbdev_output_poll_changed,
drivers/gpu/drm/i915/intel_drv.h +4 -0
@@ -1488,6 +1488,10 @@ static inline void intel_fbdev_set_suspend(struct drm_device *dev, int state, bo { } +static inline void intel_fbdev_output_poll_changed (struct drm_device *dev) +{ +} +static inline void intel_fbdev_restore_mode (struct drm_device *dev) { }
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Jani Nikula
Move the outcast
intel_fbdev_output_poll_changed()stub forCONFIG_DRM_FBDEV_EMULATION=nnext to its friends.Signed-off-by Jani Nikula <[email protected]>
-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
Quoted 6 lines · Chris Wilson
Quoted 4 lines · Jani Nikula
Move the outcast
intel_fbdev_output_poll_changed()stub forCONFIG_DRM_FBDEV_EMULATION=nnext to its friends.Signed-off-by Jani Nikula <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Thanks, pushed to dinq.
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
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
URL : https://patchwork.freedesktop.org/series/13262/
State : success
== Summary ==
Series 13262v1 drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
https://patchwork.freedesktop.org/api/1.0/series/13262/revisions/1/mbox/
Test gem_busy:
Subgroup basic-hang-default:
fail -> PASS (fi-hsw-4770r)
Test kms_psr_sink_crc:
Subgroup psr_basic:
dmesg-warn -> PASS (fi-skl-6700hq)fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42 fi-bxt-t5700 total:244 pass:214 dwarn:0 dfail:0 fail:0 skip:30 fi-byt-n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35 fi-hsw-4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-hsw-4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ilk-650 total:244 pass:182 dwarn:0 dfail:0 fail:2 skip:60 fi-ivb-3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25 fi-ivb-3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:24 fi-skl-6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:14 fi-snb-2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:36 fi-snb-2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
Results at /archive/results/CI_IGT_test/Patchwork_2617/
981382a8204271db3e29da9929625e26f251fadf drm-intel-nightly: 2016y-10m-04d-06h-31m-31s UTC integration manifest e41ad3d drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx