diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-08-04 10:19:24 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-08-04 10:19:24 -0400 |
| commit | fc30eea1542dd787c6aa46e970014e97e390c5b2 (patch) | |
| tree | 420538a4eac443a7dd99deaca5ebc8efe6bddfb4 /drivers/gpu/drm/i915/display/intel_ddi.c | |
| parent | 8eb403671e3886adcd939223442d49ff3ba52846 (diff) | |
| parent | 5493ee1919eae4f49d62276cf5986b7f7c7aa8f6 (diff) | |
| download | linux-fc30eea1542dd787c6aa46e970014e97e390c5b2.tar.bz2 | |
Merge drm/drm-next into drm-intel-next
Sync up. In special to get the drm-intel-gt-next stuff.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index ec131973f374..a4c8493f3ce7 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -27,8 +27,8 @@ #include <linux/string_helpers.h> +#include <drm/display/drm_scdc_helper.h> #include <drm/drm_privacy_screen_consumer.h> -#include <drm/drm_scdc_helper.h> #include "i915_drv.h" #include "intel_audio.h" |