From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Date: Tue, 03 Dec 2019 16:38:46 +0000 Subject: [PATCH v3 04/12] video: fbdev: uvesafb: modify the static fb_ops directly Message-Id: List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Avoid modifying the fb_ops via info->fbops to let us make the pointer const in the future. Cc: linux-fbdev@vger.kernel.org Signed-off-by: Jani Nikula --- drivers/video/fbdev/uvesafb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 439565cae7ab..53d08d1b56f5 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c @@ -1440,7 +1440,7 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode) /* Disable blanking if the user requested so. */ if (!blank) - info->fbops->fb_blank = NULL; + uvesafb_ops.fb_blank = NULL; /* * Find out how much IO memory is required for the mode with @@ -1510,7 +1510,7 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode) (par->ypan ? FBINFO_HWACCEL_YPAN : 0); if (!par->ypan) - info->fbops->fb_pan_display = NULL; + uvesafb_ops.fb_pan_display = NULL; } static void uvesafb_init_mtrr(struct fb_info *info) -- 2.20.1 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,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 59E54C432C0 for ; Tue, 3 Dec 2019 16:39:28 +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 3C41A205ED for ; Tue, 3 Dec 2019 16:39:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C41A205ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com 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 4EFC06E9F9; Tue, 3 Dec 2019 16:39:27 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CCC96E9F7; Tue, 3 Dec 2019 16:39:26 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2019 08:39:25 -0800 X-IronPort-AV: E=Sophos;i="5.69,273,1571727600"; d="scan'208";a="213469188" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2019 08:39:23 -0800 From: Jani Nikula To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v3 04/12] video: fbdev: uvesafb: modify the static fb_ops directly Date: Tue, 3 Dec 2019 18:38:46 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" QXZvaWQgbW9kaWZ5aW5nIHRoZSBmYl9vcHMgdmlhIGluZm8tPmZib3BzIHRvIGxldCB1cyBtYWtl IHRoZSBwb2ludGVyCmNvbnN0IGluIHRoZSBmdXR1cmUuCgpDYzogbGludXgtZmJkZXZAdmdlci5r ZXJuZWwub3JnClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy92aWRlby9mYmRldi91dmVzYWZiLmMgfCA0ICsrLS0KIDEgZmlsZSBj aGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy92aWRlby9mYmRldi91dmVzYWZiLmMgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3V2ZXNhZmIu YwppbmRleCA0Mzk1NjVjYWU3YWIuLjUzZDA4ZDFiNTZmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy92 aWRlby9mYmRldi91dmVzYWZiLmMKKysrIGIvZHJpdmVycy92aWRlby9mYmRldi91dmVzYWZiLmMK QEAgLTE0NDAsNyArMTQ0MCw3IEBAIHN0YXRpYyB2b2lkIHV2ZXNhZmJfaW5pdF9pbmZvKHN0cnVj dCBmYl9pbmZvICppbmZvLCBzdHJ1Y3QgdmJlX21vZGVfaWIgKm1vZGUpCiAKIAkvKiBEaXNhYmxl IGJsYW5raW5nIGlmIHRoZSB1c2VyIHJlcXVlc3RlZCBzby4gKi8KIAlpZiAoIWJsYW5rKQotCQlp bmZvLT5mYm9wcy0+ZmJfYmxhbmsgPSBOVUxMOworCQl1dmVzYWZiX29wcy5mYl9ibGFuayA9IE5V TEw7CiAKIAkvKgogCSAqIEZpbmQgb3V0IGhvdyBtdWNoIElPIG1lbW9yeSBpcyByZXF1aXJlZCBm b3IgdGhlIG1vZGUgd2l0aApAQCAtMTUxMCw3ICsxNTEwLDcgQEAgc3RhdGljIHZvaWQgdXZlc2Fm Yl9pbml0X2luZm8oc3RydWN0IGZiX2luZm8gKmluZm8sIHN0cnVjdCB2YmVfbW9kZV9pYiAqbW9k ZSkKIAkJCShwYXItPnlwYW4gPyBGQklORk9fSFdBQ0NFTF9ZUEFOIDogMCk7CiAKIAlpZiAoIXBh ci0+eXBhbikKLQkJaW5mby0+ZmJvcHMtPmZiX3Bhbl9kaXNwbGF5ID0gTlVMTDsKKwkJdXZlc2Fm Yl9vcHMuZmJfcGFuX2Rpc3BsYXkgPSBOVUxMOwogfQogCiBzdGF0aWMgdm9pZCB1dmVzYWZiX2lu aXRfbXRycihzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D822DC432C3 for ; Tue, 3 Dec 2019 16:39:27 +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 B5C5E205ED for ; Tue, 3 Dec 2019 16:39:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5C5E205ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 46D0A6E9F7; Tue, 3 Dec 2019 16:39:27 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CCC96E9F7; Tue, 3 Dec 2019 16:39:26 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2019 08:39:25 -0800 X-IronPort-AV: E=Sophos;i="5.69,273,1571727600"; d="scan'208";a="213469188" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2019 08:39:23 -0800 From: Jani Nikula To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Date: Tue, 3 Dec 2019 18:38:46 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v3 04/12] video: fbdev: uvesafb: modify the static fb_ops directly X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" QXZvaWQgbW9kaWZ5aW5nIHRoZSBmYl9vcHMgdmlhIGluZm8tPmZib3BzIHRvIGxldCB1cyBtYWtl IHRoZSBwb2ludGVyCmNvbnN0IGluIHRoZSBmdXR1cmUuCgpDYzogbGludXgtZmJkZXZAdmdlci5r ZXJuZWwub3JnClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy92aWRlby9mYmRldi91dmVzYWZiLmMgfCA0ICsrLS0KIDEgZmlsZSBj aGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy92aWRlby9mYmRldi91dmVzYWZiLmMgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3V2ZXNhZmIu YwppbmRleCA0Mzk1NjVjYWU3YWIuLjUzZDA4ZDFiNTZmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy92 aWRlby9mYmRldi91dmVzYWZiLmMKKysrIGIvZHJpdmVycy92aWRlby9mYmRldi91dmVzYWZiLmMK QEAgLTE0NDAsNyArMTQ0MCw3IEBAIHN0YXRpYyB2b2lkIHV2ZXNhZmJfaW5pdF9pbmZvKHN0cnVj dCBmYl9pbmZvICppbmZvLCBzdHJ1Y3QgdmJlX21vZGVfaWIgKm1vZGUpCiAKIAkvKiBEaXNhYmxl IGJsYW5raW5nIGlmIHRoZSB1c2VyIHJlcXVlc3RlZCBzby4gKi8KIAlpZiAoIWJsYW5rKQotCQlp bmZvLT5mYm9wcy0+ZmJfYmxhbmsgPSBOVUxMOworCQl1dmVzYWZiX29wcy5mYl9ibGFuayA9IE5V TEw7CiAKIAkvKgogCSAqIEZpbmQgb3V0IGhvdyBtdWNoIElPIG1lbW9yeSBpcyByZXF1aXJlZCBm b3IgdGhlIG1vZGUgd2l0aApAQCAtMTUxMCw3ICsxNTEwLDcgQEAgc3RhdGljIHZvaWQgdXZlc2Fm Yl9pbml0X2luZm8oc3RydWN0IGZiX2luZm8gKmluZm8sIHN0cnVjdCB2YmVfbW9kZV9pYiAqbW9k ZSkKIAkJCShwYXItPnlwYW4gPyBGQklORk9fSFdBQ0NFTF9ZUEFOIDogMCk7CiAKIAlpZiAoIXBh ci0+eXBhbikKLQkJaW5mby0+ZmJvcHMtPmZiX3Bhbl9kaXNwbGF5ID0gTlVMTDsKKwkJdXZlc2Fm Yl9vcHMuZmJfcGFuX2Rpc3BsYXkgPSBOVUxMOwogfQogCiBzdGF0aWMgdm9pZCB1dmVzYWZiX2lu aXRfbXRycihzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4