Add support for Z-order of planes
Subsystems (2)
PATCH v2 1/1 Add support for Z-order of planes
From: "Yu(Alex) Dai" <[email protected]>
Add code to check invalid z-order. Also, avoid z-order setting if there is no change in z-order.
Yu(Alex) Dai (1):
drm/i915: add support for Z-order of planes.
drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 10 +++++ drivers/gpu/drm/i915/intel_display.c | 60 ++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 6 +++ drivers/gpu/drm/i915/intel_sprite.c | 81 ++++++++++++++++++++++++++++++++++-- 5 files changed, 151 insertions(+), 7 deletions(-)
Signature · 1 line
1.8.5.2
PATCH v2 1/1 drm/i915: add support for Z-order of planes.
From: "Yu(Alex) Dai" <[email protected]>
Add "zorder" property to crtc to control Z-order of sprite and primary planes. The alpha channel of the planes can be enabled or disabled during Z-order change.
Signed-off-by Yu(Alex) Dai <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 10 +++++ drivers/gpu/drm/i915/intel_display.c | 60 ++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_drv.h | 6 +++ drivers/gpu/drm/i915/intel_sprite.c | 81 ++++++++++++++++++++++++++++++++++-- 5 files changed, 151 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2581,6 +2581,7 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data, struct drm_file *file);int i915_get_reset_stats_ioctl (struct drm_device *dev,void *data,struct drm_file *file); +extern int i915_set_plane_zorder (struct drm_device *dev,u32 zorder);/* overlay */ extern struct intel_overlay_error_state *intel_overlay_capture_error_state (struct drm_device *dev);
drivers/gpu/drm/i915/i915_reg.h +10 -0
@@ -3743,6 +3743,16 @@#define SPRITE_INT_GAMMA_ENABLE (1<<13)#define SPRITE_TILED (1<<10)#define SPRITE_DEST_KEY (1<<2) +#define SPRITE_FORCE_BOTTOM (1<<2) +#define SPRITE_ZORDER_ENABLE (1<<0) + +#define P1S1S2C1 0 +#define P1S2S1C1 8 +#define S2P1S1C1 1 +#define S2S1P1C1 9 +#define S1P1S2C1 4 +#define S1S2P1C1 6 +#define _SPRA_LINOFF 0x70284#define _SPRA_STRIDE 0x70288#define _SPRA_POS 0x7028c
drivers/gpu/drm/i915/intel_display.c +56 -4
111 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -371,6 +371,9 @@ struct intel_crtc {bool new_enabled;uint32_t ddi_pll_sel; +bool primary_alpha; +bool sprite0_alpha; +bool sprite1_alpha;/* reset counter value when the last flip was submitted */ unsigned int reset_counter;
@@ -384,6 +387,9 @@ struct intel_crtc {/* watermarks currently being used */ struct intel_pipe_wm active; } wm; + +struct drm_property *zorder_property; +uint32_t zorder; };struct intel_plane_wm_parameters {
drivers/gpu/drm/i915/intel_sprite.c +78 -3
113 lines not on this page · raw message
Signature · 1 line
1.8.5.2