drm/i915: Consolidate plane handler vtables
All of the previous refactoring/consolidation of plane code has resulted in intel_primary_plane_funcs, intel_cursor_plane_funcs, and intel_sprite_plane_funcs being identical. Replace all of these with a single 'intel_plane_funcs' vtable for simplicity. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
8e7d688b7a
commit
65a3fea0a6
|
@ -12049,7 +12049,7 @@ void intel_plane_destroy(struct drm_plane *plane)
|
|||
kfree(intel_plane);
|
||||
}
|
||||
|
||||
static const struct drm_plane_funcs intel_primary_plane_funcs = {
|
||||
const struct drm_plane_funcs intel_plane_funcs = {
|
||||
.update_plane = drm_plane_helper_update,
|
||||
.disable_plane = drm_plane_helper_disable,
|
||||
.destroy = intel_plane_destroy,
|
||||
|
@ -12096,7 +12096,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
|
|||
}
|
||||
|
||||
drm_universal_plane_init(dev, &primary->base, 0,
|
||||
&intel_primary_plane_funcs,
|
||||
&intel_plane_funcs,
|
||||
intel_primary_formats, num_formats,
|
||||
DRM_PLANE_TYPE_PRIMARY);
|
||||
|
||||
|
@ -12224,15 +12224,6 @@ update:
|
|||
intel_crtc_update_cursor(crtc, state->visible);
|
||||
}
|
||||
|
||||
static const struct drm_plane_funcs intel_cursor_plane_funcs = {
|
||||
.update_plane = drm_plane_helper_update,
|
||||
.disable_plane = drm_plane_helper_disable,
|
||||
.destroy = intel_plane_destroy,
|
||||
.set_property = intel_plane_set_property,
|
||||
.atomic_duplicate_state = intel_plane_duplicate_state,
|
||||
.atomic_destroy_state = intel_plane_destroy_state,
|
||||
};
|
||||
|
||||
static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
|
||||
int pipe)
|
||||
{
|
||||
|
@ -12258,7 +12249,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
|
|||
cursor->commit_plane = intel_commit_cursor_plane;
|
||||
|
||||
drm_universal_plane_init(dev, &cursor->base, 0,
|
||||
&intel_cursor_plane_funcs,
|
||||
&intel_plane_funcs,
|
||||
intel_cursor_formats,
|
||||
ARRAY_SIZE(intel_cursor_formats),
|
||||
DRM_PLANE_TYPE_CURSOR);
|
||||
|
|
|
@ -890,6 +890,7 @@ void i915_audio_component_init(struct drm_i915_private *dev_priv);
|
|||
void i915_audio_component_cleanup(struct drm_i915_private *dev_priv);
|
||||
|
||||
/* intel_display.c */
|
||||
extern const struct drm_plane_funcs intel_plane_funcs;
|
||||
bool intel_has_pending_fb_unpin(struct drm_device *dev);
|
||||
int intel_pch_rawclk(struct drm_device *dev);
|
||||
void intel_mark_busy(struct drm_device *dev);
|
||||
|
|
|
@ -1400,15 +1400,6 @@ int intel_plane_restore(struct drm_plane *plane)
|
|||
plane->state->src_w, plane->state->src_h);
|
||||
}
|
||||
|
||||
static const struct drm_plane_funcs intel_sprite_plane_funcs = {
|
||||
.update_plane = drm_plane_helper_update,
|
||||
.disable_plane = drm_plane_helper_disable,
|
||||
.destroy = intel_plane_destroy,
|
||||
.set_property = intel_plane_set_property,
|
||||
.atomic_duplicate_state = intel_plane_duplicate_state,
|
||||
.atomic_destroy_state = intel_plane_destroy_state,
|
||||
};
|
||||
|
||||
static uint32_t ilk_plane_formats[] = {
|
||||
DRM_FORMAT_XRGB8888,
|
||||
DRM_FORMAT_YUYV,
|
||||
|
@ -1549,7 +1540,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
|
|||
intel_plane->commit_plane = intel_commit_sprite_plane;
|
||||
possible_crtcs = (1 << pipe);
|
||||
ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,
|
||||
&intel_sprite_plane_funcs,
|
||||
&intel_plane_funcs,
|
||||
plane_formats, num_plane_formats,
|
||||
DRM_PLANE_TYPE_OVERLAY);
|
||||
if (ret) {
|
||||
|
|
Loading…
Reference in a new issue