git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nouveau: change the backlight parent device to the connector, not the PCI dev
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_state.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c
index
0529491
..
4fcbd09
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_state.c
@@
-704,10
+704,6
@@
nouveau_card_init(struct drm_device *dev)
goto out_fence;
}
goto out_fence;
}
- ret = nouveau_backlight_init(dev);
- if (ret)
- NV_ERROR(dev, "Error %d registering backlight\n", ret);
-
nouveau_fbcon_init(dev);
drm_kms_helper_poll_init(dev);
return 0;
nouveau_fbcon_init(dev);
drm_kms_helper_poll_init(dev);
return 0;
@@
-759,8
+755,6
@@
static void nouveau_card_takedown(struct drm_device *dev)
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_engine *engine = &dev_priv->engine;
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_engine *engine = &dev_priv->engine;
- nouveau_backlight_exit(dev);
-
if (!engine->graph.accel_blocked) {
nouveau_fence_fini(dev);
nouveau_channel_put_unlocked(&dev_priv->channel);
if (!engine->graph.accel_blocked) {
nouveau_fence_fini(dev);
nouveau_channel_put_unlocked(&dev_priv->channel);