Commit 1ee516ff authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Fix logic fumble in rotation vs. ccs check

Smatch reports:
../drivers/gpu/drm/i915/intel_sprite.c:1192 skl_plane_check_fb() warn: was || intended here instead of &&?

Obviously smatch is correct here since we're trying to check if we're
using either of the ccs modifiers. Since we now have is_ccs_modifier()
let's use it to fix this.

Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Fixes: e21c2d33 ("drm/i915: Move skl plane fb related checks into a better place")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180918131059.793-1-ville.syrjala@linux.intel.comReviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent 21c62a9d
...@@ -1190,8 +1190,7 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, ...@@ -1190,8 +1190,7 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
return 0; return 0;
if (rotation & ~(DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180) && if (rotation & ~(DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180) &&
(fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS && is_ccs_modifier(fb->modifier)) {
fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS)) {
DRM_DEBUG_KMS("RC support only with 0/180 degree rotation (%x)\n", DRM_DEBUG_KMS("RC support only with 0/180 degree rotation (%x)\n",
rotation); rotation);
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment