Commit 47ecbb20 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

drm/i915: Eliminate the RMW sprite colorkey management

Store the colorkey in intel_plane and kill off all the RMW stuff
handling it.

This is just an intermediate step and eventually the colorkey needs to
be converted into some properties.

v2: Actually update the hardware state in the set_colorkey ioctl (Daniel)
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 08fd59fc
...@@ -510,6 +510,9 @@ struct intel_plane { ...@@ -510,6 +510,9 @@ struct intel_plane {
bool can_scale; bool can_scale;
int max_downscale; int max_downscale;
/* FIXME convert to properties */
struct drm_intel_sprite_colorkey ckey;
/* Since we need to change the watermarks before/after /* Since we need to change the watermarks before/after
* enabling/disabling the planes, we need to store the parameters here * enabling/disabling the planes, we need to store the parameters here
* as the other pieces of the struct may not reflect the values we want * as the other pieces of the struct may not reflect the values we want
...@@ -536,10 +539,6 @@ struct intel_plane { ...@@ -536,10 +539,6 @@ struct intel_plane {
struct intel_plane_state *state); struct intel_plane_state *state);
void (*commit_plane)(struct drm_plane *plane, void (*commit_plane)(struct drm_plane *plane,
struct intel_plane_state *state); struct intel_plane_state *state);
int (*update_colorkey)(struct drm_plane *plane,
struct drm_intel_sprite_colorkey *key);
void (*get_colorkey)(struct drm_plane *plane,
struct drm_intel_sprite_colorkey *key);
}; };
struct intel_watermark_params { struct intel_watermark_params {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment