From patchwork Mon Feb 12 08:19:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 127947 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2985119ljc; Mon, 12 Feb 2018 00:19:43 -0800 (PST) X-Google-Smtp-Source: AH8x225ZmUAlbKfPkPQF06gYpa8Sy+uCAWuIjBRIl86zNiLiDn6UWepcURyeOsN/kUwFmerwPD3j X-Received: by 10.98.10.25 with SMTP id s25mr10860585pfi.137.1518423583213; Mon, 12 Feb 2018 00:19:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518423583; cv=none; d=google.com; s=arc-20160816; b=LT6+GOf9SeW4/ZDbDnUjItTui2Ovjl7SEYRrH/jmy5uB0zgcRik4woOlOLi/n3D2iG Q25NH04y+yhsjySNRnJ++nhd8AYLWDlHIFJ8CZGwT4RfqFw317TJYy6ItrVxvWkxCwl+ wrhIXm6tn0A66tUCK5cLsDJJurT2y7xKkF050URYUOWgk6Q9ahziYpA71J1QRNTFTKD7 ClueTu1J4owr7Z6h8oIUSN+zPcnbARWQu5Dj1WhyfmBnmYxAlVqNlAsF4wv28ZuhWzjq ZpLfecBfwPLtVE6ksIVCVNeWHbn34jxbuZ2Xn6PLmjPFdbJ7hQj01GeZzkfUvnPVzK+l 9Lyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=7ansqYZoQocAjWKUwNthkY+36Uf5xuSGekdbP/EKfUY=; b=r8PBfUFr9VDkcxGhMh/iVpi6jaFrIrhI24dtDCwOYPCfqG5BwhLvz/u56EKQjf0QTh TbhYNN4R35s6mrpUNgIa6BU9+yfo1lhtfjzWbpov6ya0id7T7lKU57TacVLnTBoASyFu zo7OQe2nQ4SYBcu8gI9qs8At+XmYMKX3QcdhQ/NV6bLcXUKlDdc+A89JOn0irtnXuD7b E3586X+6hGyWWM4I3mZEyjHUMtSUeZ5umCXppL08QIpeD7b1vPAQ1l53OPQBenriJab2 2IIJ0sFYM9iRCnr+Ryy3roAbhJiWSFQaKgpjD50tpgfvy93oFWOhdv2BF87C+yVhQMi7 CywQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=MBInRdvs; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id bi10-v6si3683508plb.113.2018.02.12.00.19.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 00:19:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=MBInRdvs; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1EE5689830; Mon, 12 Feb 2018 08:19:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllnx210.ext.ti.com (fllnx210.ext.ti.com [198.47.19.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A29589830 for ; Mon, 12 Feb 2018 08:19:39 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id w1C8Ja6I027546; Mon, 12 Feb 2018 02:19:36 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1518423576; bh=GlLFzbmrS9fJIqeHNdIEVT76Lsg2yGXicxEmYClxdEE=; h=From:To:CC:Subject:Date; b=MBInRdvsyrluRkM4YbzmobQwdf4aaTuRRvYmI+00S4OyWecxuA7LTmR/yutHtj3x6 bzowvcHvkaB9x6uvBOmj4BfNCTkv6KBdplbzlV/whKQhIBrn6fvWRMkPq5J0J8CJBR 74cXt270KcHZQfUE+XdjpInuQXrI2Uecvh1LwCa4= Received: from DLEE103.ent.ti.com (dlee103.ent.ti.com [157.170.170.33]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C8JaUD001340; Mon, 12 Feb 2018 02:19:36 -0600 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 12 Feb 2018 02:19:36 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 12 Feb 2018 02:19:36 -0600 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C8JYkX029541; Mon, 12 Feb 2018 02:19:35 -0600 From: Tomi Valkeinen To: , Laurent Pinchart Subject: [PATCH 1/4] drm/omap: reorganize locking in mgr_fld_write Date: Mon, 12 Feb 2018 10:19:19 +0200 Message-ID: <1518423562-1191-1-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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: Tomi Valkeinen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix sparse warning: drivers/gpu/drm/omapdrm/dss/dispc.c:387:9: warning: context imbalance in 'mgr_fld_write' - different lock contexts for basic block Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dispc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c index 86d18f2d48ba..679931e108f9 100644 --- a/drivers/gpu/drm/omapdrm/dss/dispc.c +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c @@ -384,13 +384,13 @@ static void mgr_fld_write(enum omap_channel channel, const bool need_lock = rfld.reg == DISPC_CONTROL || rfld.reg == DISPC_CONFIG; unsigned long flags; - if (need_lock) + if (need_lock) { spin_lock_irqsave(&dispc.control_lock, flags); - - REG_FLD_MOD(rfld.reg, val, rfld.high, rfld.low); - - if (need_lock) + REG_FLD_MOD(rfld.reg, val, rfld.high, rfld.low); spin_unlock_irqrestore(&dispc.control_lock, flags); + } else { + REG_FLD_MOD(rfld.reg, val, rfld.high, rfld.low); + } } static int dispc_get_num_ovls(void) From patchwork Mon Feb 12 08:19:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 127949 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2985172ljc; Mon, 12 Feb 2018 00:19:47 -0800 (PST) X-Google-Smtp-Source: AH8x226OFWUOg4icOIvzsSDCH9IxJMjYqEwoiem1NYiSnAFkNf8Iiiw0vNHU/6JGH35Q+QnEv7po X-Received: by 2002:a17:902:241:: with SMTP id 59-v6mr10082543plc.280.1518423587575; Mon, 12 Feb 2018 00:19:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518423587; cv=none; d=google.com; s=arc-20160816; b=RIk0bpnpO6FBXcxFYSbviZ6C/WwS7VWjP9DTCzIN//WoT5Sbp2s0whYlMsz36Wiz44 EKqpki7sI4z7tY5O5trcfspCMjNOErjU+ENpChlRz3k0rUUBMzXFujFAeOgNKqwvrvZU dN8RIOYFq3ij3t4fuKFhJTKblWB2zDso3XQ2EHTY4ntokXfXh8aXSdk1l2JsoEW1QyPB rC8W0cHXBY+FzoRtOzDQ5GLP9goboG57tuGj4N9u0ayvSyGUW3eczb9TTVO7zLBugE+f m4rqM6yyDFiqTBZG4vn6xxciXQ+Bgvz+x5EYTVb8vVaxtZw8qzDE64UCLAXqH0T4023X eiZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=BRh03K1oYqwQ60Vi6sg6LIwFGw8MYhpGfeQ96bPpocU=; b=B0LuU1Adlb//B9QIKifw5CT/nJrL4v3deVlEvvibKaf92SjBThbgf7Nat3JlUqj/Fa 95qhd9pP7dkGg3FEgHOb6JdVAix0/Y6sF7MrnNL0OJdPCvMsqZprfkSGr/Kg2lvnVLqC qJ1pli7YNHL8jlsGs+Y798rNdvXNsiHSa84zaKsb6PVZBZ5CjJCWD8pTydgb7X4P7tGt kttPeXyGpwi0jhHEAbwHRrfDE292X6AOe6myunXurakaqO4Vf48vd3mIndlQ5FK4Y3uI +rWlwzvd2R0cdBvQ4s3zD4LvoMMpEsRRjiaZn5/cabQryKYVXkmezA5R/R3RU7QjjqKc /LHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=F0T1I9SB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id r1si1642249pgf.327.2018.02.12.00.19.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 00:19:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=F0T1I9SB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A121689873; Mon, 12 Feb 2018 08:19:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lelnx193.ext.ti.com (lelnx193.ext.ti.com [198.47.27.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEA208986D for ; Mon, 12 Feb 2018 08:19:41 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id w1C8JcPG001468; Mon, 12 Feb 2018 02:19:38 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1518423578; bh=bVSSUK/BgnjAx3h2E7W0Ik83K2UX7zYgFfZcXLNMZhY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=F0T1I9SBntxVJw/LuuDr3ti8Rz2kGVNPn3UPJI7mCGvX2QXvfcp5ALRScVqB28aUo MFm/Y6O72PYlYH0LLRcqaIc17lSkuxHJ73eopWRUSBhc/jQCLOQu714wisvN1v6Uoj utXTggq87/f+jTXiqSKU9mZX1S+dtK0r/sRlak3o= Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C8Jcxq032348; Mon, 12 Feb 2018 02:19:38 -0600 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 12 Feb 2018 02:19:37 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 12 Feb 2018 02:19:37 -0600 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C8JYkY029541; Mon, 12 Feb 2018 02:19:36 -0600 From: Tomi Valkeinen To: , Laurent Pinchart Subject: [PATCH 2/4] drm/omap: acx565akm: use __be32 when reading status Date: Mon, 12 Feb 2018 10:19:20 +0200 Message-ID: <1518423562-1191-2-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518423562-1191-1-git-send-email-tomi.valkeinen@ti.com> References: <1518423562-1191-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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: Tomi Valkeinen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix sparse warning: drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c:224:23: warning: cast to restricted __be32 Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c index c4bb33a247d0..92fe125ce22e 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c @@ -216,12 +216,12 @@ static void set_display_state(struct panel_drv_data *ddata, int enabled) static int panel_enabled(struct panel_drv_data *ddata) { + __be32 v; u32 disp_status; int enabled; - acx565akm_read(ddata, MIPID_CMD_READ_DISP_STATUS, - (u8 *)&disp_status, 4); - disp_status = __be32_to_cpu(disp_status); + acx565akm_read(ddata, MIPID_CMD_READ_DISP_STATUS, (u8 *)&v, 4); + disp_status = __be32_to_cpu(v); enabled = (disp_status & (1 << 17)) && (disp_status & (1 << 10)); dev_dbg(&ddata->spi->dev, "LCD panel %senabled by bootloader (status 0x%04x)\n", From patchwork Mon Feb 12 08:19:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 127950 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2985195ljc; Mon, 12 Feb 2018 00:19:50 -0800 (PST) X-Google-Smtp-Source: AH8x2266CC8MXIfxE9hzpxbxcUWG0JTVL91c0e0I5POFMirGRGX5/4zgSvE6jpd53bUwjjEPUbRd X-Received: by 10.99.39.1 with SMTP id n1mr8609346pgn.155.1518423590710; Mon, 12 Feb 2018 00:19:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518423590; cv=none; d=google.com; s=arc-20160816; b=0i3Tla7oTjvDOrxMI5ovaSw0d8OYobRcOMGCfv6ENGrH2EU0sbdipnf3FQg/eqUw/S hu1HV4LpeOaP/w6bKjsgCKEhnq8XAKUTwWO0/3mUON2MGHQYQ+yu/H5/h0OFnIBw2fWE taKuOvqzX3h+n7e7cPY5Qk3mnHiYOVWW+9GW6h9PWENb242aCrtI0VaO6c+bZ9rrGocm MrBqeL+ORc56cUh3SxM+GRBkyyoJoRs8XsTdG276sAvFPFRopBtzpXURbWnogYy0XHUf 7OlIg3XrSaqS3Cx0Qldsx03IjoJMxxjRrcVzzy6MQgBtB750mywHFt2+7ZAhKzSLPzou BhBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=ZbMUpqwuWPJG0Cb9NCltpDJKcqmaR1eXWk/kNlFlA4E=; b=aL6LCs0926XZn8jAO5HshhK0bx67Ocr29TZuurCD9rxJRJLV5ZB/EWyDn0Lff3+yoN n13ko0r+oLcC6f21Q0pEtgtANULk1ylUXnXPJs5c9xN3xLx7o1BvY2NJKH0tinmUp32U JIVSMqLNw87LkPcnJaTSTBqKih2s3zN3EWX6a5bs6BCEU6kxiOLcGs9NHVnezPWUVm2B yLD5+FNkM2hmB26wBIWuggFYXeqnzGCKS+qOPpb0Wa5u9f74qyvQ99A0AaWT/LJ22gr7 YJUuv2acBHtod0BEWDJmRqw0fEwiinO95Y0O9YEPBRKdri9Hh7BSlgzlbmw3mQCIjFbO ZK9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=ilP/5XxW; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id w12si3390148pgp.407.2018.02.12.00.19.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 00:19:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=ilP/5XxW; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 886E18989C; Mon, 12 Feb 2018 08:19:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lelnx193.ext.ti.com (lelnx193.ext.ti.com [198.47.27.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCA6589864 for ; Mon, 12 Feb 2018 08:19:41 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id w1C8Jda5001472; Mon, 12 Feb 2018 02:19:39 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1518423579; bh=4w3kTTm5ye4ujN9dfgBtz22x0Dijs3vEdrhJ6UXjwMA=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ilP/5XxWs2Uc6KsZ3w3Kkhy1yvLdussOx948TbeMANclQM8PZyfjHvBlBsNmEzm78 f7tP7qfB0o+LVOs4sRNoyYX3TSmrDu2fVqIpN1ihLe5sRuWGrPHdfIIa8pznjuuvFL WWld7eevRR9m49kxnPBoM/wvZyoV9SXmmLz/fTk8= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C8JdXe032360; Mon, 12 Feb 2018 02:19:39 -0600 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 12 Feb 2018 02:19:38 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 12 Feb 2018 02:19:38 -0600 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C8JYkZ029541; Mon, 12 Feb 2018 02:19:38 -0600 From: Tomi Valkeinen To: , Laurent Pinchart Subject: [PATCH 3/4] drm/omap: fbdev: use 'screen_buffer' field Date: Mon, 12 Feb 2018 10:19:21 +0200 Message-ID: <1518423562-1191-3-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518423562-1191-1-git-send-email-tomi.valkeinen@ti.com> References: <1518423562-1191-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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: Tomi Valkeinen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix sparse warning: drivers/gpu/drm/omapdrm/omap_fbdev.c:191:26: warning: incorrect type in assignment (different address spaces) drivers/gpu/drm/omapdrm/omap_fbdev.c:191:26: expected char [noderef] *screen_base drivers/gpu/drm/omapdrm/omap_fbdev.c:191:26: got void * Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index fb309d19ca1b..211ab0b865c9 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c @@ -188,7 +188,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, dev->mode_config.fb_base = dma_addr; - fbi->screen_base = omap_gem_vaddr(fbdev->bo); + fbi->screen_buffer = omap_gem_vaddr(fbdev->bo); fbi->screen_size = fbdev->bo->size; fbi->fix.smem_start = dma_addr; fbi->fix.smem_len = fbdev->bo->size; From patchwork Mon Feb 12 08:19:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 127948 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2985152ljc; Mon, 12 Feb 2018 00:19:45 -0800 (PST) X-Google-Smtp-Source: AH8x225pzRCr6Yo+XBFmTApsOT+jB1pJOloA64bl47ArZLJxTqjD2NPTU52cOhbtQK1XHENf+PlZ X-Received: by 10.99.116.9 with SMTP id p9mr8918515pgc.437.1518423585796; Mon, 12 Feb 2018 00:19:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518423585; cv=none; d=google.com; s=arc-20160816; b=xP5ZpSk21wcL/3Ce167D6uAPrpCuU6Eucaqba9wN0yKqydYec+xi7UVrZKM1JA6rUa Bwr8B2XH1qIrldjeeRWs1XHIgB+bR2qjweqX9R4OKj6jzevmvWSnMZ1yyU9CK50xUraX i4Fmq+ui6rycBKQSnZ8dQHXJn/8yCJUHbBVqxu4rcWzUucp9O80Q2/Fxu0DtHhQKdWH1 XUY/kI/RbJuh+HIAgErUzIgnL5qyufMjzxWNFO4XbBHvCO5Lx3AdAmD8WWTYregVXQeA hKBTZI6D5ScZt02PLNFDmcbFLNHxfU39cEm5pk33TviRy19RQhb9rKBLGlkl3dLk5nCF rvOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=CbjDVFYWa/V6zsRWnsz4IEhIL69WCbH/W845a9q3Vxo=; b=r/6Zu2hKFDOf4ulAt+Mbxj9cmwhluPBT2gVcIdhefE2kO5ZzUZl34rKNsDbgA1NtBQ 2lz+/J28WRDPfSZiAFzzv78YC9kMq0wgDHB/HImTOaAdJ3+dwTjcQ6MkahRxJE2B9PsI 8S+P2Zwg19raohJgpIeE6N+BAXG7jQlYlgZ6V+wp+YYxcbLrbe5QexY9w5W+iyiZ9b+b WJNBD75CQK9zFQVfmGL1rdIvZoAItU7aUZGcYVP1XIBD0kUFZlj12eW1CHOrl+/MOlQ+ EvyPZRUHf0sxOzo65o9vVPG/EmGbrwio8Ot6OddGFjhcBhaybkG0tply0J1ZLTx7zLQT xdSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=HcQ0WVk0; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id e27si3858596pfk.256.2018.02.12.00.19.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 00:19:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=HcQ0WVk0; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B631589836; Mon, 12 Feb 2018 08:19:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllnx210.ext.ti.com (fllnx210.ext.ti.com [198.47.19.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id CECEB89836 for ; Mon, 12 Feb 2018 08:19:42 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id w1C8Je8o027558; Mon, 12 Feb 2018 02:19:40 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1518423580; bh=KJc8X42x/Czm5sPZaXqNeRQwkJ0NvdXVCbihHz88McU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=HcQ0WVk02tw9mf7poBgbfJWIWtEglxME9fzzSDN2NmIzCSPwJSDfxjNieUVm7B8Gw uoTL+JUu/YrGZF35Ekw6xEWNkTTZvZF4PDOFV7dTTX0y1/LmWivBLEZXp4qJqPG13Y D2DhPr6lAuudbmdeY0nK7qG84ZA98ilNEsQDuFi4= Received: from DFLE100.ent.ti.com (dfle100.ent.ti.com [10.64.6.21]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C8JeTW001375; Mon, 12 Feb 2018 02:19:40 -0600 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 12 Feb 2018 02:19:40 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 12 Feb 2018 02:19:40 -0600 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C8JYka029541; Mon, 12 Feb 2018 02:19:39 -0600 From: Tomi Valkeinen To: , Laurent Pinchart Subject: [PATCH 4/4] drm/omap: fbdev: avoid double initializer entry Date: Mon, 12 Feb 2018 10:19:22 +0200 Message-ID: <1518423562-1191-4-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518423562-1191-1-git-send-email-tomi.valkeinen@ti.com> References: <1518423562-1191-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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: Tomi Valkeinen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix sparse warning: drivers/gpu/drm/omapdrm/omap_fbdev.c:83:9: warning: Initializer entry defined twice drivers/gpu/drm/omapdrm/omap_fbdev.c:91:10: also defined here Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_fbdev.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index 211ab0b865c9..1ace63e2ff22 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c @@ -80,15 +80,21 @@ static int omap_fbdev_pan_display(struct fb_var_screeninfo *var, static struct fb_ops omap_fb_ops = { .owner = THIS_MODULE, - DRM_FB_HELPER_DEFAULT_OPS, + + .fb_check_var = drm_fb_helper_check_var, + .fb_set_par = drm_fb_helper_set_par, + .fb_setcmap = drm_fb_helper_setcmap, + .fb_blank = drm_fb_helper_blank, + .fb_pan_display = omap_fbdev_pan_display, + .fb_debug_enter = drm_fb_helper_debug_enter, + .fb_debug_leave = drm_fb_helper_debug_leave, + .fb_ioctl = drm_fb_helper_ioctl, .fb_read = drm_fb_helper_sys_read, .fb_write = drm_fb_helper_sys_write, .fb_fillrect = drm_fb_helper_sys_fillrect, .fb_copyarea = drm_fb_helper_sys_copyarea, .fb_imageblit = drm_fb_helper_sys_imageblit, - - .fb_pan_display = omap_fbdev_pan_display, }; static int omap_fbdev_create(struct drm_fb_helper *helper,