From: vandita kulkarni <[email protected]> Set the global alpha value for primary plane in the PLANE_KEYMAX register, to enable which set plane alpha enable bit in the PLANE_KEYMSK register. On bxt only 8 bit alpha will be considered from the PLANE_KEYMAX register.
Signed-off-by: vandita kulkarni <[email protected]> --- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 0a98889..cc14f75 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -5483,6 +5483,10 @@ enum skl_disp_power_wells { #define PLANE_KEYMAX(pipe, plane) \ _MMIO_PLANE(plane, _PLANE_KEYMAX_1(pipe), _PLANE_KEYMAX_2(pipe)) +#define PLANE_KEYMAX_ALPHA_MASK 0x00ffffff +#define PLANE_KEY_MASK_ALPHA_EN 31 +#define PLANE_KEY_MAX_ALPHA_SHIFT 24 + #define _PLANE_BUF_CFG_1_B 0x7127c #define _PLANE_BUF_CFG_2_B 0x7137c #define _PLANE_BUF_CFG_1(pipe) \ diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a2cc63e..61d8562 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3107,6 +3107,8 @@ static void skylake_update_primary_plane(struct drm_plane *plane, struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc); struct drm_framebuffer *fb = plane_state->base.fb; struct drm_i915_gem_object *obj = intel_fb_obj(fb); + const struct drm_intel_sprite_colorkey *key = + &to_intel_plane_state(plane->state)->ckey; int pipe = intel_crtc->pipe; u32 plane_ctl, stride_div, stride; u32 tile_height, plane_offset, plane_size; @@ -3141,6 +3143,15 @@ static void skylake_update_primary_plane(struct drm_plane *plane, WARN_ON(drm_rect_width(&plane_state->src) == 0); + I915_WRITE(PLANE_KEYMAX(pipe, 0), (DRM_MODE_COLOR_ALPHA_8 + (plane_state->base.blend_mode.color) + << PLANE_KEY_MAX_ALPHA_SHIFT) | + (key->max_value & PLANE_KEYMAX_ALPHA_MASK)); + I915_WRITE(PLANE_KEYMSK(pipe, 0), + (plane_state->use_plane_alpha + << PLANE_KEY_MASK_ALPHA_EN) | + (key->channel_mask & GENMASK(0, 26))); + if (intel_rotation_90_or_270(rotation)) { /* stride = Surface height in tiles */ tile_height = intel_tile_height(dev, fb->pixel_format, -- 1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
