From: Maxime Ripard <maxime@cerno.tech>
Date: Wed, 14 Sep 2022 11:27:09 +0000 (+0100)
Subject: Merge tag 'backlight-detect-refactor-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.6.17~3937^2~23^2~1657
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f1a3a28e9e00a84705b62f0fdc5e31d0f935615;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'backlight-detect-refactor-1' of git://git./linux/kernel/git/pdx86/platform-drivers-x86 into drm-misc-next

Immutable backlight-detect-refactor branch between acpi, drm-* and pdx86

Tag (immutable branch) with v6.0-rc1 + the (acpi/x86) backlight
detect refactor work. For merging into the acpi, drm-* and pdx86
subsystems.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEEuvA7XScYQRpenhd+kuxHeUQDJ9wFAmMVsogUHGhkZWdvZWRl
# QHJlZGhhdC5jb20ACgkQkuxHeUQDJ9yy6wgAlig+7hkq940L62lTpj0g2gNQv8zc
# HCsMpnU7dnJcZYaEvIjouZhf33ZbN52c0fQq2JWjt7fFX04LLyIiyrJ26Lc293JR
# ++yXpJcVoewRGqApy/P3Z05TKUCLll5bexvK4t8isnhOtEXD/nDPWKTLIV2Kd1DK
# nLY4KgRznXZ85RhYheUEdidZ7Lwlzt1JVBMq7tpnzu3nVdDExyZmqlqCUITcLynu
# ysuASQGr0D2i+1vb9eifHIA3xsQO0S37Bv62aBMBKxB6B8Fz1DYr8VA2YvoT82Hv
# IFT0hzCCZ/63Ljga05O78TwraxAQX0RvZWqjqGgnZg6fIBh2hxUiqeQY6g==
# =SA1R
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 05 Sep 2022 09:25:44 AM IST
# gpg:                using RSA key BAF03B5D2718411A5E9E177E92EC4779440327DC
# gpg:                issuer "hdegoede@redhat.com"
# gpg: Can't check signature: No public key
From: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/261afe3d-7790-e945-adf6-a2c96c9b1eff@redhat.com
---

3f1a3a28e9e00a84705b62f0fdc5e31d0f935615
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 7a93162,3f45697..7b19f44
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -88,8 -88,9 +88,10 @@@
  #include <drm/drm_vblank.h>
  #include <drm/drm_audio_component.h>
  #include <drm/drm_gem_atomic_helper.h>
 +#include <drm/drm_plane_helper.h>
  
+ #include <acpi/video.h>
+ 
  #include "ivsrcid/dcn/irqsrcs_dcn_1_0.h"
  
  #include "dcn/dcn_1_0_offset.h"