Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Tvrtko needs
commit b3c11ac267
Author: Eric Engestrom <eric@engestrom.ch>
Date: Sat Nov 12 01:12:56 2016 +0000
drm: move allocation out of drm_get_format_name()
to be able to apply his patches without conflicts.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
@@ -762,15 +762,8 @@ intel_check_sprite_plane(struct drm_plane *plane,
|
||||
bool can_scale;
|
||||
int ret;
|
||||
|
||||
src->x1 = state->base.src_x;
|
||||
src->y1 = state->base.src_y;
|
||||
src->x2 = state->base.src_x + state->base.src_w;
|
||||
src->y2 = state->base.src_y + state->base.src_h;
|
||||
|
||||
dst->x1 = state->base.crtc_x;
|
||||
dst->y1 = state->base.crtc_y;
|
||||
dst->x2 = state->base.crtc_x + state->base.crtc_w;
|
||||
dst->y2 = state->base.crtc_y + state->base.crtc_h;
|
||||
*src = drm_plane_state_src(&state->base);
|
||||
*dst = drm_plane_state_dest(&state->base);
|
||||
|
||||
if (!fb) {
|
||||
state->base.visible = false;
|
||||
|
Reference in New Issue
Block a user