* [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled
@ 2013-12-16 15:53 Daniel Vetter
2013-12-17 6:20 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2013-12-16 15:53 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Otherwise we don't kick out firmware framebuffers like vesafb and
efifb when CONFIG_DRM_I915_FBDEV=n but CONFIG_FB=y.
There's still the pesky issue with vgacon which we should somehow
replace with the dummy console at least. We have a similar issue at
module un/reload, since vgacon state is terminally botched after
i915.ko has loaded in modeset mode. But this gets us a step further at
least.
Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index c9101bde96be..920b1c95fc18 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1413,7 +1413,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
master->driver_priv = NULL;
}
-#ifdef CONFIG_DRM_I915_FBDEV
+#if defined(CONFIG_FB)
static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
{
struct apertures_struct *ap;
--
1.8.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled
2013-12-16 15:53 [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled Daniel Vetter
@ 2013-12-17 6:20 ` Jani Nikula
2013-12-17 9:00 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Jani Nikula @ 2013-12-17 6:20 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Mon, 16 Dec 2013, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Otherwise we don't kick out firmware framebuffers like vesafb and
> efifb when CONFIG_DRM_I915_FBDEV=n but CONFIG_FB=y.
>
> There's still the pesky issue with vgacon which we should somehow
> replace with the dummy console at least. We have a similar issue at
> module un/reload, since vgacon state is terminally botched after
> i915.ko has loaded in modeset mode. But this gets us a step further at
> least.
>
> Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index c9101bde96be..920b1c95fc18 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1413,7 +1413,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
> master->driver_priv = NULL;
> }
>
> -#ifdef CONFIG_DRM_I915_FBDEV
> +#if defined(CONFIG_FB)
#if IS_ENABLED(CONFIG_FB)
if you want this to work for CONFIG_FB=m too.
BR,
Jani.
> static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
> {
> struct apertures_struct *ap;
> --
> 1.8.4.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled
2013-12-17 6:20 ` Jani Nikula
@ 2013-12-17 9:00 ` Daniel Vetter
2013-12-17 9:23 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2013-12-17 9:00 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Otherwise we don't kick out firmware framebuffers like vesafb and
efifb when CONFIG_DRM_I915_FBDEV=n but CONFIG_FB=y.
There's still the pesky issue with vgacon which we should somehow
replace with the dummy console at least. We have a similar issue at
module un/reload, since vgacon state is terminally botched after
i915.ko has loaded in modeset mode. But this gets us a step further at
least.
v2: Use IS_ENABLED - I always get this wrong for tristates. Spotted by
Jani.
Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index c9101bde96be..6b5f63043cde 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1413,7 +1413,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
master->driver_priv = NULL;
}
-#ifdef CONFIG_DRM_I915_FBDEV
+#if IS_ENABLED(CONFIG_FB)
static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
{
struct apertures_struct *ap;
--
1.8.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled
2013-12-17 9:00 ` Daniel Vetter
@ 2013-12-17 9:23 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2013-12-17 9:23 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
On Tue, 17 Dec 2013, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Otherwise we don't kick out firmware framebuffers like vesafb and
> efifb when CONFIG_DRM_I915_FBDEV=n but CONFIG_FB=y.
>
> There's still the pesky issue with vgacon which we should somehow
> replace with the dummy console at least. We have a similar issue at
> module un/reload, since vgacon state is terminally botched after
> i915.ko has loaded in modeset mode. But this gets us a step further at
> least.
>
> v2: Use IS_ENABLED - I always get this wrong for tristates. Spotted by
> Jani.
>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index c9101bde96be..6b5f63043cde 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1413,7 +1413,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
> master->driver_priv = NULL;
> }
>
> -#ifdef CONFIG_DRM_I915_FBDEV
> +#if IS_ENABLED(CONFIG_FB)
> static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
> {
> struct apertures_struct *ap;
> --
> 1.8.4.3
>
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-17 9:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-16 15:53 [PATCH] drm/i915: kick firmware fbs even when i915 fbdev is disabled Daniel Vetter
2013-12-17 6:20 ` Jani Nikula
2013-12-17 9:00 ` Daniel Vetter
2013-12-17 9:23 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox