From patchwork Tue Jun 16 13:34:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 6617971 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AF97DC0020 for ; Tue, 16 Jun 2015 13:34:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF3E420786 for ; Tue, 16 Jun 2015 13:34:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id F234E2049E for ; Tue, 16 Jun 2015 13:34:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B1AB6E3B4; Tue, 16 Jun 2015 06:34:39 -0700 (PDT) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D6E36E3B4 for ; Tue, 16 Jun 2015 06:34:36 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 16 Jun 2015 06:34:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,626,1427785200"; d="scan'208";a="728420033" Received: from tursulin-linux.isw.intel.com ([10.102.226.59]) by fmsmga001.fm.intel.com with ESMTP; 16 Jun 2015 06:34:34 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 16 Jun 2015 14:34:28 +0100 Message-Id: <1434461668-19661-3-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1434461668-19661-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1434461668-19661-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [RFC 3/3] drm/i915: Use intel_plane_obj_offset from more places 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=-3.8 required=5.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_MED, 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 From: Tvrtko Ursulin These are the display call sites so should use the proper helper. Also requires intel_plane_obj_offset to assume normal view when plane pointer is not available. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/intel_display.c | 6 ++++-- drivers/gpu/drm/i915/intel_fbdev.c | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 182477f..92bb17a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2624,7 +2624,8 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc, continue; obj = intel_fb_obj(fb); - if (i915_gem_obj_ggtt_offset(obj) == plane_config->base) { + if (intel_plane_obj_offset(to_intel_plane_state(c->primary->state), + obj) == plane_config->base) { drm_framebuffer_reference(fb); goto valid_fb; } @@ -2910,7 +2911,8 @@ intel_plane_obj_offset(struct intel_plane_state *intel_plane_state, { const struct i915_ggtt_view *view = &i915_ggtt_view_normal; - if (intel_rotation_90_or_270(intel_plane_state->base.rotation)) + if (intel_plane_state && + intel_rotation_90_or_270(intel_plane_state->base.rotation)) view = &i915_ggtt_view_rotated; return i915_gem_obj_ggtt_offset_view(obj, view); diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 6372cfc..6572840 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -206,6 +206,7 @@ static int intelfb_create(struct drm_fb_helper *helper, struct fb_info *info; struct drm_framebuffer *fb; struct drm_i915_gem_object *obj; + unsigned long disp_addr; int size, ret; bool prealloc = false; @@ -269,12 +270,12 @@ static int intelfb_create(struct drm_fb_helper *helper, info->apertures->ranges[0].base = dev->mode_config.fb_base; info->apertures->ranges[0].size = dev_priv->gtt.mappable_end; - info->fix.smem_start = dev->mode_config.fb_base + i915_gem_obj_ggtt_offset(obj); + disp_addr = intel_plane_obj_offset(NULL, obj); + info->fix.smem_start = dev->mode_config.fb_base + disp_addr; info->fix.smem_len = size; info->screen_base = - ioremap_wc(dev_priv->gtt.mappable_base + i915_gem_obj_ggtt_offset(obj), - size); + ioremap_wc(dev_priv->gtt.mappable_base + disp_addr, size); if (!info->screen_base) { ret = -ENOSPC; goto out_unpin; @@ -298,7 +299,7 @@ static int intelfb_create(struct drm_fb_helper *helper, DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08lx, bo %p\n", fb->width, fb->height, - i915_gem_obj_ggtt_offset(obj), obj); + disp_addr, obj); mutex_unlock(&dev->struct_mutex); vga_switcheroo_client_fb_set(dev->pdev, info);