From 904fa5196c05a4ec59f4bc29ed1246e7409498f0 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Thu, 5 Apr 2012 02:49:39 +0000 Subject: display_driver_helper: factor get_hw_display_modaliases out of get_active_kms_drivers --- tools/display_driver_helper | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/display_driver_helper b/tools/display_driver_helper index 5fb6c74..7fe63c5 100644 --- a/tools/display_driver_helper +++ b/tools/display_driver_helper @@ -340,13 +340,18 @@ get_initrd_kms_drivers() { zcat "$initrd" | cpio -t --quiet | sed -nr "s,.*/($kms_drivers)\.ko.*$,\1,p" } -get_active_kms_drivers() { - local kms_drivers= +get_hw_display_modaliases() { for device in $(grep -l 0x03 /sys/bus/pci/devices/0000\:0*/class); do [ -e "$device" ] || continue device="$(dirname $device)" [ -f "$device/modalias" ] || continue - modalias="$(cat "$device/modalias")" + cat "$device/modalias" + done +} + +get_active_kms_drivers() { + local kms_drivers= + for modalias in $(get_hw_display_modaliases); do for modulename in $(/sbin/modprobe -Rq "$modalias"); do IS_KMS= check_driver "$modulename" "$modalias" || continue -- cgit v1.2.1