* [PATCH] drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
@ 2016-10-04 7:53 Jani Nikula
2016-10-04 8:00 ` Chris Wilson
2016-10-04 8:19 ` ✓ Fi.CI.BAT: success for " Patchwork
0 siblings, 2 replies; 4+ messages in thread
From: Jani Nikula @ 2016-10-04 7:53 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Move the outcast intel_fbdev_output_poll_changed() stub for
CONFIG_DRM_FBDEV_EMULATION=n next to its friends.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 6 ------
drivers/gpu/drm/i915/intel_drv.h | 4 ++++
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0b1ca67fd14c..a366656bcec5 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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,
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 0d5ddb7cb94f..f48e79ae2ac6 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -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)
{
}
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
2016-10-04 7:53 [PATCH] drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together Jani Nikula
@ 2016-10-04 8:00 ` Chris Wilson
2016-10-04 9:20 ` Jani Nikula
2016-10-04 8:19 ` ✓ Fi.CI.BAT: success for " Patchwork
1 sibling, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2016-10-04 8:00 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, Oct 04, 2016 at 10:53:48AM +0300, Jani Nikula wrote:
> Move the outcast intel_fbdev_output_poll_changed() stub for
> CONFIG_DRM_FBDEV_EMULATION=n next to its friends.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
2016-10-04 8:00 ` Chris Wilson
@ 2016-10-04 9:20 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2016-10-04 9:20 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Tue, 04 Oct 2016, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Tue, Oct 04, 2016 at 10:53:48AM +0300, Jani Nikula wrote:
>> Move the outcast intel_fbdev_output_poll_changed() stub for
>> CONFIG_DRM_FBDEV_EMULATION=n next to its friends.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Thanks, pushed to dinq.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together
2016-10-04 7:53 [PATCH] drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together Jani Nikula
2016-10-04 8:00 ` Chris Wilson
@ 2016-10-04 8:19 ` Patchwork
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2016-10-04 8:19 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-04 9:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-04 7:53 [PATCH] drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together Jani Nikula
2016-10-04 8:00 ` Chris Wilson
2016-10-04 9:20 ` Jani Nikula
2016-10-04 8:19 ` ✓ Fi.CI.BAT: success for " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox