From patchwork Thu May 18 01:14:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 9732237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 86B7660230 for ; Thu, 18 May 2017 01:14:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32E6B287CB for ; Thu, 18 May 2017 01:14:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27469287F5; Thu, 18 May 2017 01:14:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D0CBB287CB for ; Thu, 18 May 2017 01:14:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 103FA89B46; Thu, 18 May 2017 01:14:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.bwidawsk.net (zangief.bwidawsk.net [107.170.211.233]) by gabe.freedesktop.org (Postfix) with ESMTPS id A303B89B22; Thu, 18 May 2017 01:14:35 +0000 (UTC) Received: by mail.bwidawsk.net (Postfix, from userid 5001) id 6928612269E; Wed, 17 May 2017 18:14:34 -0700 (PDT) Received: from mail.bwidawsk.net (c-73-157-210-159.hsd1.or.comcast.net [73.157.210.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail.bwidawsk.net (Postfix) with ESMTPSA id D681512269E; Wed, 17 May 2017 18:14:30 -0700 (PDT) Date: Wed, 17 May 2017 18:14:29 -0700 From: Ben Widawsky To: Emil Velikov Subject: Re: [PATCH v5 3/3] drm/i915: Add format modifiers for Intel Message-ID: <20170518011429.GD2334@mail.bwidawsk.net> References: <20170516213126.8269-1-ben@bwidawsk.net> <20170516213126.8269-3-ben@bwidawsk.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.2 (2017-04-18) Cc: Intel GFX , "Kristian H . Kristensen" , DRI Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP On 17-05-17 01:20:50, Emil Velikov wrote: >Hi Ben, > >A couple of small questions/suggestions that I hope you find useful. >Please don't block any of this work based on my comments. > >On 16 May 2017 at 22:31, Ben Widawsky wrote: > >> +static bool intel_primary_plane_format_mod_supported(struct drm_plane *plane, >> + uint32_t format, >> + uint64_t modifier) >> +{ >> + struct drm_i915_private *dev_priv = to_i915(plane->dev); >> + >> + if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID)) >> + return false; >> + >> + if (INTEL_GEN(dev_priv) >= 9) >> + return skl_mod_supported(format, modifier); >> + else if (INTEL_GEN(dev_priv) >= 4) >> + return i965_mod_supported(format, modifier); >> + else >> + return i8xx_mod_supported(format, modifier); >> + >Nit: if you rewrite this as below, the control flow should be clearer. >Thus the 'return false;' at the end, will be [more] obvious that it's >unreachable ;-) > > if (INTEL_GEN(dev_priv) >= 9) > return skl_mod_supported(format, modifier); > > if (INTEL_GEN(dev_priv) >= 4) > return i965_mod_supported(format, modifier); > > return i8xx_mod_supported(format, modifier); > > It's a good point, however many other blocks of code do the same thing, and I think the nature of if/else if/else implies unreachable. I can add unreachable()... In fact, I just did. >> + return false; >> +} >> + > > >> --- a/drivers/gpu/drm/i915/intel_sprite.c >> +++ b/drivers/gpu/drm/i915/intel_sprite.c > >> +static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane, >> + uint32_t format, >> + uint64_t modifier) >> +{ >> + struct drm_i915_private *dev_priv = to_i915(plane->dev); >> + >> + if (WARN_ON(modifier == DRM_FORMAT_MOD_INVALID)) >> + return false; >> + >> + BUG_ON(plane->base.type != DRM_PLANE_TYPE_OVERLAY); >> + >> + switch (format) { >> + case DRM_FORMAT_XBGR2101010: >> + case DRM_FORMAT_ABGR2101010: >> + if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) >> + return true; >> + break; >> + case DRM_FORMAT_RGB565: >> + case DRM_FORMAT_ABGR8888: >> + case DRM_FORMAT_ARGB8888: >> + if (INTEL_GEN(dev_priv) >= 9 || IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) >> + return true; >> + break; >> + case DRM_FORMAT_XBGR8888: >> + if (INTEL_GEN(dev_priv) >= 6) >> + return true; >> + break; >> + case DRM_FORMAT_XRGB8888: >> + case DRM_FORMAT_YUYV: >> + case DRM_FORMAT_YVYU: >> + case DRM_FORMAT_UYVY: >> + case DRM_FORMAT_VYUY: >> + return true; >> + } >> + >> + return false; >> +} >> + >> +const struct drm_plane_funcs intel_sprite_plane_funcs = { >> + .update_plane = drm_atomic_helper_update_plane, >> + .disable_plane = drm_atomic_helper_disable_plane, >> + .destroy = intel_plane_destroy, >> + .set_property = drm_atomic_helper_plane_set_property, >> + .atomic_get_property = intel_plane_atomic_get_property, >> + .atomic_set_property = intel_plane_atomic_set_property, >> + .atomic_duplicate_state = intel_plane_duplicate_state, >> + .atomic_destroy_state = intel_plane_destroy_state, >> + .format_mod_supported = intel_sprite_plane_format_mod_supported, >> +}; >> + >Having a dull moment - is intel_sprite_plane_funcs (+ >intel_sprite_plane_format_mod_supported) unused or I'm seeing things? >If one is to keep it, for future work, perhaps it's worth adding a 2-3 >word comment, > >Regards, >Emil Not sure how this happened, it is a mistake. Thanks for spotting it. Here's what I got locally: Reviewed-by: Emil Velikov diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3519c10abcc3..a8f4c5783ec2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13479,7 +13479,7 @@ static bool intel_primary_plane_format_mod_supported(struct drm_plane *plane, else return i8xx_mod_supported(format, modifier); - return false; + unreachable(); } static bool intel_cursor_plane_format_mod_supported(struct drm_plane *plane, diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index e7c5c0a94bbd..1d582b436b59 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1233,7 +1233,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, if (INTEL_GEN(dev_priv) >= 9) ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base, - possible_crtcs, &intel_plane_funcs, + possible_crtcs, &intel_sprite_plane_funcs, plane_formats, num_plane_formats, modifiers, DRM_PLANE_TYPE_OVERLAY,