From patchwork Wed Jan 25 10:10:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9536657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF753601D3 for ; Wed, 25 Jan 2017 10:10:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEE6826B39 for ; Wed, 25 Jan 2017 10:10:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B388026E69; Wed, 25 Jan 2017 10:10:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 25DF726B39 for ; Wed, 25 Jan 2017 10:10:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DB8546E95D; Wed, 25 Jan 2017 10:10:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A1946E95D for ; Wed, 25 Jan 2017 10:10:48 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id x1so20200005lff.0 for ; Wed, 25 Jan 2017 02:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6HztbJA3cgQOw8qk6U3+OsjnYDbHqdrAJ0XW/vXVSX4=; b=SzX304luxpwkald/ZZbH7KeO0xkmv/nD2/eL+areBcXWiRhgNH3tMW8+4uQmwDSw6I 57katNIYPMd1a164oK40oGQ1VZ0WNS+r54QWVg/5pK9afC0CORd/ea5bk328DV9hvMwH u31wJqM7CIXAz+br/71wuN38NQQ6qf1dBnXBJppxHtAldlOAyCWB21XPgNo1MZK607DR w+zZsOjJ6vNmA+mENzdlpQNx4aNWA2mqV9hWeNaBnmeCpYGmcyZmc0/LuxwRLcpTorZl o+I+TsYbi1Y8N5lLTvrDbXOVTZ0JdO2zoaD1ovTnJ1C6g9Acasei1AIcyMR8gKZxcKn9 G2xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=6HztbJA3cgQOw8qk6U3+OsjnYDbHqdrAJ0XW/vXVSX4=; b=AHkOsElJ6cvn2neU1evoupllOC4tSMzy7OsBbA9XC9HT1XC9bRH6gGljVuWyKwaZrf PNhU+YHleU2aGlppsjl0sQn/AcVaairvl+d96DTqC91dlCQGsvbJ8GuoeCJdZgM+dBGg cW7VS/76m+Q9LKFHg/75Le+1QU2ObgfjKiNvkdS7b8qF0JAPnnH7Tb5exF3PJlYuXHO3 FD+WEzc9QxEhvuKoJCKk9sxtL/DBl1YmQl/ACfH7m19ygwjG6pgAiJCei+sr01h3nEV/ RCPi+k2elUwqRwBoKLlxsdzqMOsEaz6DQVTVcdxtRg3NyU+gqjBIODISI68NjXmXGs07 Mhqg== X-Gm-Message-State: AIkVDXKCqMYDGSMggNAVIRJ7c+lTb06NWM6ZmhlCwS7SSZvPzOkm7w3tEmsHS0B+bb0Kcw== X-Received: by 10.223.139.93 with SMTP id v29mr31321654wra.5.1485339046617; Wed, 25 Jan 2017 02:10:46 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id y97sm30677450wmh.24.2017.01.25.02.10.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2017 02:10:46 -0800 (PST) From: Chris Wilson To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/sti: Fix compilation failure for drm_framebuffer.pixel_format Date: Wed, 25 Jan 2017 10:10:44 +0000 Message-Id: <20170125101044.8956-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Cc: Vincent Abriou X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drivers/gpu/drm/sti/sti_plane.c:76:33: error: ‘struct drm_framebuffer’ has no member named ‘pixel_format’; did you mean ‘format’? I didn't look to hard at the casting to a char * and just did a mechanical transformation of s/pixel_format/format->format/ as given in commit 438b74a5497c ("drm: Nuke fb->pixel_format"). Fixes: 438b74a5497c ("drm: Nuke fb->pixel_format") Signed-off-by: Chris Wilson Cc: Ville Syrjälä Cc: Benjamin Gaignard Cc: Vincent Abriou Acked-by: Vincent Abriou Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/sti/sti_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sti/sti_plane.c b/drivers/gpu/drm/sti/sti_plane.c index 699094c559b4..427d8f58c6b1 100644 --- a/drivers/gpu/drm/sti/sti_plane.c +++ b/drivers/gpu/drm/sti/sti_plane.c @@ -73,7 +73,7 @@ void sti_plane_update_fps(struct sti_plane *plane, plane->drm_plane.name, plane->drm_plane.fb->width, plane->drm_plane.fb->height, - (char *)&plane->drm_plane.fb->pixel_format, + (char *)&plane->drm_plane.fb->format->format, fpks / 1000, fpks % 1000, sti_plane_to_str(plane)); }