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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 5014EC04AAF for ; Mon, 20 May 2019 08:24:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 260E921655 for ; Mon, 20 May 2019 08:24:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="CJE6x2vw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731613AbfETIYK (ORCPT ); Mon, 20 May 2019 04:24:10 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:39855 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731325AbfETIWh (ORCPT ); Mon, 20 May 2019 04:22:37 -0400 Received: by mail-ed1-f65.google.com with SMTP id e24so22524613edq.6 for ; Mon, 20 May 2019 01:22:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pxqcSYFwHsuvd2Lv/d2TG+VXwZfFZyMIWYgQCzFB2T8=; b=CJE6x2vwqV3LQYmFhtuIPutKZptFzaKYr7k4mX1elPEsoncWPJ/GrDVp2MNooxU1YN xEtL2BegbC/MvQovtXXLHG7jiZdSGkI14MrhieJPhjfjk9EjLkKP/TEOYw1C9UGcG5BG tRpJgocZKYyHG15LmfgCt/u9VTVIi6lSN8Qys= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pxqcSYFwHsuvd2Lv/d2TG+VXwZfFZyMIWYgQCzFB2T8=; b=rrDn0yrFC106gcDJZCLgw/4Jdoma0KHPQwpuc8Gfgn/IXxm6tPDi4coR97cdP6pYaj x/9WSKuK8xK1U8hE9oSjKZ09oqk+/zzKwuAMuMN10EvJdwuhvsBXwoCD5ezn/icHb9oP XV9bRlT8maJoJzlUkpw87EGTr9v6ruca6TY3T8QWLg4rB5dCgS1utGSw4AZgz9uWqn7K EbT5ABtowD9byVRFoH4f3iYqgBlemc1IP9Ej/j6OeocP++bL092mgRnkcjjBNyKK6HoW ZhOeaygM+jschFn6uj1t4MbcSsBY6xgoAOazSsgDr+ChpNQk2DpBq9yMobHkPeiVUnGI PJ1Q== X-Gm-Message-State: APjAAAULtEZ3TdE/dT06INLPb8FTyOPjnzMu4v9O8zHIfBH2KuDWz62b F8qKoYCC3tZL8EwksBGJ8iQtVa9q4IE= X-Google-Smtp-Source: APXvYqzH5vi4xjbpIabhzI98CxlrdX5ZWZAJwSpnPRN8dmpzTWzU7l5z6Z1WUkTqbCcTD46EZXl8Dg== X-Received: by 2002:aa7:d381:: with SMTP id x1mr74213607edq.251.1558340555273; Mon, 20 May 2019 01:22:35 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id t25sm3021263ejx.8.2019.05.20.01.22.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 May 2019 01:22:34 -0700 (PDT) From: Daniel Vetter To: DRI Development Cc: Intel Graphics Development , LKML , Daniel Vetter Subject: [PATCH 11/33] fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify Date: Mon, 20 May 2019 10:21:54 +0200 Message-Id: <20190520082216.26273-12-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190520082216.26273-1-daniel.vetter@ffwll.ch> References: <20190520082216.26273-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's dead code, and removing it avoids me having to understand what it's doing with lock_fb_info. Signed-off-by: Daniel Vetter Cc: Daniel Vetter --- drivers/video/fbdev/sh_mobile_lcdcfb.c | 63 -------------------------- drivers/video/fbdev/sh_mobile_lcdcfb.h | 5 -- 2 files changed, 68 deletions(-) diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c index dc46be38c970..c5924f5e98c6 100644 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c @@ -556,67 +556,6 @@ sh_mobile_lcdc_must_reconfigure(struct sh_mobile_lcdc_chan *ch, static int sh_mobile_lcdc_check_var(struct fb_var_screeninfo *var, struct fb_info *info); -static int sh_mobile_lcdc_display_notify(struct sh_mobile_lcdc_chan *ch, - enum sh_mobile_lcdc_entity_event event, - const struct fb_videomode *mode, - const struct fb_monspecs *monspec) -{ - struct fb_info *info = ch->info; - struct fb_var_screeninfo var; - int ret = 0; - - switch (event) { - case SH_MOBILE_LCDC_EVENT_DISPLAY_CONNECT: - /* HDMI plug in */ - console_lock(); - if (lock_fb_info(info)) { - - - ch->display.width = monspec->max_x * 10; - ch->display.height = monspec->max_y * 10; - - if (!sh_mobile_lcdc_must_reconfigure(ch, mode) && - info->state == FBINFO_STATE_RUNNING) { - /* First activation with the default monitor. - * Just turn on, if we run a resume here, the - * logo disappears. - */ - info->var.width = ch->display.width; - info->var.height = ch->display.height; - sh_mobile_lcdc_display_on(ch); - } else { - /* New monitor or have to wake up */ - fb_set_suspend(info, 0); - } - - - unlock_fb_info(info); - } - console_unlock(); - break; - - case SH_MOBILE_LCDC_EVENT_DISPLAY_DISCONNECT: - /* HDMI disconnect */ - console_lock(); - if (lock_fb_info(info)) { - fb_set_suspend(info, 1); - unlock_fb_info(info); - } - console_unlock(); - break; - - case SH_MOBILE_LCDC_EVENT_DISPLAY_MODE: - /* Validate a proposed new mode */ - fb_videomode_to_var(&var, mode); - var.bits_per_pixel = info->var.bits_per_pixel; - var.grayscale = info->var.grayscale; - ret = sh_mobile_lcdc_check_var(&var, info); - break; - } - - return ret; -} - /* ----------------------------------------------------------------------------- * Format helpers */ @@ -2540,8 +2479,6 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch) unsigned int max_size; unsigned int i; - ch->notify = sh_mobile_lcdc_display_notify; - /* Validate the format. */ format = sh_mobile_format_info(cfg->fourcc); if (format == NULL) { diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.h b/drivers/video/fbdev/sh_mobile_lcdcfb.h index b8e47a8bd8ab..589400372098 100644 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.h +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.h @@ -87,11 +87,6 @@ struct sh_mobile_lcdc_chan { unsigned long base_addr_c; unsigned int line_size; - int (*notify)(struct sh_mobile_lcdc_chan *ch, - enum sh_mobile_lcdc_entity_event event, - const struct fb_videomode *mode, - const struct fb_monspecs *monspec); - /* Backlight */ struct backlight_device *bl; unsigned int bl_brightness; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 11/33] fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify Date: Mon, 20 May 2019 10:21:54 +0200 Message-ID: <20190520082216.26273-12-daniel.vetter@ffwll.ch> References: <20190520082216.26273-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21D9C89263 for ; Mon, 20 May 2019 08:22:37 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id l25so22498380eda.9 for ; Mon, 20 May 2019 01:22:37 -0700 (PDT) In-Reply-To: <20190520082216.26273-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development Cc: Daniel Vetter , Intel Graphics Development , LKML List-Id: dri-devel@lists.freedesktop.org SXQncyBkZWFkIGNvZGUsIGFuZCByZW1vdmluZyBpdCBhdm9pZHMgbWUgaGF2aW5nIHRvIHVuZGVy c3RhbmQKd2hhdCBpdCdzIGRvaW5nIHdpdGggbG9ja19mYl9pbmZvLgoKU2lnbmVkLW9mZi1ieTog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IERhbmllbCBWZXR0ZXIg PGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy92aWRlby9mYmRldi9zaF9tb2Jp bGVfbGNkY2ZiLmMgfCA2MyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy92aWRl by9mYmRldi9zaF9tb2JpbGVfbGNkY2ZiLmggfCAgNSAtLQogMiBmaWxlcyBjaGFuZ2VkLCA2OCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3NoX21vYmlsZV9s Y2RjZmIuYyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvc2hfbW9iaWxlX2xjZGNmYi5jCmluZGV4IGRj NDZiZTM4Yzk3MC4uYzU5MjRmNWU5OGM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2 L3NoX21vYmlsZV9sY2RjZmIuYworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3NoX21vYmlsZV9s Y2RjZmIuYwpAQCAtNTU2LDY3ICs1NTYsNiBAQCBzaF9tb2JpbGVfbGNkY19tdXN0X3JlY29uZmln dXJlKHN0cnVjdCBzaF9tb2JpbGVfbGNkY19jaGFuICpjaCwKIHN0YXRpYyBpbnQgc2hfbW9iaWxl X2xjZGNfY2hlY2tfdmFyKHN0cnVjdCBmYl92YXJfc2NyZWVuaW5mbyAqdmFyLAogCQkJCSAgICBz dHJ1Y3QgZmJfaW5mbyAqaW5mbyk7CiAKLXN0YXRpYyBpbnQgc2hfbW9iaWxlX2xjZGNfZGlzcGxh eV9ub3RpZnkoc3RydWN0IHNoX21vYmlsZV9sY2RjX2NoYW4gKmNoLAotCQkJCQkgZW51bSBzaF9t b2JpbGVfbGNkY19lbnRpdHlfZXZlbnQgZXZlbnQsCi0JCQkJCSBjb25zdCBzdHJ1Y3QgZmJfdmlk ZW9tb2RlICptb2RlLAotCQkJCQkgY29uc3Qgc3RydWN0IGZiX21vbnNwZWNzICptb25zcGVjKQot ewotCXN0cnVjdCBmYl9pbmZvICppbmZvID0gY2gtPmluZm87Ci0Jc3RydWN0IGZiX3Zhcl9zY3Jl ZW5pbmZvIHZhcjsKLQlpbnQgcmV0ID0gMDsKLQotCXN3aXRjaCAoZXZlbnQpIHsKLQljYXNlIFNI X01PQklMRV9MQ0RDX0VWRU5UX0RJU1BMQVlfQ09OTkVDVDoKLQkJLyogSERNSSBwbHVnIGluICov Ci0JCWNvbnNvbGVfbG9jaygpOwotCQlpZiAobG9ja19mYl9pbmZvKGluZm8pKSB7Ci0KLQotCQkJ Y2gtPmRpc3BsYXkud2lkdGggPSBtb25zcGVjLT5tYXhfeCAqIDEwOwotCQkJY2gtPmRpc3BsYXku aGVpZ2h0ID0gbW9uc3BlYy0+bWF4X3kgKiAxMDsKLQotCQkJaWYgKCFzaF9tb2JpbGVfbGNkY19t dXN0X3JlY29uZmlndXJlKGNoLCBtb2RlKSAmJgotCQkJICAgIGluZm8tPnN0YXRlID09IEZCSU5G T19TVEFURV9SVU5OSU5HKSB7Ci0JCQkJLyogRmlyc3QgYWN0aXZhdGlvbiB3aXRoIHRoZSBkZWZh dWx0IG1vbml0b3IuCi0JCQkJICogSnVzdCB0dXJuIG9uLCBpZiB3ZSBydW4gYSByZXN1bWUgaGVy ZSwgdGhlCi0JCQkJICogbG9nbyBkaXNhcHBlYXJzLgotCQkJCSAqLwotCQkJCWluZm8tPnZhci53 aWR0aCA9IGNoLT5kaXNwbGF5LndpZHRoOwotCQkJCWluZm8tPnZhci5oZWlnaHQgPSBjaC0+ZGlz cGxheS5oZWlnaHQ7Ci0JCQkJc2hfbW9iaWxlX2xjZGNfZGlzcGxheV9vbihjaCk7Ci0JCQl9IGVs c2UgewotCQkJCS8qIE5ldyBtb25pdG9yIG9yIGhhdmUgdG8gd2FrZSB1cCAqLwotCQkJCWZiX3Nl dF9zdXNwZW5kKGluZm8sIDApOwotCQkJfQotCi0KLQkJCXVubG9ja19mYl9pbmZvKGluZm8pOwot CQl9Ci0JCWNvbnNvbGVfdW5sb2NrKCk7Ci0JCWJyZWFrOwotCi0JY2FzZSBTSF9NT0JJTEVfTENE Q19FVkVOVF9ESVNQTEFZX0RJU0NPTk5FQ1Q6Ci0JCS8qIEhETUkgZGlzY29ubmVjdCAqLwotCQlj b25zb2xlX2xvY2soKTsKLQkJaWYgKGxvY2tfZmJfaW5mbyhpbmZvKSkgewotCQkJZmJfc2V0X3N1 c3BlbmQoaW5mbywgMSk7Ci0JCQl1bmxvY2tfZmJfaW5mbyhpbmZvKTsKLQkJfQotCQljb25zb2xl X3VubG9jaygpOwotCQlicmVhazsKLQotCWNhc2UgU0hfTU9CSUxFX0xDRENfRVZFTlRfRElTUExB WV9NT0RFOgotCQkvKiBWYWxpZGF0ZSBhIHByb3Bvc2VkIG5ldyBtb2RlICovCi0JCWZiX3ZpZGVv bW9kZV90b192YXIoJnZhciwgbW9kZSk7Ci0JCXZhci5iaXRzX3Blcl9waXhlbCA9IGluZm8tPnZh ci5iaXRzX3Blcl9waXhlbDsKLQkJdmFyLmdyYXlzY2FsZSA9IGluZm8tPnZhci5ncmF5c2NhbGU7 Ci0JCXJldCA9IHNoX21vYmlsZV9sY2RjX2NoZWNrX3ZhcigmdmFyLCBpbmZvKTsKLQkJYnJlYWs7 Ci0JfQotCi0JcmV0dXJuIHJldDsKLX0KLQogLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAqIEZv cm1hdCBoZWxwZXJzCiAgKi8KQEAgLTI1NDAsOCArMjQ3OSw2IEBAIHNoX21vYmlsZV9sY2RjX2No YW5uZWxfaW5pdChzdHJ1Y3Qgc2hfbW9iaWxlX2xjZGNfY2hhbiAqY2gpCiAJdW5zaWduZWQgaW50 IG1heF9zaXplOwogCXVuc2lnbmVkIGludCBpOwogCi0JY2gtPm5vdGlmeSA9IHNoX21vYmlsZV9s Y2RjX2Rpc3BsYXlfbm90aWZ5OwotCiAJLyogVmFsaWRhdGUgdGhlIGZvcm1hdC4gKi8KIAlmb3Jt YXQgPSBzaF9tb2JpbGVfZm9ybWF0X2luZm8oY2ZnLT5mb3VyY2MpOwogCWlmIChmb3JtYXQgPT0g TlVMTCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9zaF9tb2JpbGVfbGNkY2Zi LmggYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3NoX21vYmlsZV9sY2RjZmIuaAppbmRleCBiOGU0N2E4 YmQ4YWIuLjU4OTQwMDM3MjA5OCAxMDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9mYmRldi9zaF9t b2JpbGVfbGNkY2ZiLmgKKysrIGIvZHJpdmVycy92aWRlby9mYmRldi9zaF9tb2JpbGVfbGNkY2Zi LmgKQEAgLTg3LDExICs4Nyw2IEBAIHN0cnVjdCBzaF9tb2JpbGVfbGNkY19jaGFuIHsKIAl1bnNp Z25lZCBsb25nIGJhc2VfYWRkcl9jOwogCXVuc2lnbmVkIGludCBsaW5lX3NpemU7CiAKLQlpbnQg KCpub3RpZnkpKHN0cnVjdCBzaF9tb2JpbGVfbGNkY19jaGFuICpjaCwKLQkJICAgICAgZW51bSBz aF9tb2JpbGVfbGNkY19lbnRpdHlfZXZlbnQgZXZlbnQsCi0JCSAgICAgIGNvbnN0IHN0cnVjdCBm Yl92aWRlb21vZGUgKm1vZGUsCi0JCSAgICAgIGNvbnN0IHN0cnVjdCBmYl9tb25zcGVjcyAqbW9u c3BlYyk7Ci0KIAkvKiBCYWNrbGlnaHQgKi8KIAlzdHJ1Y3QgYmFja2xpZ2h0X2RldmljZSAqYmw7 CiAJdW5zaWduZWQgaW50IGJsX2JyaWdodG5lc3M7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==