Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 7b97936f298af7991ca4717a4c23610d9ecd8927

Authored by Ville Syrjälä
Committed by Dave Airlie
1 parent 54afc12141
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

drm: Remove pointless '-' characters from drm_fb_helper documentation 

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

Showing 1 changed file with 8 additions and 8 deletions Inline Diff

include/drm/drm_fb_helper.h
Diff comments   View file @ 7b97936
1 /* 1 /*
2 * Copyright (c) 2006-2009 Red Hat Inc. 2 * Copyright (c) 2006-2009 Red Hat Inc.
3 * Copyright (c) 2006-2008 Intel Corporation 3 * Copyright (c) 2006-2008 Intel Corporation
4 * Copyright (c) 2007 Dave Airlie <airlied@linux.ie> 4 * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
5 * 5 *
6 * DRM framebuffer helper functions 6 * DRM framebuffer helper functions
7 * 7 *
8 * Permission to use, copy, modify, distribute, and sell this software and its 8 * Permission to use, copy, modify, distribute, and sell this software and its
9 * documentation for any purpose is hereby granted without fee, provided that 9 * documentation for any purpose is hereby granted without fee, provided that
10 * the above copyright notice appear in all copies and that both that copyright 10 * the above copyright notice appear in all copies and that both that copyright
11 * notice and this permission notice appear in supporting documentation, and 11 * notice and this permission notice appear in supporting documentation, and
12 * that the name of the copyright holders not be used in advertising or 12 * that the name of the copyright holders not be used in advertising or
13 * publicity pertaining to distribution of the software without specific, 13 * publicity pertaining to distribution of the software without specific,
14 * written prior permission. The copyright holders make no representations 14 * written prior permission. The copyright holders make no representations
15 * about the suitability of this software for any purpose. It is provided "as 15 * about the suitability of this software for any purpose. It is provided "as
16 * is" without express or implied warranty. 16 * is" without express or implied warranty.
17 * 17 *
18 * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 18 * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
19 * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO 19 * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
20 * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR 20 * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
21 * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 21 * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
22 * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 22 * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
23 * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 23 * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
24 * OF THIS SOFTWARE. 24 * OF THIS SOFTWARE.
25 * 25 *
26 * Authors: 26 * Authors:
27 * Dave Airlie <airlied@linux.ie> 27 * Dave Airlie <airlied@linux.ie>
28 * Jesse Barnes <jesse.barnes@intel.com> 28 * Jesse Barnes <jesse.barnes@intel.com>
29 */ 29 */
30 #ifndef DRM_FB_HELPER_H 30 #ifndef DRM_FB_HELPER_H
31 #define DRM_FB_HELPER_H 31 #define DRM_FB_HELPER_H
32 32
33 struct drm_fb_helper; 33 struct drm_fb_helper;
34 34
35 #include <linux/kgdb.h> 35 #include <linux/kgdb.h>
36 36
37 struct drm_fb_helper_crtc { 37 struct drm_fb_helper_crtc {
38 struct drm_mode_set mode_set; 38 struct drm_mode_set mode_set;
39 struct drm_display_mode *desired_mode; 39 struct drm_display_mode *desired_mode;
40 }; 40 };
41 41
42 struct drm_fb_helper_surface_size { 42 struct drm_fb_helper_surface_size {
43 u32 fb_width; 43 u32 fb_width;
44 u32 fb_height; 44 u32 fb_height;
45 u32 surface_width; 45 u32 surface_width;
46 u32 surface_height; 46 u32 surface_height;
47 u32 surface_bpp; 47 u32 surface_bpp;
48 u32 surface_depth; 48 u32 surface_depth;
49 }; 49 };
50 50
51 /** 51 /**
52 * struct drm_fb_helper_funcs - driver callbacks for the fbdev emulation library 52 * struct drm_fb_helper_funcs - driver callbacks for the fbdev emulation library
53 * @gamma_set: - Set the given gamma lut register on the given crtc. 53 * @gamma_set: Set the given gamma lut register on the given crtc.
54 * @gamma_get: - Read the given gamma lut register on the given crtc, used to 54 * @gamma_get: Read the given gamma lut register on the given crtc, used to
55 * save the current lut when force-restoring the fbdev for e.g. 55 * save the current lut when force-restoring the fbdev for e.g.
56 * kdbg. 56 * kdbg.
57 * @fb_probe: - Driver callback to allocate and initialize the fbdev info 57 * @fb_probe: Driver callback to allocate and initialize the fbdev info
58 * structure. Futhermore it also needs to allocate the drm 58 * structure. Futhermore it also needs to allocate the drm
59 * framebuffer used to back the fbdev. 59 * framebuffer used to back the fbdev.
60 * @initial_config: - Setup an initial fbdev display configuration 60 * @initial_config: Setup an initial fbdev display configuration
61 * 61 *
62 * Driver callbacks used by the fbdev emulation helper library. 62 * Driver callbacks used by the fbdev emulation helper library.
63 */ 63 */
64 struct drm_fb_helper_funcs { 64 struct drm_fb_helper_funcs {
65 void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green, 65 void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
66 u16 blue, int regno); 66 u16 blue, int regno);
67 void (*gamma_get)(struct drm_crtc *crtc, u16 *red, u16 *green, 67 void (*gamma_get)(struct drm_crtc *crtc, u16 *red, u16 *green,
68 u16 *blue, int regno); 68 u16 *blue, int regno);
69 69
70 int (*fb_probe)(struct drm_fb_helper *helper, 70 int (*fb_probe)(struct drm_fb_helper *helper,
71 struct drm_fb_helper_surface_size *sizes); 71 struct drm_fb_helper_surface_size *sizes);
72 bool (*initial_config)(struct drm_fb_helper *fb_helper, 72 bool (*initial_config)(struct drm_fb_helper *fb_helper,
73 struct drm_fb_helper_crtc **crtcs, 73 struct drm_fb_helper_crtc **crtcs,
74 struct drm_display_mode **modes, 74 struct drm_display_mode **modes,
75 bool *enabled, int width, int height); 75 bool *enabled, int width, int height);
76 }; 76 };
77 77
78 struct drm_fb_helper_connector { 78 struct drm_fb_helper_connector {
79 struct drm_connector *connector; 79 struct drm_connector *connector;
80 struct drm_cmdline_mode cmdline_mode; 80 struct drm_cmdline_mode cmdline_mode;
81 }; 81 };
82 82
83 struct drm_fb_helper { 83 struct drm_fb_helper {
84 struct drm_framebuffer *fb; 84 struct drm_framebuffer *fb;
85 struct drm_device *dev; 85 struct drm_device *dev;
86 int crtc_count; 86 int crtc_count;
87 struct drm_fb_helper_crtc *crtc_info; 87 struct drm_fb_helper_crtc *crtc_info;
88 int connector_count; 88 int connector_count;
89 struct drm_fb_helper_connector **connector_info; 89 struct drm_fb_helper_connector **connector_info;
90 struct drm_fb_helper_funcs *funcs; 90 struct drm_fb_helper_funcs *funcs;
91 struct fb_info *fbdev; 91 struct fb_info *fbdev;
92 u32 pseudo_palette[17]; 92 u32 pseudo_palette[17];
93 struct list_head kernel_fb_list; 93 struct list_head kernel_fb_list;
94 94
95 /* we got a hotplug but fbdev wasn't running the console 95 /* we got a hotplug but fbdev wasn't running the console
96 delay until next set_par */ 96 delay until next set_par */
97 bool delayed_hotplug; 97 bool delayed_hotplug;
98 }; 98 };
99 99
100 int drm_fb_helper_init(struct drm_device *dev, 100 int drm_fb_helper_init(struct drm_device *dev,
101 struct drm_fb_helper *helper, int crtc_count, 101 struct drm_fb_helper *helper, int crtc_count,
102 int max_conn); 102 int max_conn);
103 void drm_fb_helper_fini(struct drm_fb_helper *helper); 103 void drm_fb_helper_fini(struct drm_fb_helper *helper);
104 int drm_fb_helper_blank(int blank, struct fb_info *info); 104 int drm_fb_helper_blank(int blank, struct fb_info *info);
105 int drm_fb_helper_pan_display(struct fb_var_screeninfo *var, 105 int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
106 struct fb_info *info); 106 struct fb_info *info);
107 int drm_fb_helper_set_par(struct fb_info *info); 107 int drm_fb_helper_set_par(struct fb_info *info);
108 int drm_fb_helper_check_var(struct fb_var_screeninfo *var, 108 int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
109 struct fb_info *info); 109 struct fb_info *info);
110 110
111 bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper); 111 bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper);
112 void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper, 112 void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
113 uint32_t fb_width, uint32_t fb_height); 113 uint32_t fb_width, uint32_t fb_height);
114 void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch, 114 void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
115 uint32_t depth); 115 uint32_t depth);
116 116
117 int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info); 117 int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info);
118 118
119 int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper); 119 int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);
120 bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel); 120 bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel);
121 int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper); 121 int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);
122 int drm_fb_helper_debug_enter(struct fb_info *info); 122 int drm_fb_helper_debug_enter(struct fb_info *info);
123 int drm_fb_helper_debug_leave(struct fb_info *info); 123 int drm_fb_helper_debug_leave(struct fb_info *info);
124 124
125 #endif 125 #endif
126 126