diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 7df662bab280..3ea8e5fe4407 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -331,6 +331,13 @@ struct intel_crtc { | |||
331 | bool pch_fifo_underrun_disabled; | 331 | bool pch_fifo_underrun_disabled; |
332 | }; | 332 | }; |
333 | 333 | ||
334 | struct intel_plane_wm_parameters { | ||
335 | uint32_t horiz_pixels; | ||
336 | uint8_t bytes_per_pixel; | ||
337 | bool enabled; | ||
338 | bool scaled; | ||
339 | }; | ||
340 | |||
334 | struct intel_plane { | 341 | struct intel_plane { |
335 | struct drm_plane base; | 342 | struct drm_plane base; |
336 | int plane; | 343 | int plane; |
@@ -349,12 +356,7 @@ struct intel_plane { | |||
349 | * as the other pieces of the struct may not reflect the values we want | 356 | * as the other pieces of the struct may not reflect the values we want |
350 | * for the watermark calculations. Currently only Haswell uses this. | 357 | * for the watermark calculations. Currently only Haswell uses this. |
351 | */ | 358 | */ |
352 | struct { | 359 | struct intel_plane_wm_parameters wm; |
353 | bool enabled; | ||
354 | bool scaled; | ||
355 | uint8_t bytes_per_pixel; | ||
356 | uint32_t horiz_pixels; | ||
357 | } wm; | ||
358 | 360 | ||
359 | void (*update_plane)(struct drm_plane *plane, | 361 | void (*update_plane)(struct drm_plane *plane, |
360 | struct drm_framebuffer *fb, | 362 | struct drm_framebuffer *fb, |