From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75342C43603 for ; Thu, 19 Dec 2019 18:55:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48004222C2 for ; Thu, 19 Dec 2019 18:55:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="2wSHA+3p" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48004222C2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 104416E3B5; Thu, 19 Dec 2019 18:55:07 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A9B26E3B5 for ; Thu, 19 Dec 2019 18:55:04 +0000 (UTC) Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09F132465E; Thu, 19 Dec 2019 18:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781704; bh=I4FicGF1nduQhWKADf+S3DKjlXW9oqIQD8OotutLefg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2wSHA+3p2yCqgBTvysPl5M0dF6auMbTECHKj4jiCODJQhPoLNDsEEssHaePUO6Kq/ pwflQ6I4+lH9SxZ6tinWN+0v32c78VVkOzGMP9m2vi7Zw9Zy+jg2ASLedryfFuyAER Hc1er0BWoYyLOEPAIVh6kfHoMd02q/+oen/ZZ2lI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Subject: [PATCH 5.4 47/80] drm/mgag200: Store flags from PCI driver data in device structure Date: Thu, 19 Dec 2019 19:34:39 +0100 Message-Id: <20191219183114.978179449@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183031.278083125@linuxfoundation.org> References: <20191219183031.278083125@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Donnelly , Neil Armstrong , David Airlie , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, Andrzej Pietrasiewicz , Gerd Hoffmann , Thomas Zimmermann , Daniel Vetter , =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= , Dave Airlie , Thomas Gleixner , Sam Ravnborg Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" RnJvbTogVGhvbWFzIFppbW1lcm1hbm4gPHR6aW1tZXJtYW5uQHN1c2UuZGU+Cgpjb21taXQgZDZk NDM3ZDk3ZDU0Yzg1YTFhOTM5NjdiMjc0NWUzMWRmZjAzMzY1YSB1cHN0cmVhbS4KClRoZSBmbGFn cyBmaWVsZCBpbiBzdHJ1Y3QgbWdhX2RldmljZSBoYXMgYmVlbiB1bnVzZWQgc28gZmFyLiBXZSBu b3cKdXNlIGl0IHRvIHN0b3JlIGZsYWcgYml0cyBmcm9tIHRoZSBQQ0kgZHJpdmVyLgoKU2lnbmVk LW9mZi1ieTogVGhvbWFzIFppbW1lcm1hbm4gPHR6aW1tZXJtYW5uQHN1c2UuZGU+ClJldmlld2Vk LWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpGaXhlczogODFkYTg3 ZjYzYTFlICgiZHJtOiBSZXBsYWNlIGRybV9nZW1fdnJhbV9wdXNoX3RvX3N5c3RlbSgpIHdpdGgg a3VubWFwICsgdW5waW4iKQpDYzogSm9obiBEb25uZWxseSA8am9obi5wLmRvbm5lbGx5QG9yYWNs ZS5jb20+CkNjOiBHZXJkIEhvZmZtYW5uIDxrcmF4ZWxAcmVkaGF0LmNvbT4KQ2M6IERhdmUgQWly bGllIDxhaXJsaWVkQHJlZGhhdC5jb20+CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s YW5raG9yc3RAbGludXguaW50ZWwuY29tPgpDYzogTWF4aW1lIFJpcGFyZCA8bXJpcGFyZEBrZXJu ZWwub3JnPgpDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxpbnV4LmllPgpDYzogU2FtIFJhdm5i b3JnIDxzYW1AcmF2bmJvcmcub3JnPgpDYzogIlkuQy4gQ2hlbiIgPHljX2NoZW5AYXNwZWVkdGVj aC5jb20+CkNjOiBOZWlsIEFybXN0cm9uZyA8bmFybXN0cm9uZ0BiYXlsaWJyZS5jb20+CkNjOiBU aG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5kZT4KQ2M6ICJKb3PDqSBSb2JlcnRvIGRl IFNvdXphIiA8am9zZS5zb3V6YUBpbnRlbC5jb20+CkNjOiBBbmRyemVqIFBpZXRyYXNpZXdpY3og PGFuZHJ6ZWoucEBjb2xsYWJvcmEuY29tPgpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ICMgdjUuMysKTGluazogaHR0cHM6Ly9w YXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTkxMTI2MTAxNTI5LjIwMzU2 LTMtdHppbW1lcm1hbm5Ac3VzZS5kZQpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4g PGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgoKLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWdhZzIw MC9tZ2FnMjAwX2Rydi5oICB8ICAgIDggKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9tZ2FnMjAw L21nYWcyMDBfbWFpbi5jIHwgICAgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygr KQoKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21nYWcyMDAvbWdhZzIwMF9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vbWdhZzIwMC9tZ2FnMjAwX2Rydi5oCkBAIC0xNjAsNiArMTYwLDcgQEAgZW51 bSBtZ2FfdHlwZSB7CiB9OwogCiAjZGVmaW5lIE1HQUcyMDBfVFlQRV9NQVNLCSgweDAwMDAwMGZm KQorI2RlZmluZSBNR0FHMjAwX0ZMQUdfTUFTSwkoMHgwMGZmZmYwMCkKIAogI2RlZmluZSBJU19H MjAwX1NFKG1kZXYpIChtZGV2LT50eXBlID09IEcyMDBfU0VfQSB8fCBtZGV2LT50eXBlID09IEcy MDBfU0VfQikKIApAQCAtMTk1LDYgKzE5NiwxMyBAQCBtZ2FnMjAwX3R5cGVfZnJvbV9kcml2ZXJf ZGF0YShrZXJuZWxfdWxvCiB7CiAJcmV0dXJuIChlbnVtIG1nYV90eXBlKShkcml2ZXJfZGF0YSAm IE1HQUcyMDBfVFlQRV9NQVNLKTsKIH0KKworc3RhdGljIGlubGluZSB1bnNpZ25lZCBsb25nCitt Z2FnMjAwX2ZsYWdzX2Zyb21fZHJpdmVyX2RhdGEoa2VybmVsX3Vsb25nX3QgZHJpdmVyX2RhdGEp Cit7CisJcmV0dXJuIGRyaXZlcl9kYXRhICYgTUdBRzIwMF9GTEFHX01BU0s7Cit9CisKIAkJCQkv KiBtZ2FnMjAwX21vZGUuYyAqLwogaW50IG1nYWcyMDBfbW9kZXNldF9pbml0KHN0cnVjdCBtZ2Ff ZGV2aWNlICptZGV2KTsKIHZvaWQgbWdhZzIwMF9tb2Rlc2V0X2Zpbmkoc3RydWN0IG1nYV9kZXZp Y2UgKm1kZXYpOwotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWdhZzIwMC9tZ2FnMjAwX21haW4uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vbWdhZzIwMC9tZ2FnMjAwX21haW4uYwpAQCAtOTQsNiArOTQs NyBAQCBzdGF0aWMgaW50IG1nYWcyMDBfZGV2aWNlX2luaXQoc3RydWN0IGRyCiAJc3RydWN0IG1n YV9kZXZpY2UgKm1kZXYgPSBkZXYtPmRldl9wcml2YXRlOwogCWludCByZXQsIG9wdGlvbjsKIAor CW1kZXYtPmZsYWdzID0gbWdhZzIwMF9mbGFnc19mcm9tX2RyaXZlcl9kYXRhKGZsYWdzKTsKIAlt ZGV2LT50eXBlID0gbWdhZzIwMF90eXBlX2Zyb21fZHJpdmVyX2RhdGEoZmxhZ3MpOwogCiAJLyog SGFyZGNvZGUgdGhlIG51bWJlciBvZiBDUlRDcyB0byAxICovCgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CC0BC2D0D1 for ; Thu, 19 Dec 2019 18:55:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A3AD24676 for ; Thu, 19 Dec 2019 18:55:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781708; bh=I4FicGF1nduQhWKADf+S3DKjlXW9oqIQD8OotutLefg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OKSN/S2agcg+xX93yvHwFEHKKMbO9jCdnPpAbkwbCk7lwYeQd0KXObwV90G+Ye7E4 5rG/RarYiXGK/F8thfmmYvma8eBKGedB3lw9XpnqMvl5NKUXyTjy6MK9BxlXD/ZLEy 3HOa+oehfPxphneI3ZYcVUhV3nI8DlB3bEixgejA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730624AbfLSSzH (ORCPT ); Thu, 19 Dec 2019 13:55:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:50804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730613AbfLSSzF (ORCPT ); Thu, 19 Dec 2019 13:55:05 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09F132465E; Thu, 19 Dec 2019 18:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781704; bh=I4FicGF1nduQhWKADf+S3DKjlXW9oqIQD8OotutLefg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2wSHA+3p2yCqgBTvysPl5M0dF6auMbTECHKj4jiCODJQhPoLNDsEEssHaePUO6Kq/ pwflQ6I4+lH9SxZ6tinWN+0v32c78VVkOzGMP9m2vi7Zw9Zy+jg2ASLedryfFuyAER Hc1er0BWoYyLOEPAIVh6kfHoMd02q/+oen/ZZ2lI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Zimmermann , Daniel Vetter , John Donnelly , Gerd Hoffmann , Dave Airlie , Maarten Lankhorst , Maxime Ripard , David Airlie , Sam Ravnborg , "Y.C. Chen" , Neil Armstrong , Thomas Gleixner , =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= , Andrzej Pietrasiewicz , dri-devel@lists.freedesktop.org Subject: [PATCH 5.4 47/80] drm/mgag200: Store flags from PCI driver data in device structure Date: Thu, 19 Dec 2019 19:34:39 +0100 Message-Id: <20191219183114.978179449@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183031.278083125@linuxfoundation.org> References: <20191219183031.278083125@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Zimmermann commit d6d437d97d54c85a1a93967b2745e31dff03365a upstream. The flags field in struct mga_device has been unused so far. We now use it to store flag bits from the PCI driver. Signed-off-by: Thomas Zimmermann Reviewed-by: Daniel Vetter Fixes: 81da87f63a1e ("drm: Replace drm_gem_vram_push_to_system() with kunmap + unpin") Cc: John Donnelly Cc: Gerd Hoffmann Cc: Dave Airlie Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: David Airlie Cc: Sam Ravnborg Cc: "Y.C. Chen" Cc: Neil Armstrong Cc: Thomas Gleixner Cc: "José Roberto de Souza" Cc: Andrzej Pietrasiewicz Cc: dri-devel@lists.freedesktop.org Cc: # v5.3+ Link: https://patchwork.freedesktop.org/patch/msgid/20191126101529.20356-3-tzimmermann@suse.de Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/mgag200/mgag200_drv.h | 8 ++++++++ drivers/gpu/drm/mgag200/mgag200_main.c | 1 + 2 files changed, 9 insertions(+) --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h @@ -160,6 +160,7 @@ enum mga_type { }; #define MGAG200_TYPE_MASK (0x000000ff) +#define MGAG200_FLAG_MASK (0x00ffff00) #define IS_G200_SE(mdev) (mdev->type == G200_SE_A || mdev->type == G200_SE_B) @@ -195,6 +196,13 @@ mgag200_type_from_driver_data(kernel_ulo { return (enum mga_type)(driver_data & MGAG200_TYPE_MASK); } + +static inline unsigned long +mgag200_flags_from_driver_data(kernel_ulong_t driver_data) +{ + return driver_data & MGAG200_FLAG_MASK; +} + /* mgag200_mode.c */ int mgag200_modeset_init(struct mga_device *mdev); void mgag200_modeset_fini(struct mga_device *mdev); --- a/drivers/gpu/drm/mgag200/mgag200_main.c +++ b/drivers/gpu/drm/mgag200/mgag200_main.c @@ -94,6 +94,7 @@ static int mgag200_device_init(struct dr struct mga_device *mdev = dev->dev_private; int ret, option; + mdev->flags = mgag200_flags_from_driver_data(flags); mdev->type = mgag200_type_from_driver_data(flags); /* Hardcode the number of CRTCs to 1 */