diff options
author | Matt Roper <matthew.d.roper@intel.com> | 2014-04-10 17:18:06 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-22 05:19:08 -0400 |
commit | c10dddc1d5055467f67d50724f5297fe23b69cc2 (patch) | |
tree | efcb4b5c0189dd58447ab438cb98f59df4af9ff9 /drivers/gpu | |
parent | f9b0e251dfbf2c4da642ec9210db29a7ac63b81a (diff) |
drm/plane-helper: Fix primary plane scaling check
The src_w / src_h parameters to update_plane include a subpixel offset;
we need to shift off the subpixel bits before comparing to CRTC size
when checking for primary plane scaling.
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_plane_helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c index d2b1c03b3d71..f48566445c31 100644 --- a/drivers/gpu/drm/drm_plane_helper.c +++ b/drivers/gpu/drm/drm_plane_helper.c | |||
@@ -145,6 +145,8 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc, | |||
145 | } | 145 | } |
146 | 146 | ||
147 | /* Disallow scaling */ | 147 | /* Disallow scaling */ |
148 | src_w >>= 16; | ||
149 | src_h >>= 16; | ||
148 | if (crtc_w != src_w || crtc_h != src_h) { | 150 | if (crtc_w != src_w || crtc_h != src_h) { |
149 | DRM_DEBUG_KMS("Can't scale primary plane\n"); | 151 | DRM_DEBUG_KMS("Can't scale primary plane\n"); |
150 | return -EINVAL; | 152 | return -EINVAL; |