From patchwork Thu Aug 9 19:18:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 10659 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8098723E57 for ; Thu, 9 Aug 2012 19:18:44 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2FF31A181B7 for ; Thu, 9 Aug 2012 19:18:44 +0000 (UTC) Received: by yenq6 with SMTP id q6so840080yen.11 for ; Thu, 09 Aug 2012 12:18:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=766o5Yvroh/4Tg5YtkUorz+UckFSJXTXJtEXSxcuJMI=; b=nXk3OChFR3dNEPJH9KsKwgq99w/FADGi4bsAm6WwkDHb4Ucw4tMWGLT89aMRDgWviQ ZgdC8xRD4Gt1TzJoautIl7nneCkIx7KqZWFR4O+h9WEwAZyd5HdwfoTxsHr4GrBI7zo0 27MTWkQAikeV8/DKMgFihSwhs2K1NBYVYlHW0w0rINj/HoID3+8piyh2dQH3oPRB5MjD QeRpl0fFxsajH+y/FTvR0tEanLiJohgonr5FYG/vILmQB7fGRJMxLRh3EGjjAGOm/nYf 0z15IdMJrbwH21Q+/FmEr/DSBLTO4xvobgBax5+4C+nfcPRKBD9zDcjJe36ZTQSFudNw XE/g== Received: by 10.50.95.230 with SMTP id dn6mr472068igb.16.1344539923347; Thu, 09 Aug 2012 12:18:43 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp24794igc; Thu, 9 Aug 2012 12:18:42 -0700 (PDT) Received: by 10.236.77.39 with SMTP id c27mr347182yhe.99.1344539922318; Thu, 09 Aug 2012 12:18:42 -0700 (PDT) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id j49si1937663yhl.81.2012.08.09.12.18.41 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 12:18:42 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by yenm2 with SMTP id m2so962188yen.37 for ; Thu, 09 Aug 2012 12:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=766o5Yvroh/4Tg5YtkUorz+UckFSJXTXJtEXSxcuJMI=; b=oV3i0BT9xNJ2YycmvZq3vtP55E5WawxLSeotNFfcMxtqC3t34RkdUId1wM8lMcmDS4 CmoHl1bBtPLf8iG99JIlEJMpRc8sBBVWIUA/Urz1FlHweohWyJi4QUkcPPJqxNCuxWQs hrcSv755m22YH+pv4jS3BIfI+i9DuUteCcLj/CEtYbJGBp8rYVrtJ9Y8lvf4x3NrJJhx Og9uNe9Opaq03m6SnP5ORWoVvpvj5RVn6CK1NhdlKb5EDbdGXkMHUawGsMJvOCKCldQT nTzlKMtn/us2M8gXmugne2M69Y751FmsGDSdW4VowOrtEbJkPRNajrxrGXMaPdo3k0UV hYMA== Received: by 10.60.3.194 with SMTP id e2mr712804oee.1.1344539921563; Thu, 09 Aug 2012 12:18:41 -0700 (PDT) Received: from localhost (ppp-70-129-143-140.dsl.rcsntx.swbell.net. [70.129.143.140]) by mx.google.com with ESMTPS id qd7sm1534871obc.5.2012.08.09.12.18.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 12:18:40 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: wayland-devel@lists.freedesktop.org Cc: patches@linaro.org, Rob Clark Subject: [PATCH weston 1/2] compositor-drm: skip overlay for shm buffers Date: Thu, 9 Aug 2012 14:18:27 -0500 Message-Id: <1344539908-12065-1-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQlqZgKqTdva+FmmHnUkocC/JrZaOIkeR3NzlPeQfC8aXudkLlWxmWu7xOu9D4uC8CPR6Jd7 From: Rob Clark They can't be imported by gbm, so no point in trying, and segfaulting in gbm when we try to import (because it tries to deref the buffer as a wl_drm_buffer). Signed-off-by: Rob Clark --- src/compositor-drm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/compositor-drm.c b/src/compositor-drm.c index ad2c385..d6e6c98 100644 --- a/src/compositor-drm.c +++ b/src/compositor-drm.c @@ -566,6 +566,9 @@ drm_output_prepare_overlay_surface(struct weston_output *output_base, if (es->buffer == NULL) return -1; + if (wl_buffer_is_shm(es->buffer)) + return -1; + if (!drm_surface_transform_supported(es)) return -1;