diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-03-19 21:18:57 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-20 11:48:22 +0100 |
| commit | 47ecbb208bf44be0e798495d08837fe7c4138201 (patch) | |
| tree | 02f1a27c129040a96804f2ce58ac0ddf145da2bc /drivers/gpu/drm/i915/intel_drv.h | |
| parent | 08fd59fcc8c0f9732214fb93ad5cb09f67cb1124 (diff) | |
| download | linux-47ecbb208bf44be0e798495d08837fe7c4138201.tar.gz linux-47ecbb208bf44be0e798495d08837fe7c4138201.tar.bz2 linux-47ecbb208bf44be0e798495d08837fe7c4138201.zip | |
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index c06854df466d..6f20f3a01398 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -510,6 +510,9 @@ struct intel_plane { bool can_scale; int max_downscale; + /* FIXME convert to properties */ + struct drm_intel_sprite_colorkey ckey; + /* Since we need to change the watermarks before/after * 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 @@ -536,10 +539,6 @@ struct intel_plane { struct intel_plane_state *state); void (*commit_plane)(struct drm_plane *plane, 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 { |