diff options
| author | Stefan Schake <stschake@gmail.com> | 2018-03-09 01:53:34 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2018-03-09 11:24:53 -0800 |
| commit | 05202c241f1476d8e2b30bb2699f6780962972e8 (patch) | |
| tree | 203f6e5b65476f78cc13aef19ba7432fb8910d60 /drivers/gpu/drm/vc4/vc4_plane.c | |
| parent | 60beeccc72cabefcb8874fec542b3142e262b6c2 (diff) | |
| download | linux-stable-05202c241f1476d8e2b30bb2699f6780962972e8.tar.gz linux-stable-05202c241f1476d8e2b30bb2699f6780962972e8.tar.bz2 linux-stable-05202c241f1476d8e2b30bb2699f6780962972e8.zip | |
drm/vc4: Set premultiplied for alpha formats
Alpha formats in DRM are assumed to be premultiplied, so we should be
setting the PREMULT bit in the plane configuration for HVS.
Changes from v1:
- Use correct has_alpha
Signed-off-by: Stefan Schake <stschake@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-2-git-send-email-stschake@gmail.com
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_plane.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_plane.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index c4c7af11fec5..831e1959e64d 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -618,13 +618,14 @@ static int vc4_plane_mode_set(struct drm_plane *plane, SCALER_POS1_SCL_HEIGHT)); } - /* Position Word 2: Source Image Size, Alpha Mode */ + /* Position Word 2: Source Image Size, Alpha */ vc4_state->pos2_offset = vc4_state->dlist_count; vc4_dlist_write(vc4_state, VC4_SET_FIELD(fb->format->has_alpha ? SCALER_POS2_ALPHA_MODE_PIPELINE : SCALER_POS2_ALPHA_MODE_FIXED, SCALER_POS2_ALPHA_MODE) | + (fb->format->has_alpha ? SCALER_POS2_ALPHA_PREMULT : 0) | VC4_SET_FIELD(vc4_state->src_w[0], SCALER_POS2_WIDTH) | VC4_SET_FIELD(vc4_state->src_h[0], SCALER_POS2_HEIGHT)); |