git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-misc-next-2021-07-16' of git://anongit.freedesktop.org/drm/drm-misc...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
display
/
intel_display_types.h
diff --git
a/drivers/gpu/drm/i915/display/intel_display_types.h
b/drivers/gpu/drm/i915/display/intel_display_types.h
index d7b5e26e13949ef1b8c0bc2cd11bdee9b22eec5e..d94f361b548b7c112f6df708906dc4d858a3b36d 100644
(file)
--- a/
drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/
drivers/gpu/drm/i915/display/intel_display_types.h
@@
-314,7
+314,7
@@
struct intel_panel {
/* DPCD backlight */
union {
struct {
-
u8 pwmgen_bit_count
;
+
struct drm_edp_backlight_info info
;
} vesa;
struct {
bool sdr_uses_aux;