OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8834f56
)
drm/i915: Fix skl srckey mask bits
author
Ville Syrjälä
<ville.syrjala@linux.intel.com>
Fri, 25 Jan 2019 18:38:46 +0000
(20:38 +0200)
committer
Jani Nikula
<jani.nikula@intel.com>
Tue, 5 Feb 2019 13:18:46 +0000
(15:18 +0200)
We're incorrectly masking off the R/V channel enable bit from
KEYMSK. Fix it up.
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Fixes:
b20815255693
("drm/i915: Add plane alpha blending support, v2.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20190125183846.28755-1-ville.syrjala@linux.intel.com
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
(cherry picked from commit
968bf969b47df2481022b9a05eaab02948eec088
)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_sprite.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_sprite.c
b/drivers/gpu/drm/i915/intel_sprite.c
index
d2e003d
..
5170a0f
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_sprite.c
+++ b/
drivers/gpu/drm/i915/intel_sprite.c
@@
-494,7
+494,7
@@
skl_program_plane(struct intel_plane *plane,
keymax = (key->max_value & 0xffffff) | PLANE_KEYMAX_ALPHA(alpha);
- keymsk = key->channel_mask & 0x
3
ffffff;
+ keymsk = key->channel_mask & 0x
7
ffffff;
if (alpha < 0xff)
keymsk |= PLANE_KEYMSK_ALPHA_ENABLE;