← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/nouveau/nouveau_backlight.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/nouveau/nouveau_backlight.c
88
88
        .update_status = nv50_set_intensity,
89
89
};
90
90
 
91
 
static int nouveau_nv40_backlight_init(struct drm_device *dev)
 
91
static int nouveau_nv40_backlight_init(struct drm_connector *connector)
92
92
{
 
93
        struct drm_device *dev = connector->dev;
 
94
        struct drm_nouveau_private *dev_priv = dev->dev_private;
93
95
        struct backlight_properties props;
94
 
        struct drm_nouveau_private *dev_priv = dev->dev_private;
95
96
        struct backlight_device *bd;
96
97
 
97
98
        if (!(nv_rd32(dev, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK))
98
99
                return 0;
99
100
 
100
101
        memset(&props, 0, sizeof(struct backlight_properties));
 
102
        props.type = BACKLIGHT_RAW;
101
103
        props.max_brightness = 31;
102
 
        bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,
 
104
        bd = backlight_device_register("nv_backlight", &connector->kdev, dev,
103
105
                                       &nv40_bl_ops, &props);
104
106
        if (IS_ERR(bd))
105
107
                return PTR_ERR(bd);
111
113
        return 0;
112
114
}
113
115
 
114
 
static int nouveau_nv50_backlight_init(struct drm_device *dev)
 
116
static int nouveau_nv50_backlight_init(struct drm_connector *connector)
115
117
{
 
118
        struct drm_device *dev = connector->dev;
 
119
        struct drm_nouveau_private *dev_priv = dev->dev_private;
116
120
        struct backlight_properties props;
117
 
        struct drm_nouveau_private *dev_priv = dev->dev_private;
118
121
        struct backlight_device *bd;
119
122
 
120
123
        if (!nv_rd32(dev, NV50_PDISPLAY_SOR_BACKLIGHT))
121
124
                return 0;
122
125
 
123
126
        memset(&props, 0, sizeof(struct backlight_properties));
 
127
        props.type = BACKLIGHT_RAW;
124
128
        props.max_brightness = 1025;
125
 
        bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,
 
129
        bd = backlight_device_register("nv_backlight", &connector->kdev, dev,
126
130
                                       &nv50_bl_ops, &props);
127
131
        if (IS_ERR(bd))
128
132
                return PTR_ERR(bd);
133
137
        return 0;
134
138
}
135
139
 
136
 
int nouveau_backlight_init(struct drm_device *dev)
 
140
int nouveau_backlight_init(struct drm_connector *connector)
137
141
{
 
142
        struct drm_device *dev = connector->dev;
138
143
        struct drm_nouveau_private *dev_priv = dev->dev_private;
139
144
 
140
145
#ifdef CONFIG_ACPI
147
152
 
148
153
        switch (dev_priv->card_type) {
149
154
        case NV_40:
150
 
                return nouveau_nv40_backlight_init(dev);
 
155
                return nouveau_nv40_backlight_init(connector);
151
156
        case NV_50:
152
 
                return nouveau_nv50_backlight_init(dev);
 
157
                return nouveau_nv50_backlight_init(connector);
153
158
        default:
154
159
                break;
155
160
        }
157
162
        return 0;
158
163
}
159
164
 
160
 
void nouveau_backlight_exit(struct drm_device *dev)
 
165
void nouveau_backlight_exit(struct drm_connector *connector)
161
166
{
 
167
        struct drm_device *dev = connector->dev;
162
168
        struct drm_nouveau_private *dev_priv = dev->dev_private;
163
169
 
164
170
        if (dev_priv->backlight) {