summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-08-10 19:12:01 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-08-10 19:12:01 +0300
commit148b1e115eae37c9f3705691b4c45aa4cc0fa71d (patch)
tree3f42609b3e7f53eb81830c976fadde1d7bc36a2c /drivers/gpu/drm/i915/intel_drv.h
parent3ec0af7f223bab9503c4ed57d00ed34b137df476 (diff)
parent09ef2378dc42339f3871584dc26d27da220277cb (diff)
downloadlinux-148b1e115eae37c9f3705691b4c45aa4cc0fa71d.tar.xz
Merge airlied/drm-next into drm-intel-next-queued
Ben Widawsky/Daniel Stone need the extended modifier support from drm-misc to be able to merge CCS support for i915.ko Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index ee0daecff713..f91de9cb9697 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -789,7 +789,6 @@ struct intel_crtc {
struct drm_crtc base;
enum pipe pipe;
enum plane plane;
- u8 lut_r[256], lut_g[256], lut_b[256];
/*
* Whether the crtc and the connected output pipeline is active. Implies
* that crtc->enabled is set, i.e. the current mode configuration has