From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42831C433FE for ; Mon, 21 Feb 2022 09:05:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347115AbiBUJFd (ORCPT ); Mon, 21 Feb 2022 04:05:33 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:41918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347124AbiBUJEl (ORCPT ); Mon, 21 Feb 2022 04:04:41 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF2F925C58; Mon, 21 Feb 2022 00:58:46 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1664CB80EB6; Mon, 21 Feb 2022 08:58:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47210C340E9; Mon, 21 Feb 2022 08:58:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645433912; bh=CMmA/IivKrWnzV7tqHqyjVNnVmgLacPECP9NWZX5YPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kKhD/VJ0XVqKN7TEcoX8HkrYItD/U1idw1iBpEyMlGiTwnNKcQhBEX4WVbacnWy8A InXp6AqJs74DZRY6pcywlaFgKK5FFBQz0eD4K1yENhi5WhPrVx38Q/4Uz0/d2FLEm9 0jHUSHN+Vl9yJC6cE1Y6XTzNSy5OqTrY2bCGYGWc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Bishop , Alex Deucher Subject: [PATCH 5.4 28/80] drm/radeon: Fix backlight control on iMac 12,1 Date: Mon, 21 Feb 2022 09:49:08 +0100 Message-Id: <20220221084916.504044802@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084915.554151737@linuxfoundation.org> References: <20220221084915.554151737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicholas Bishop commit 364438fd629f7611a84c8e6d7de91659300f1502 upstream. The iMac 12,1 does not use the gmux driver for backlight, so the radeon backlight device is needed to set the brightness. Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1838 Signed-off-by: Nicholas Bishop Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/radeon/atombios_encoders.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -197,7 +197,8 @@ void radeon_atom_backlight_init(struct r * so don't register a backlight device */ if ((rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) && - (rdev->pdev->device == 0x6741)) + (rdev->pdev->device == 0x6741) && + !dmi_match(DMI_PRODUCT_NAME, "iMac12,1")) return; if (!radeon_encoder->enc_priv)