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
74ce291a
Commit
74ce291a
authored
Sep 17, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/therm: kill some over-zealous debugging
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
15689c3c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
14 deletions
+1
-14
drivers/gpu/drm/nouveau/core/subdev/therm/base.c
drivers/gpu/drm/nouveau/core/subdev/therm/base.c
+0
-3
drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
+0
-2
drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
+1
-9
No files found.
drivers/gpu/drm/nouveau/core/subdev/therm/base.c
View file @
74ce291a
...
...
@@ -95,7 +95,6 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode)
int
duty
;
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
nv_debug
(
therm
,
"FAN speed check
\n
"
);
if
(
mode
<
0
)
mode
=
priv
->
mode
;
priv
->
mode
=
mode
;
...
...
@@ -125,8 +124,6 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode)
done:
if
(
list_empty
(
&
priv
->
alarm
.
head
)
&&
(
mode
==
NOUVEAU_THERM_CTRL_AUTO
))
ptimer
->
alarm
(
ptimer
,
1000000000ULL
,
&
priv
->
alarm
);
else
if
(
!
list_empty
(
&
priv
->
alarm
.
head
))
nv_debug
(
therm
,
"therm fan alarm list is not empty
\n
"
);
spin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
}
...
...
drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
View file @
74ce291a
...
...
@@ -180,8 +180,6 @@ alarm_timer_callback(struct nouveau_alarm *alarm)
spin_lock_irqsave
(
&
priv
->
sensor
.
alarm_program_lock
,
flags
);
nv_debug
(
therm
,
"polling the internal temperature
\n
"
);
nouveau_therm_threshold_hyst_polling
(
therm
,
&
sensor
->
thrs_fan_boost
,
NOUVEAU_THERM_THRS_FANBOOST
);
...
...
drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
View file @
74ce291a
...
...
@@ -119,16 +119,8 @@ nv04_timer_alarm_cancel(struct nouveau_timer *ptimer,
{
struct
nv04_timer_priv
*
priv
=
(
void
*
)
ptimer
;
unsigned
long
flags
;
/* avoid deleting an entry while the alarm intr is running */
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
/* delete the alarm from the list */
list_del
(
&
alarm
->
head
);
/* reset the head so as list_empty returns 1 */
INIT_LIST_HEAD
(
&
alarm
->
head
);
list_del_init
(
&
alarm
->
head
);
spin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
}
...
...
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