From patchwork Tue Jul 23 17:28:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2832098 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8782DC0319 for ; Tue, 23 Jul 2013 17:28:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A5AC920233 for ; Tue, 23 Jul 2013 17:28:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 78B842022D for ; Tue, 23 Jul 2013 17:28:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DB34E6342 for ; Tue, 23 Jul 2013 10:28:24 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BDF4E5CC4 for ; Tue, 23 Jul 2013 10:28:12 -0700 (PDT) Received: by mail-ee0-f43.google.com with SMTP id l10so4594368eei.16 for ; Tue, 23 Jul 2013 10:28:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=RrpPv8Sl2g2t+PDMfrqQx3FZRkwS6nqj/3TYcXEJS2g=; b=JTjmb9aO42ar91Bd03lnH1bSAyLqkeUhirNaSlGE30cfznOXeeByjt07DaAmZZ7y7G 9gcU8lUWW4VKewcX9AQDPYgTi+ZncWj1IAYSyA3P/ppFx+nnirOVein2wgiKrLzjAS8m Ddf7o13Nt4tSk6sss1pK9GGj+tFFT6oItVwnM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=RrpPv8Sl2g2t+PDMfrqQx3FZRkwS6nqj/3TYcXEJS2g=; b=eOEmbRHO23j8WWSV97lkGLLKsLy1g9yL4tF9JYE4sGz+hZExKnyxwLoyWoEKVC4Q3p KAg91ZmKmF9C5o2HiiRZ6HDLqKjyMIyQ/JbZchKfMQzXeNfbjgAApSn9WCElh6LhXanL z83CFsXuquF6JHdP0Vy3JRcL90WsHjd82Ub2Aq/ImfjEJE/C8BKJkOzUNNR5ePF9YTDu PF0odShLoPu56NsEn0QpzHXlPiDqfeRrh+qCPOy8inj/KzVNh9IHQjSXp4bytXft/fAZ 3ZCvRHgsk7DVwStLcCietusOEBnBBAFYIrK79Yq8/mbslagJLihUSwHMhpffEmKJpq/F 7RGA== X-Received: by 10.14.215.197 with SMTP id e45mr33773963eep.130.1374600491595; Tue, 23 Jul 2013 10:28:11 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id l42sm60087271eeo.14.2013.07.23.10.28.09 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Jul 2013 10:28:10 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 23 Jul 2013 19:28:06 +0200 Message-Id: <1374600486-3565-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.2 X-Gm-Message-State: ALoCoQkPA2rNW1A4oP17cdVr7GbPB1MzkZLWSnMCTa1pdFcYo8ruu6dtSnh2HgQnuhUzPTA1Gx/n Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Our phys_object code can't deal with stolen memory and so blows up. Fixing this is quite a bit of work and not worth it much for a single page object, so just opt-out. This is necessary prep work to enable stolen on gen2/3 platforms where the overlay register file isn't stored in the gtt. Cc: Chris Wilson Acked-by: Chris Wilson Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_overlay.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 2abb53e..9ec5a4e 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -1333,7 +1333,9 @@ void intel_setup_overlay(struct drm_device *dev) overlay->dev = dev; - reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE); + reg_bo = NULL; + if (!OVERLAY_NEEDS_PHYSICAL(dev)) + reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE); if (reg_bo == NULL) reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE); if (reg_bo == NULL)