From patchwork Fri Feb 14 13:01:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3652501 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 85D179F382 for ; Fri, 14 Feb 2014 13:02:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C44232021E for ; Fri, 14 Feb 2014 13:02:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E67A72017A for ; Fri, 14 Feb 2014 13:02:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D732AFB530; Fri, 14 Feb 2014 05:02:06 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B17DFB52F for ; Fri, 14 Feb 2014 05:01:55 -0800 (PST) Received: by mail-ee0-f54.google.com with SMTP id e53so5613731eek.41 for ; Fri, 14 Feb 2014 05:01:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K10ZqvKO2k7F/nrY0bCxyCcpX+oR5tehz5/cFmeL9FU=; b=RM9NBmfglSP1ymYnrcJmQUQaz3eHVXVw5WIbpp6J00OpjjGlOSdeCJKZ8grC9rMvG1 ZCUk/SrGw61IVaFiM45u/pYA4tCtUBWONcAMpocyZdpb+F0tFyzCXlOKPCoiHdmIeV/y zSqxjc9bNNDnNJNGZ4z5KzdaOfcEdvTg2xWQU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K10ZqvKO2k7F/nrY0bCxyCcpX+oR5tehz5/cFmeL9FU=; b=lsWY3eIaohI/cqCu9QQUx0DPZd6Q1KHDH/pz05p68xNF+xwVsyJFiDTsL3alwU1gcW EVTs6e+hfyktVHH1VxSGRsoeN33dfblZXXjo0iSyqXTsKYm5o1+VwYU2xCev62fUvZBJ FuTi86jfW96nB/qa5vOwjGgRF3rdytLEXJ3tohGXH0c/EZcG33kvVlqVbHFBM8swcIQB rDt0DkD7arOKZcgHQu38vcwzAwShf6KEcH1bWDR89LUeSEIJJvfmQeM1FvHXeGGjjYMc QWc40zV36w0ZeutbbVSDCAGWNvOgssdRHv8XBsp529l7560OJ0Kd+hkG2FyGsovl/jHz 90vQ== X-Gm-Message-State: ALoCoQl7JlBOb8FdTq1nK8iBzjY6HT/xkVv8h4ugYDxamCXdZ6FwyZS/FaP345vvxLGevX/6A5wP X-Received: by 10.15.22.65 with SMTP id e41mr8897252eeu.5.1392382906181; Fri, 14 Feb 2014 05:01:46 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id j41sm19560682eeg.10.2014.02.14.05.01.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Feb 2014 05:01:44 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 14 Feb 2014 14:01:16 +0100 Message-Id: <1392382881-19073-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1392382881-19073-1-git-send-email-daniel.vetter@ffwll.ch> References: <1392382881-19073-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Ben Widawsky Subject: [Intel-gfx] [PATCH 06/11] drm/i915: Handle set_cache_level errors in the status page setup 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.7 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 Split out from Chris vma-bind rework. Cc: Chris Wilson Cc: Ben Widawsky Reviewed-by: Jani Nikula Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 3125e01c940b..b340c7587629 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1273,7 +1273,9 @@ static int init_status_page(struct intel_ring_buffer *ring) goto err; } - i915_gem_object_set_cache_level(obj, I915_CACHE_LLC); + ret = i915_gem_object_set_cache_level(obj, I915_CACHE_LLC); + if (ret) + goto err_unref; ret = i915_gem_obj_ggtt_pin(obj, 4096, 0); if (ret)