diff options
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_sprite.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_sprite.c | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c index 2713faad0625..7649c50b5445 100644 --- a/drivers/gpu/drm/i915/display/intel_sprite.c +++ b/drivers/gpu/drm/i915/display/intel_sprite.c @@ -39,7 +39,6 @@  #include <drm/drm_crtc.h>  #include <drm/drm_damage_helper.h>  #include <drm/drm_fourcc.h> -#include <drm/drm_plane_helper.h>  #include <drm/drm_rect.h>  #include "i915_drv.h" @@ -1355,8 +1354,8 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,  {  	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);  	struct drm_i915_private *dev_priv = to_i915(plane->base.dev); -	int min_scale = DRM_PLANE_HELPER_NO_SCALING; -	int max_scale = DRM_PLANE_HELPER_NO_SCALING; +	int min_scale = DRM_PLANE_NO_SCALING; +	int max_scale = DRM_PLANE_NO_SCALING;  	int ret;  	if (g4x_fb_scalable(plane_state->hw.fb)) { @@ -1426,8 +1425,8 @@ vlv_sprite_check(struct intel_crtc_state *crtc_state,  		return ret;  	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state, -						DRM_PLANE_HELPER_NO_SCALING, -						DRM_PLANE_HELPER_NO_SCALING, +						DRM_PLANE_NO_SCALING, +						DRM_PLANE_NO_SCALING,  						true);  	if (ret)  		return ret;  |