Skip to content

Commit

Permalink
drm/i915: Remove legacy plane updates for cursor and sprite planes.
Browse files Browse the repository at this point in the history 
Unfortunately fbc still depends on legacy primary state, so
it can't be killed off completely yet.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Maarten Lankhorst authored and Daniel Vetter committed Sep 10, 2015
1 parent 9b4101b commit 8e0e9ce
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
4 changes: 0 additions & 4 deletions drivers/gpu/drm/i915/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13634,10 +13634,6 @@ intel_commit_cursor_plane(struct drm_plane *plane,
crtc = crtc ? crtc : plane->crtc;
intel_crtc = to_intel_crtc(crtc);

plane->fb = state->base.fb;
crtc->cursor_x = state->base.crtc_x;
crtc->cursor_y = state->base.crtc_y;

if (intel_crtc->cursor_bo == obj)
goto update;

Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/i915/intel_sprite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,6 @@ intel_commit_sprite_plane(struct drm_plane *plane,

crtc = crtc ? crtc : plane->crtc;

plane->fb = fb;

if (!crtc->state->active)
return;

Expand Down

0 comments on commit 8e0e9ce

Please sign in to comment.