From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mike Travis <travis@sgi.com>
Subject: linux-next: manual merge of the drm tree with the tree
Date: Tue, 2 Mar 2010 14:36:12 +1100 [thread overview]
Message-ID: <20100302143612.75b72e22.sfr@canb.auug.org.au> (raw)
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/vga/Kconfig between commit
36028f3383872eefb558a4aae4c12ec2b5fa640f ("vgaarb: Add user selectability
of the number of GPUS in a system") from Linus' tree and commit
6a9ee8af344e3bd7dbd61e67037096cdf7f83289 ("vga_switcheroo: initial
implementation (v15)") from the drm tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/vga/Kconfig
index 0920492,6116a01..0000000
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@@ -9,10 -9,15 +9,23 @@@ config VGA_AR
see Documentation/vgaarbiter.txt for more details. Select this to
enable VGA arbiter.
+config VGA_ARB_MAX_GPUS
+ int "Maximum number of GPUs"
+ default 16
+ depends on VGA_ARB
+ help
+ Reserves space in the kernel to maintain resource locking for
+ multiple GPUS. The overhead for each GPU is very small.
++
+ config VGA_SWITCHEROO
+ bool "Laptop Hybrid Grapics - GPU switching support"
+ default y
+ depends on X86
+ depends on ACPI
+ help
+ Many laptops released in 2008/9/10 have two gpus with a multiplxer
+ to switch between them. This adds support for dynamic switching when
+ X isn't running and delayed switching until the next logoff. This
+ features is called hybrid graphics, ATI PowerXpress, and Nvidia
+ HybridPower.
+
next reply other threads:[~2010-03-02 3:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-02 3:36 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-03 14:41 linux-next: manual merge of the drm tree with the tree Mark Brown
2014-01-08 1:50 Stephen Rothwell
2012-10-04 2:21 Stephen Rothwell
2009-09-30 1:58 Stephen Rothwell
2009-08-20 5:27 Stephen Rothwell
2009-08-10 5:14 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100302143612.75b72e22.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=travis@sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).