From patchwork Tue May 12 15:13:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 6389041 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0491B9F32B for ; Tue, 12 May 2015 15:13:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 06E3820412 for ; Tue, 12 May 2015 15:13:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 09DB4203E1 for ; Tue, 12 May 2015 15:13:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 45E3C6E656; Tue, 12 May 2015 08:13:34 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A836E6E65B for ; Tue, 12 May 2015 08:13:31 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 12 May 2015 08:13:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,415,1427785200"; d="scan'208";a="709026668" Received: from gluu-mobl1.amr.corp.intel.com (HELO strange.amr.corp.intel.com) ([10.254.49.23]) by fmsmga001.fm.intel.com with ESMTP; 12 May 2015 08:13:29 -0700 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Tue, 12 May 2015 16:13:21 +0100 Message-Id: <1431443602-22886-10-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431443602-22886-1-git-send-email-damien.lespiau@intel.com> References: <1431443602-22886-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH 09/10] drm/i915/skl: Factor skl_plane_get_formats() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We can have a single function returns the list of formats. It's rather simple for now but will be augmented with the NV12 work. Signed-off-by: Damien Lespiau --- drivers/gpu/drm/i915/intel_display.c | 27 ++++++++++++++++++++------- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_sprite.c | 20 +++----------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c32abe1..980afae 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -74,13 +74,19 @@ static const uint32_t gen4_primary_formats[] = { DRM_FORMAT_VYUY, }; - -static const uint32_t skl_primary_formats[] = { - COMMON_PRIMARY_FORMATS, \ - DRM_FORMAT_XBGR8888, +static uint32_t skl_plane_formats[] = { + DRM_FORMAT_C8, + DRM_FORMAT_RGB565, DRM_FORMAT_ABGR8888, - DRM_FORMAT_XRGB2101010, + DRM_FORMAT_ARGB8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR2101010, + DRM_FORMAT_XRGB2101010, + DRM_FORMAT_YUYV, + DRM_FORMAT_YVYU, + DRM_FORMAT_UYVY, + DRM_FORMAT_VYUY, }; /* Cursor formats */ @@ -2503,6 +2509,13 @@ static int i9xx_format_to_fourcc(int format) } } +void skl_plane_get_formats(int pipe, int plane, + const uint32_t **formats, int *n_formats) +{ + *formats = skl_plane_formats; + *n_formats = ARRAY_SIZE(skl_plane_formats); +} + static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha) { switch (format) { @@ -13301,8 +13314,8 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, primary->plane = !pipe; if (INTEL_INFO(dev)->gen >= 9) { - intel_primary_formats = skl_primary_formats; - num_formats = ARRAY_SIZE(skl_primary_formats); + skl_plane_get_formats(pipe, 0, + &intel_primary_formats, &num_formats); } else if (INTEL_INFO(dev)->gen >= 4) { intel_primary_formats = gen4_primary_formats; num_formats = ARRAY_SIZE(gen4_primary_formats); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 47bc729..0277ca6 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1143,6 +1143,8 @@ int skl_max_scale(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state); unsigned long intel_plane_obj_offset(struct intel_plane *intel_plane, struct drm_i915_gem_object *obj); +void skl_plane_get_formats(int pipe, int plane, + const uint32_t **formats, int *n_formats); u32 skl_plane_ctl_format(uint32_t pixel_format); u32 skl_plane_ctl_tiling(uint64_t fb_modifier); u32 skl_plane_ctl_rotation(unsigned int rotation); diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index d510b60..21950f0 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1083,21 +1083,6 @@ static uint32_t vlv_plane_formats[] = { DRM_FORMAT_VYUY, }; -static uint32_t skl_plane_formats[] = { - DRM_FORMAT_C8, - DRM_FORMAT_RGB565, - DRM_FORMAT_ABGR8888, - DRM_FORMAT_ARGB8888, - DRM_FORMAT_XBGR8888, - DRM_FORMAT_XRGB8888, - DRM_FORMAT_XBGR2101010, - DRM_FORMAT_XRGB2101010, - DRM_FORMAT_YUYV, - DRM_FORMAT_YVYU, - DRM_FORMAT_UYVY, - DRM_FORMAT_VYUY, -}; - int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) { @@ -1169,8 +1154,9 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) intel_plane->disable_plane = skl_disable_plane; state->scaler_id = -1; - plane_formats = skl_plane_formats; - num_plane_formats = ARRAY_SIZE(skl_plane_formats); + /* plane + 1 because plane is the sprite number here */ + skl_plane_get_formats(pipe, plane + 1, + &plane_formats, &num_plane_formats); break; default: kfree(intel_plane);