openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Move chv rotation checks to plane->check() 

Move the chv rotation vs. reflections checks to the plane->check() hook,
away from the (now) platform agnostic
intel_plane_atomic_check_with_state().

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180907152413.15761-13-ville.syrjala@linux.intel.com
This commit is contained in:
Ville Syrjälä 2018-09-07 18:24:12 +03:00
parent 7326659513
commit 25721f820b
4 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
struct intel_plane_state *intel_state) struct intel_plane_state *intel_state)
{ {
struct drm_plane *plane = intel_state->base.plane; struct drm_plane *plane = intel_state->base.plane;
struct drm_i915_private *dev_priv = to_i915(plane->dev);
struct drm_plane_state *state = &intel_state->base; struct drm_plane_state *state = &intel_state->base;
struct intel_plane *intel_plane = to_intel_plane(plane); struct intel_plane *intel_plane = to_intel_plane(plane);
int ret; int ret;
@ -121,14 +120,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
if (!intel_state->base.crtc && !old_plane_state->base.crtc) if (!intel_state->base.crtc && !old_plane_state->base.crtc)
return 0; return 0;
/* CHV ignores the mirror bit when the rotate bit is set :( */
if (IS_CHERRYVIEW(dev_priv) &&
state->rotation & DRM_MODE_ROTATE_180 &&
state->rotation & DRM_MODE_REFLECT_X) {
DRM_DEBUG_KMS("Cannot rotate and reflect at the same time\n");
return -EINVAL;
}
intel_state->base.visible = false; intel_state->base.visible = false;
ret = intel_plane->check_plane(crtc_state, intel_state); ret = intel_plane->check_plane(crtc_state, intel_state);
if (ret) if (ret)

4
drivers/gpu/drm/i915/intel_display.c
View File

@ -3323,6 +3323,10 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state,
{ {
int ret; int ret;
ret = chv_plane_check_rotation(plane_state);
if (ret)
return ret;
ret = drm_atomic_helper_check_plane_state(&plane_state->base, ret = drm_atomic_helper_check_plane_state(&plane_state->base,
&crtc_state->base, &crtc_state->base,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING,

1
drivers/gpu/drm/i915/intel_drv.h
View File

@ -2139,6 +2139,7 @@ unsigned int skl_plane_max_stride(struct intel_plane *plane,
int skl_plane_check(struct intel_crtc_state *crtc_state, int skl_plane_check(struct intel_crtc_state *crtc_state,
struct intel_plane_state *plane_state); struct intel_plane_state *plane_state);
int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state); int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);
int chv_plane_check_rotation(const struct intel_plane_state *plane_state);
/* intel_tv.c */ /* intel_tv.c */
void intel_tv_init(struct drm_i915_private *dev_priv); void intel_tv_init(struct drm_i915_private *dev_priv);

21
drivers/gpu/drm/i915/intel_sprite.c
View File

@ -1128,12 +1128,33 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,
return 0; return 0;
} }
int chv_plane_check_rotation(const struct intel_plane_state *plane_state)
{
struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
unsigned int rotation = plane_state->base.rotation;
/* CHV ignores the mirror bit when the rotate bit is set :( */
if (IS_CHERRYVIEW(dev_priv) &&
rotation & DRM_MODE_ROTATE_180 &&
rotation & DRM_MODE_REFLECT_X) {
DRM_DEBUG_KMS("Cannot rotate and reflect at the same time\n");
return -EINVAL;
}
return 0;
}
static int static int
vlv_sprite_check(struct intel_crtc_state *crtc_state, vlv_sprite_check(struct intel_crtc_state *crtc_state,
struct intel_plane_state *plane_state) struct intel_plane_state *plane_state)
{ {
int ret; int ret;
ret = chv_plane_check_rotation(plane_state);
if (ret)
return ret;
ret = drm_atomic_helper_check_plane_state(&plane_state->base, ret = drm_atomic_helper_check_plane_state(&plane_state->base,
&crtc_state->base, &crtc_state->base,
DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING,