Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
e8c3cc08
Commit
e8c3cc08
authored
Dec 07, 2012
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/bios: rename DCB_GPIO_PWM_FAN to DCB_GPIO_FAN
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
112a12aa
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h
drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h
+1
-1
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
+1
-1
drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c
drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c
+2
-2
No files found.
drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h
View file @
e8c3cc08
...
@@ -5,7 +5,7 @@ enum dcb_gpio_func_name {
...
@@ -5,7 +5,7 @@ enum dcb_gpio_func_name {
DCB_GPIO_PANEL_POWER
=
0x01
,
DCB_GPIO_PANEL_POWER
=
0x01
,
DCB_GPIO_TVDAC0
=
0x0c
,
DCB_GPIO_TVDAC0
=
0x0c
,
DCB_GPIO_TVDAC1
=
0x2d
,
DCB_GPIO_TVDAC1
=
0x2d
,
DCB_GPIO_
PWM_
FAN
=
0x09
,
DCB_GPIO_FAN
=
0x09
,
DCB_GPIO_FAN_SENSE
=
0x3d
,
DCB_GPIO_FAN_SENSE
=
0x3d
,
DCB_GPIO_UNUSED
=
0xff
DCB_GPIO_UNUSED
=
0xff
};
};
...
...
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
View file @
e8c3cc08
...
@@ -213,7 +213,7 @@ nouveau_therm_fan_ctor(struct nouveau_therm *therm)
...
@@ -213,7 +213,7 @@ nouveau_therm_fan_ctor(struct nouveau_therm *therm)
int
ret
;
int
ret
;
/* attempt to locate a drivable fan, and determine control method */
/* attempt to locate a drivable fan, and determine control method */
ret
=
gpio
->
find
(
gpio
,
0
,
DCB_GPIO_
PWM_
FAN
,
0xff
,
&
func
);
ret
=
gpio
->
find
(
gpio
,
0
,
DCB_GPIO_FAN
,
0xff
,
&
func
);
if
(
ret
==
0
)
if
(
ret
==
0
)
ret
=
nouveau_fanpwm_create
(
therm
,
&
func
);
ret
=
nouveau_fanpwm_create
(
therm
,
&
func
);
if
(
ret
!=
0
)
if
(
ret
!=
0
)
...
...
drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c
View file @
e8c3cc08
...
@@ -53,8 +53,8 @@ nouveau_fantog_update(struct nouveau_fantog_priv *priv, int percent)
...
@@ -53,8 +53,8 @@ nouveau_fantog_update(struct nouveau_fantog_priv *priv, int percent)
percent
=
priv
->
percent
;
percent
=
priv
->
percent
;
priv
->
percent
=
percent
;
priv
->
percent
=
percent
;
duty
=
!
gpio
->
get
(
gpio
,
0
,
DCB_GPIO_
PWM_
FAN
,
0xff
);
duty
=
!
gpio
->
get
(
gpio
,
0
,
DCB_GPIO_FAN
,
0xff
);
gpio
->
set
(
gpio
,
0
,
DCB_GPIO_
PWM_
FAN
,
0xff
,
duty
);
gpio
->
set
(
gpio
,
0
,
DCB_GPIO_FAN
,
0xff
,
duty
);
if
(
list_empty
(
&
priv
->
alarm
.
head
)
&&
percent
!=
(
duty
*
100
))
{
if
(
list_empty
(
&
priv
->
alarm
.
head
)
&&
percent
!=
(
duty
*
100
))
{
u64
next_change
=
(
percent
*
priv
->
period_us
)
/
100
;
u64
next_change
=
(
percent
*
priv
->
period_us
)
/
100
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment