Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753840Ab0KDAA1 (ORCPT ); Wed, 3 Nov 2010 20:00:27 -0400 Received: from mail-qy0-f174.google.com ([209.85.216.174]:59924 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752785Ab0KDAAZ (ORCPT ); Wed, 3 Nov 2010 20:00:25 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:reply-to:to:cc:in-reply-to:references:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; b=xzCFWkBGhfQUWBl3dEVXW4TF/C3zHo6pbQtF2p4Do5iu6a2XagHkCQ+2NROzcTyQD6 SyS7tssOpc8gcLzZNeX5mzqA5hy9IB9q+rPJJ9r8BFiqn0m3/IgC21FvtZaax21h6Yz/ EYZuXVUPvs15oRM3i5rYHMe1TqW0ATudllObo= Subject: Re: [Nouveau] [PATCH] nouveau: Don't expose backlight control in presence of ACPI From: Ben Skeggs Reply-To: skeggsb@gmail.com To: Aaron Sowry Cc: airlied@linux.ie, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org In-Reply-To: <20101103101229.GA4523@aeneby.se> References: <20101103101229.GA4523@aeneby.se> Content-Type: text/plain; charset="UTF-8" Date: Thu, 04 Nov 2010 09:59:53 +1000 Message-ID: <1288828793.22971.0.camel@nisroch> Mime-Version: 1.0 X-Mailer: Evolution 2.32.0 (2.32.0-2.fc14) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1790 Lines: 50 On Wed, 2010-11-03 at 11:12 +0100, Aaron Sowry wrote: > From: Aaron Sowry > > Avoid confusing userspace by not publishing backlight controls if ACPI equivalents are available. > Signed-off-by: Aaron Sowry Thanks, I've pushed an equivalent change into nouveau git. Ben. > --- > --- linux-2.6/drivers/gpu/drm/nouveau/nouveau_state.c.orig 2010-11-03 09:56:29.502828966 +0100 > +++ linux-2.6/drivers/gpu/drm/nouveau/nouveau_state.c 2010-11-03 10:46:27.765829000 +0100 > @@ -23,6 +23,7 @@ > * DEALINGS IN THE SOFTWARE. > */ > > +#include > #include > #include > #include "drmP.h" > @@ -648,9 +649,14 @@ nouveau_card_init(struct drm_device *dev > goto out_fence; > } > > - ret = nouveau_backlight_init(dev); > - if (ret) > - NV_ERROR(dev, "Error %d registering backlight\n", ret); > + if (acpi_video_backlight_support()) > + NV_INFO(dev, "Detected ACPI backlight support, " > + "not registering interface\n"); > + else { > + ret = nouveau_backlight_init(dev); > + if (ret) > + NV_ERROR(dev, "Error %d registering backlight\n", ret); > + } > > nouveau_fbcon_init(dev); > drm_kms_helper_poll_init(dev); > _______________________________________________ > Nouveau mailing list > Nouveau@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/