diff options
author | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
commit | 7903aad4738b38f48fb8800782b186be8dfaa024 (patch) | |
tree | a8b20157c57c9dc35f049725d38fb2ca645c816a /drivers/mfd/glamo/glamo-display.h | |
parent | d1bb1b43b8db0926715d4bb1bbd9abcb88a4c5ee (diff) | |
parent | 5b85050a8f1e7db530f803627ba6371ca9c0ba9b (diff) |
Merge branch 'drm-kms' into drm-tracking
Conflicts:
drivers/mfd/glamo/glamo-cmdq.c
drivers/mfd/glamo/glamo-cmdq.h
drivers/mfd/glamo/glamo-drm-drv.c
drivers/mfd/glamo/glamo-drm-private.h
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/mfd/glamo/glamo-display.h')
-rw-r--r-- | drivers/mfd/glamo/glamo-display.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h new file mode 100644 index 00000000000..d6f21bcb0c0 --- /dev/null +++ b/drivers/mfd/glamo/glamo-display.h @@ -0,0 +1,39 @@ +/* Smedia Glamo 336x/337x Display + * + * Copyright (c) 2008-2009 Thomas White <taw@bitwiz.org.uk> + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __GLAMO_DISPLAY_H +#define __GLAMO_DISPLAY_H + +#include <drm/drmP.h> +#include "glamo-drm-private.h" + +extern int glamo_display_init(struct drm_device *dev); + +extern int glamo_framebuffer_create(struct drm_device *dev, + struct drm_mode_fb_cmd *mode_cmd, + struct drm_framebuffer **fb, + struct drm_gem_object *obj); + +extern void glamo_display_suspend(struct glamodrm_handle *gdrm); +extern void glamo_display_resume(struct glamodrm_handle *gdrm); + +#endif /* __GLAMO_DISPLAY_H */ |