- lm_sensors-r6282-detect-graphics-card-in-all-cases.patch:

sensors-detect: Detect graphics card in all cases (bsc#933072).
- lm_sensors-r6283-skip-addresses-0x37-0x4f-on-DDC.patch:
  sensors-detect: Skip addresses 0x37 and 0x4f on DDC channels
  (bsc#933072).

OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=84
This commit is contained in:
Jean Delvare 2015-06-09 13:44:19 +00:00 committed by Git OBS Bridge
parent caff03032d
commit 1ad54b2846
4 changed files with 64 additions and 1 deletions

View File

@ -0,0 +1,24 @@
Subject: sensors-detect: Detect graphics card in all cases
Patch-mainline: yes (r6282)
On recent kernels, the i2c bus may not be an immediate child of the
graphics device, instead there can be a drm class device in between.
Treat all drm class devices as graphics devices so that probing the
i2c bus is disabled by default as intended.
---
prog/detect/sensors-detect | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -3773,7 +3773,9 @@ sub get_pci_class
my ($subsystem, $class);
$subsystem = sysfs_device_subsystem($device);
- return 0 unless defined $subsystem && $subsystem eq "pci";
+ return 0 unless defined $subsystem;
+ return 0x0300 if $subsystem eq "drm"; # Graphics card
+ return 0 unless $subsystem eq "pci";
$class = sysfs_device_attribute($device, "class");
return 0 unless defined $class;

View File

@ -0,0 +1,26 @@
Subject: sensors-detect: Skip addresses 0x37 and 0x4f on DDC channels
Patch-mainline: yes (r6283)
We already skip EDID addresses (0x50-0x57) by default on graphics card
I2C/DDC buses. Also skip 0x37 (DDC/CI) and 0x4f which was recently
reported as corrupting a laptop's display when probed.
---
prog/detect/sensors-detect | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -3819,8 +3819,10 @@ sub scan_i2c_adapter
chomp($input);
@not_to_scan = parse_not_to_scan(0x03, 0x77, $input);
} elsif (($class & 0xff00) == 0x0300) {
- # Skip EDID addresses by default on graphics adapters
- @not_to_scan = parse_not_to_scan(0x03, 0x77, "0x50-0x57");
+ # Skip EDID and DDC/CI addresses by default on graphics
+ # adapters. Also skip address 0x4f which was reported in a
+ # display corruption case.
+ @not_to_scan = parse_not_to_scan(0x03, 0x77, "0x37, 0x50-0x57, 0x4f");
}
open(local *FILE, "$dev_i2c$adapter_nr") or

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Jun 9 15:40:57 CEST 2015 - jdelvare@suse.com
- lm_sensors-r6282-detect-graphics-card-in-all-cases.patch:
sensors-detect: Detect graphics card in all cases (bsc#933072).
- lm_sensors-r6283-skip-addresses-0x37-0x4f-on-DDC.patch:
sensors-detect: Skip addresses 0x37 and 0x4f on DDC channels
(bsc#933072).
-------------------------------------------------------------------
Wed Nov 5 10:43:57 UTC 2014 - jdelvare@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package sensors
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -39,6 +39,8 @@ Patch5: lm_sensors-r6216-fancontrol-moving-hwmon-attributes.patch
Patch6: lm_sensors-r6237-default-config-NCT6779-NCT6791.patch
Patch7: lm_sensors-r6254-detect-print-kernel-cpu.patch
Patch8: lm_sensors-r6255-fix-shell-error-FCFANS.patch
Patch9: lm_sensors-r6282-detect-graphics-card-in-all-cases.patch
Patch10: lm_sensors-r6283-skip-addresses-0x37-0x4f-on-DDC.patch
ExcludeArch: s390 s390x
%{?systemd_requires}
@ -104,6 +106,8 @@ sense to the user.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"