* [PATCH 1/1] emgd: add fb_info
@ 2011-02-28 21:34 Tom Zanussi
0 siblings, 0 replies; only message in thread
From: Tom Zanussi @ 2011-02-28 21:34 UTC (permalink / raw)
To: poky
From: Tom Zanussi <tom.zanussi@intel.com>
Add fb_info along with a new way to store and access it.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c b/drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c
index 5dc331e..4d668c8 100644
--- a/drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c
+++ b/drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c
@@ -38,10 +38,13 @@
*/
typedef struct _emgd_framebuffer {
struct drm_framebuffer base;
+ struct fb_info *info;
unsigned long size;
unsigned long offset;
} emgd_framebuffer_t;
+#define to_emgd_framebuffer(x) container_of(x, struct _emgd_framebuffer, base)
+
typedef struct _emgdfb_par {
struct drm_device *dev;
emgd_framebuffer_t *emgd_fb;
@@ -298,7 +301,8 @@ EXPORT_SYMBOL(emgd_fb_probe);
*/
int emgd_fb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
{
- struct fb_info *info = NULL;
+ emgd_framebuffer_t *emgd_fb = to_emgd_framebuffer(fb);
+ struct fb_info *info= emgd_fb->info;
if (info) {
unregister_framebuffer(info);
@@ -444,6 +448,7 @@ static struct drm_framebuffer *emgd_fb_create(struct drm_device *dev,
register_framebuffer(info);
+ emgd_fb->info = info;
par->emgd_fb = emgd_fb;
par->dev = dev;
@@ -459,10 +464,15 @@ static struct drm_framebuffer *emgd_fb_create(struct drm_device *dev,
*/
static void emgd_fb_destroy (struct drm_framebuffer *fb)
{
+ emgd_framebuffer_t *emgd_fb = to_emgd_framebuffer(fb);
struct drm_device *dev = fb->dev;
/* TODO: Unmap any pages mapped to the GTT */
+ if (emgd_fb->info) {
+ emgd_fb_remove(dev, fb);
+ }
+
drm_framebuffer_cleanup(fb);
kfree(fb);
--
1.7.0.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-28 21:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-28 21:34 [PATCH 1/1] emgd: add fb_info Tom Zanussi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.