linux.git/drivers/gpu/drm, branch v3.7-rc2 Linux kernel source tree nouveau: fix warning on 32-bit build. 2012-10-16T06:40:53+00:00 Dave Airlie airlied@redhat.com 2012-10-16T06:40:53+00:00 8a00b6af4cc547725f231c8367ddc7cb56b2cf76 Signed-off-by: Dave Airlie <airlied@redhat.com> 
Signed-off-by: Dave Airlie <airlied@redhat.com>
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes 2012-10-16T06:34:11+00:00 Dave Airlie airlied@redhat.com 2012-10-16T06:33:48+00:00 30f02cb7dd2e6a677c1d5ccd614024f2ebec8f1b minor set of nouveau fixes. * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/bios: fix typo in error message drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP drm/nv50/fb: fix double free of vram mm drm/nouveau/pm: do not stop reclocking if failing to set the fan speed drm/nouveau/pm: fix a typo related to the move to the therm subdev drm/nouveau/hwmon: fix the initialization condition 
minor set of nouveau fixes.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/bios: fix typo in error message
  drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP
  drm/nv50/fb: fix double free of vram mm
  drm/nouveau/pm: do not stop reclocking if failing to set the fan speed
  drm/nouveau/pm: fix a typo related to the move to the therm subdev
  drm/nouveau/hwmon: fix the initialization condition
drm/nouveau/bios: fix typo in error message 2012-10-16T06:29:17+00:00 Ben Skeggs bskeggs@redhat.com 2012-10-16T06:25:08+00:00 565f571c48f01a681243a356e9083f5cf24b432e Signed-off-by: Ben Skeggs <bskeggs@redhat.com> 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP 2012-10-16T06:29:12+00:00 Max Filippov jcmvbkbc@gmail.com 2012-10-13T21:58:26+00:00 df1b4b91e5dae04782f65f657d771b23ca3bdc99 ttm_agp_tt_create is itself defined under CONFIG_AGP, so there's no point calling it otherwise. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> 
ttm_agp_tt_create is itself defined under CONFIG_AGP, so there's no
point calling it otherwise.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drm/nv50/fb: fix double free of vram mm 2012-10-16T06:29:08+00:00 Marcin Slusarz marcin.slusarz@gmail.com 2012-10-11T21:53:48+00:00 5db4c6c5dd26f7737c1fa45ea73549b8aef6e395 nouveau_fb_destroy already calls nouveau_mm_fini on vram mm. Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> 
nouveau_fb_destroy already calls nouveau_mm_fini on vram mm.

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drm/nouveau/pm: do not stop reclocking if failing to set the fan speed 2012-10-16T06:29:02+00:00 Martin Peres martin.peres@labri.fr 2012-10-03T23:00:13+00:00 eed6187d9f19535ac9339b684537f8535bf563b7 With the introduction of fan management modes, fan may not be drivable. We should allow reclocking nonetheless. This return was stupid to begin with since it may have left the card in an intermediate state (clocks corresponding to a perflvl and voltage corresponding to another one). The reclocking code will need to be rewritten in a near-future in order to provide a better error handling. Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Martin Peres <martin.peres@labri.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> 
With the introduction of fan management modes, fan may not be drivable.
We should allow reclocking nonetheless.

This return was stupid to begin with since it may have left the card
in an intermediate state (clocks corresponding to a perflvl and voltage
corresponding to another one). The reclocking code will need to be
rewritten in a near-future in order to provide a better error handling.

Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drm/nouveau/pm: fix a typo related to the move to the therm subdev 2012-10-16T06:28:58+00:00 Martin Peres martin.peres@labri.fr 2012-10-03T22:44:19+00:00 a6fd5cf3c986dab3950185a53ef02a399bf2cf2b Reported-by: Vekin on IRC Reported-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Martin Peres <martin.peres@labri.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> 
Reported-by: Vekin on IRC
Reported-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drm/nouveau/hwmon: fix the initialization condition 2012-10-16T06:28:55+00:00 Martin Peres martin.peres@labri.fr 2012-10-03T22:28:21+00:00 a5f5af8698a5cb3a68608a40a8782bdf8263cb97 Signed-off-by: Martin Peres <martin.peres@labri.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> 
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drm: fix warning on 32-bit. 2012-10-16T00:28:21+00:00 Dave Airlie airlied@redhat.com 2012-10-16T00:28:21+00:00 7b8505300525d7e802ecf52ae160bc63f4ba28d7 This cast was causing a warning on 32-bit builds. Signed-off-by: Dave Airlie <airlied@redhat.com> 
This cast was causing a warning on 32-bit builds.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drm: radeon: fix printk format warning 2012-10-16T00:15:45+00:00 Randy Dunlap rdunlap@xenotime.net 2012-10-16T00:15:45+00:00 bd6126bd0766cb0e03a4d832cc3611dff5ea8e50 drivers/gpu/drm/radeon/radeon_atpx_handler.c:151:3: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'size_t' [airlied: Alex had others fixed already, except for atpx one] Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dave Airlie <airlied@redhat.com> 
drivers/gpu/drm/radeon/radeon_atpx_handler.c:151:3: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'size_t'

[airlied: Alex had others fixed already, except for atpx one]

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>