diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-03-04 21:32:06 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-06-30 23:44:01 -0400 |
commit | 54ecff3e1ad22fd44443acde7f27f213758fdddc (patch) | |
tree | fbaaefcc090470219b05820b9f71ac33971e257a /drivers/gpu/drm/nouveau | |
parent | 88524bc06926b243c75e5751eb3403c602b6a904 (diff) |
drm/nouveau/clk: change init ordering, no longer needed by devinit
And, will depend on FB/VOLT/DAEMON being ready when it gets initialised
so that it can set/restore clocks.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/include/core/device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/core/device.h b/drivers/gpu/drm/nouveau/core/include/core/device.h index cb6b4cc6fedd..99b6600fe80a 100644 --- a/drivers/gpu/drm/nouveau/core/include/core/device.h +++ b/drivers/gpu/drm/nouveau/core/include/core/device.h | |||
@@ -17,8 +17,7 @@ enum nv_subdev_type { | |||
17 | NVDEV_SUBDEV_DEVINIT, | 17 | NVDEV_SUBDEV_DEVINIT, |
18 | NVDEV_SUBDEV_GPIO, | 18 | NVDEV_SUBDEV_GPIO, |
19 | NVDEV_SUBDEV_I2C, | 19 | NVDEV_SUBDEV_I2C, |
20 | NVDEV_SUBDEV_CLOCK, | 20 | NVDEV_SUBDEV_DEVINIT_LAST = NVDEV_SUBDEV_I2C, |
21 | NVDEV_SUBDEV_DEVINIT_LAST = NVDEV_SUBDEV_CLOCK, | ||
22 | 21 | ||
23 | /* This grouping of subdevs are initialised right after they've | 22 | /* This grouping of subdevs are initialised right after they've |
24 | * been created, and are allowed to assume any subdevs in the | 23 | * been created, and are allowed to assume any subdevs in the |
@@ -35,6 +34,7 @@ enum nv_subdev_type { | |||
35 | NVDEV_SUBDEV_VM, | 34 | NVDEV_SUBDEV_VM, |
36 | NVDEV_SUBDEV_BAR, | 35 | NVDEV_SUBDEV_BAR, |
37 | NVDEV_SUBDEV_VOLT, | 36 | NVDEV_SUBDEV_VOLT, |
37 | NVDEV_SUBDEV_CLOCK, | ||
38 | NVDEV_SUBDEV_THERM, | 38 | NVDEV_SUBDEV_THERM, |
39 | 39 | ||
40 | NVDEV_ENGINE_DMAOBJ, | 40 | NVDEV_ENGINE_DMAOBJ, |