p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: Remove transitional references from intel_plane_atomic_check. 

All transitional plane helpers are gone, party!

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Maarten Lankhorst 2015-06-15 12:33:55 +02:00 committed by Daniel Vetter
parent 818ed961e6
commit c389c9c4d9
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/i915/intel_atomic_plane.c
View File

@ -115,6 +115,7 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
struct intel_crtc_state *crtc_state; struct intel_crtc_state *crtc_state;
struct intel_plane *intel_plane = to_intel_plane(plane); struct intel_plane *intel_plane = to_intel_plane(plane);
struct intel_plane_state *intel_state = to_intel_plane_state(state); struct intel_plane_state *intel_state = to_intel_plane_state(state);
struct drm_crtc_state *drm_crtc_state;
int ret; int ret;
crtc = crtc ? crtc : plane->state->crtc; crtc = crtc ? crtc : plane->state->crtc;
@ -129,19 +130,11 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
if (!crtc) if (!crtc)
return 0; return 0;
/* FIXME: temporary hack necessary while we still use the plane update drm_crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc);
* helper. */ if (WARN_ON(!drm_crtc_state))
if (state->state) { return -EINVAL;
struct drm_crtc_state *drm_crtc_state =
drm_atomic_get_existing_crtc_state(state->state, crtc);
if (WARN_ON(!drm_crtc_state)) crtc_state = to_intel_crtc_state(drm_crtc_state);
return -EINVAL;
crtc_state = to_intel_crtc_state(drm_crtc_state);
} else {
crtc_state = intel_crtc->config;
}
/* /*
* The original src/dest coordinates are stored in state->base, but * The original src/dest coordinates are stored in state->base, but
@ -191,7 +184,7 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
intel_state->visible = false; intel_state->visible = false;
ret = intel_plane->check_plane(plane, crtc_state, intel_state); ret = intel_plane->check_plane(plane, crtc_state, intel_state);
if (ret || !state->state) if (ret)
return ret; return ret;
return intel_plane_atomic_calc_changes(&crtc_state->base, state); return intel_plane_atomic_calc_changes(&crtc_state->base, state);