Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-10-31 12:02:47 +0100
committerTakashi Iwai <tiwai@suse.de>2018-10-31 12:02:47 +0100
commitaa0c431de2f83d07d58171884936329a2be3cbc3 (patch)
tree3b0907886b68070775dbde7455e1603c55909c77
parent9f4f0cc409d0ae5727064214b69ee3b3a72b5128 (diff)
- drm/nouveau: Don't disable polling in fallback mode
(bsc#1103356). - Delete patches.suse/Revert-drm-nouveau-drm-therm-fan-add-a-fallback-if-n.
-rw-r--r--patches.drivers/drm-nouveau-Don-t-disable-polling-in-fallback-mode.patch43
-rw-r--r--patches.suse/Revert-drm-nouveau-drm-therm-fan-add-a-fallback-if-n66
-rw-r--r--series.conf3
3 files changed, 45 insertions, 67 deletions
diff --git a/patches.drivers/drm-nouveau-Don-t-disable-polling-in-fallback-mode.patch b/patches.drivers/drm-nouveau-Don-t-disable-polling-in-fallback-mode.patch
new file mode 100644
index 0000000000..94aa215f9b
--- /dev/null
+++ b/patches.drivers/drm-nouveau-Don-t-disable-polling-in-fallback-mode.patch
@@ -0,0 +1,43 @@
+From 3639c381cdf5fa4340cbc2c7f34e2b526a6f6a6b Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 31 Aug 2018 12:03:28 +0200
+Subject: [PATCH] drm/nouveau: Don't disable polling in fallback mode
+Patch-mainline: Submitted, dri-devel ML
+References: bsc#1103356
+
+When a fan is controlled via linear fallback without cstate, we
+shouldn't stop polling. Otherwise it won't be adjusted again and
+keeps running at an initial crazy pace.
+
+Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1103356
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107447
+Reported-by: Thomas Blume <thomas.blume@suse.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+index 3695cde669f8..07914e36939e 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+@@ -132,11 +132,12 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
+ duty = nvkm_therm_update_linear(therm);
+ break;
+ case NVBIOS_THERM_FAN_OTHER:
+- if (therm->cstate)
++ if (therm->cstate) {
+ duty = therm->cstate;
+- else
++ poll = false;
++ } else {
+ duty = nvkm_therm_update_linear_fallback(therm);
+- poll = false;
++ }
+ break;
+ }
+ immd = false;
+--
+2.18.0
+
diff --git a/patches.suse/Revert-drm-nouveau-drm-therm-fan-add-a-fallback-if-n b/patches.suse/Revert-drm-nouveau-drm-therm-fan-add-a-fallback-if-n
deleted file mode 100644
index 3253b65a10..0000000000
--- a/patches.suse/Revert-drm-nouveau-drm-therm-fan-add-a-fallback-if-n
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Takashi Iwai <tiwai@suse.de>
-Subject: [PATCH] Revert "drm/nouveau/drm/therm/fan: add a fallback if no fan control is specified in the vbios"
-References: bsc#1103356
-Patch-mainline: Never, a temporary workaround
-
-This reverts commit 800efb4c2857ec543fdc33585bbcb1fd5ef28337.
-Since it is confirmed to be rather harmful, just revert it until the
-problem gets addressed properly in the upstream.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
- .../gpu/drm/nouveau/nvkm/subdev/therm/base.c | 22 +++----------------
- 1 file changed, 3 insertions(+), 19 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
-index 3695cde669f8..699dad03bc5d 100644
---- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
-@@ -65,9 +65,10 @@ nvkm_therm_update_trip(struct nvkm_therm *therm)
- }
-
- static int
--nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp,
-- u8 linear_max_temp)
-+nvkm_therm_update_linear(struct nvkm_therm *therm)
- {
-+ u8 linear_min_temp = therm->fan->bios.linear_min_temp;
-+ u8 linear_max_temp = therm->fan->bios.linear_max_temp;
- u8 temp = therm->func->temp_get(therm);
- u16 duty;
-
-@@ -85,21 +86,6 @@ nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp,
- return duty;
- }
-
--static int
--nvkm_therm_update_linear(struct nvkm_therm *therm)
--{
-- u8 min = therm->fan->bios.linear_min_temp;
-- u8 max = therm->fan->bios.linear_max_temp;
-- return nvkm_therm_compute_linear_duty(therm, min, max);
--}
--
--static int
--nvkm_therm_update_linear_fallback(struct nvkm_therm *therm)
--{
-- u8 max = therm->bios_sensor.thrs_fan_boost.temp;
-- return nvkm_therm_compute_linear_duty(therm, 30, max);
--}
--
- static void
- nvkm_therm_update(struct nvkm_therm *therm, int mode)
- {
-@@ -134,8 +120,6 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
- case NVBIOS_THERM_FAN_OTHER:
- if (therm->cstate)
- duty = therm->cstate;
-- else
-- duty = nvkm_therm_update_linear_fallback(therm);
- poll = false;
- break;
- }
---
-2.18.0
-
diff --git a/series.conf b/series.conf
index aaec17f0e2..989de3d3d9 100644
--- a/series.conf
+++ b/series.conf
@@ -18775,7 +18775,8 @@
patches.arch/drm-hibmc-Use-set_busid-function-from-drm-core.patch
patches.drivers/drm-hibmc-initialize-the-hibmc_bo_driver_io_mem_pfn.patch
- patches.suse/Revert-drm-nouveau-drm-therm-fan-add-a-fallback-if-n
+
+ patches.drivers/drm-nouveau-Don-t-disable-polling-in-fallback-mode.patch
+disable patches.drivers/drm-Add-DRM-client-cap-for-aspect-ratio
+disable patches.drivers/drm-Handle-aspect-ratio-info-in-legacy-modeset-path