From patchwork Mon Mar 12 00:48:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 7213 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 0906F23E00 for ; Mon, 12 Mar 2012 00:48:46 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id C4F78A18395 for ; Mon, 12 Mar 2012 00:48:45 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so7826951iag.11 for ; Sun, 11 Mar 2012 17:48:45 -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 :in-reply-to:references:x-gm-message-state; bh=VzYmEoFDrZOZt+Dy9kolYlgQWHTp01Rwr+/GVp9Tq4g=; b=WvWmsYg5Hb/m8wrL9Dn3GOashaGYZOeTUJwm43P3AClBtI6+PrMcbqZPk7i9T9B86A U6q7TeilKx81SCYS+KeffIUvqZ9BsyHyKRXt5AwVy2oEa1Hnaf5GyNiCsmMEjcQBd8h/ XvNgel5nr1+T5hs2o6dhlRQk89ReRCJA2F4XHE3FFtJl41hcGHJ2L1mTygiLPh8j1xkk 7Rex1krSyX3HPCtp7DmpI0u+8QhBsc9OA7eDJ1YzhJV64JCzLdN7ljUhGsV/E013MgLI 3t4LkaZfZm+hX8POb3dOgXNkNLuLMxQOFRZbNbWcG8vWATOhU2TolEXPALCDK85wGKjm gr0g== Received: by 10.50.45.228 with SMTP id q4mr15790355igm.58.1331513325543; Sun, 11 Mar 2012 17:48:45 -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.231.53.18 with SMTP id k18csp30740ibg; Sun, 11 Mar 2012 17:48:45 -0700 (PDT) Received: by 10.50.149.230 with SMTP id ud6mr15912131igb.16.1331513325052; Sun, 11 Mar 2012 17:48:45 -0700 (PDT) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id aj6si10964571igc.60.2012.03.11.17.48.45 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Mar 2012 17:48:45 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.210.178 as permitted sender) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.210.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-iy0-f178.google.com with SMTP id l21so7631516iak.37 for ; Sun, 11 Mar 2012 17:48:45 -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:in-reply-to :references; bh=VzYmEoFDrZOZt+Dy9kolYlgQWHTp01Rwr+/GVp9Tq4g=; b=CqMFRLjUleOEh3YiEjDEwoZdK5enS30rwPRMbnYKNHtHARjQbZxTgw5dU5QNpxb2sG 5Mxbz2VI1z/vaIrA2JWF2fslrrArZpn0XVXRtriXSHT0PzRAzlqc2ICFiwvh/hmHtLJV rHF6a9jjtR4Z7Z2DJ8Cj5NGOjWSmANVju+OchVzI8O4VE5GhJXwOZY/GFiUpnaC5HN2U nYM/VmJwYmLCPcWf2l5G6+asF8PTPjLW7O811qvJOmrWoMyfSKZoni/z6GHSPT+OpfkJ HitNdqu2XvpWdWPbBtVI1E2kE+5VpIg6HNzTrvZjfJBPgkNv0kRDiADo/N5UkFakEHRt cBkw== Received: by 10.182.13.8 with SMTP id d8mr5969085obc.36.1331513324933; Sun, 11 Mar 2012 17:48:44 -0700 (PDT) Received: from localhost (ppp-70-129-134-19.dsl.rcsntx.swbell.net. [70.129.134.19]) by mx.google.com with ESMTPS id v10sm15206430obb.4.2012.03.11.17.48.44 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Mar 2012 17:48:44 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: wayland-devel@lists.freedesktop.org Cc: patches@linaro.org, Rob Clark Subject: [PATCH 4/5] drm: fix issue copying supported plane formats Date: Sun, 11 Mar 2012 19:48:44 -0500 Message-Id: <1331513325-1554-4-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1331513325-1554-1-git-send-email-rob.clark@linaro.org> References: <1331513325-1554-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQk0nGiyJSkPhmbMslWO6Fpiu4nFlzgKnHrser597Roj9YOcYYBLtHfKiBMXx+Ih6okB42+j From: Rob Clark Originally on the first 1/4th of the plane formats were copied, leading to problems if AR24/XR24 appears later in the list. --- src/compositor-drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/compositor-drm.c b/src/compositor-drm.c index cf9a937..c8e6eaf 100644 --- a/src/compositor-drm.c +++ b/src/compositor-drm.c @@ -1230,7 +1230,7 @@ create_sprites(struct drm_compositor *ec) sprite->compositor = ec; sprite->count_formats = plane->count_formats; memcpy(sprite->formats, plane->formats, - plane->count_formats); + plane->count_formats * sizeof(plane->formats[0])); drmModeFreePlane(plane); wl_list_insert(&ec->sprite_list, &sprite->link);