Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751045AbbHaEBP (ORCPT ); Mon, 31 Aug 2015 00:01:15 -0400 Received: from mail-by2on0099.outbound.protection.outlook.com ([207.46.100.99]:20944 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750713AbbHaEBM (ORCPT ); Mon, 31 Aug 2015 00:01:12 -0400 Authentication-Results: spf=softfail (sender IP is 192.88.158.2) smtp.mailfrom=gmail.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=fail action=none header.from=gmail.com;gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=fail action=none header.from=gmail.com; From: Jianwei Wang To: CC: , , , Jianwei Wang Subject: [PATCH] drm/fsl-dcu: Fix no fb check bug Date: Mon, 31 Aug 2015 11:39:57 +0800 Message-ID: <1440992397-40533-1-git-send-email-jianwei.wang.chn@gmail.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 130854663386865427;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD053;1:BzltHFX3rnpi0PpMG0R15s6R/jvEZA5l/NOEC5IrHA/dRc3qvMhF907x3HPh5+O8YSQUDDdZ3nZpsuu/edom2eXtmAn74eXZ5MVKuiGx5kApJWgBuNBF/reTUcCzgDwjSFxmu2sAEUtbSD1XBBgB31BJRKfYCx4A1113Y3qtXjUYaS0AmeF64awbnNrYDzdz4aBmPN/PplYes462cPrahjFA7k3tzbIOG0Z1pH97isQBP8seOQtH4uCvecjZMtx48lRLM4Gm8LiZgKlRH2My/lkdm3sdOWRAy1F9oPH+/fk42+K2sZPys3sLnCZrCBRoQHlGF9uhJjwAVKREfGtxLGYRkxVXCEa4lkrBHr6Zo2OSkzpgzKqVtVotr0fGju0TstSWdAJykRH18bIkWoS5WKSSFu8sw/LsEg3INkCfW94= X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(3050300001)(189002)(199003)(69596002)(189998001)(5001960100002)(229853001)(46102003)(77156002)(5003940100001)(50986999)(87936001)(6260500002)(55446002)(47776003)(62966003)(92566002)(76482005)(105596002)(5001860100001)(73392002)(81156007)(110136002)(106466001)(2351001)(5001830100001)(86362001)(97736004)(50226001)(4001540100001)(48376002)(87572001)(19580395003)(68736005)(77096005)(5007970100001)(36756003)(61266001)(50466002)(82202001)(64706001)(104016003)(33646002)(73972006)(83322999)(19580405001)(6806004)(81442002);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB324;H:az84smr01.freescale.net;FPR:;SPF:SoftFail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB324;2:gze8oGFYPkMyrog6eZgEkeUrV8n2NpirJU+lrIfSDZnDaq1/IxxB7+2hB6GDHacj7NI08CAfqLA5ynBMAyeOWy9JRTGSn1yJgH95ObbNiSRn8rREEd45itPt/CXOC5F+p98msymuxMaTLySUJZy+ZSeliPtvzlJ0ycjgzWQQ5sk=;3:m2rspxgBZtrF60Rfv8LgWM5VHHcfJV2qeSiblVt4/M1AvzUVrkUw32OEQ0TktAAPhTn+GKfqsDpxLe5ympUguOkElFRoU/lHetboc3K4dMlkiB3TskHtyeLnN8nCk5iHC23Mb/EtoaPhu9rR8c1Nqcqn3IyNHVGU3x9y1UWLFcT33l+yI/hNcYDPRJDaD5S6vEWjeQZCElREcrPTG4DZojKAzvgsatUliDDaqYvBEn0=;25:131mqNd5F92c/fEaKAfdvpe51vHWTuObShsK2jgcjo82yV2PRkqGMGbByqrr85YO0aeNgH68xziBH4XfmDMaThPITm/k9k6+eMpsb6pAG6Y/CHgYJziYnS5rp+M1NH9WiXhw5WnYrTAIJwTVjw5PdpiqqZo3j/bXDxtWzXGHsTY1yIctvTTXUQOsdhzr1n2KvimX/yMoskOoHsCm/ghIM83LUKRVOy/v817kDQFfNeBGFd+vaJ28WhTsT0GzysCF5JmIs03AYMoQSSwpxeLRvA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB324;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB147; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(8121501046)(3002001);SRVR:BL2PR03MB324;BCL:0;PCL:0;RULEID:(400006);SRVR:BL2PR03MB324; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB324;4:bPjQ8Gsap+Ge+Qh5zrt9cYF7YJJdRO9nCLifILPQZBb6ubjzTBI11vFeE1oLmWWakw/TUfThauI5OZj+lOtnHVmUk5GUgIZOoirolcrUwdwcAvV/ZeVSX5UICJ3K+/6D+FmXQwnxduWTeTmZhh47nrlCWNtyqjqk7wyTExCM7u3RNjgIssEj40xewR0u1hniyP76qDiNXH1T5S4aZPwaygcHGrgZwOtftGoBL8JpSCJX7rJgeyQO9JxdZLZ3LmpGQJ/CWuoXOsYj+vYT/7LWuh8r+f/+mn9w+kBy0Qm+OzJnyHn2mnID6xbe/gqUHmMibX6S1ZMj0LCjGcwjcu8f3Q== X-Forefront-PRVS: 0685122203 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB324;23:+akwig3/QV4ec2BBpbsS4bop7g/VJIZVHF2GA8Xvia?= =?us-ascii?Q?0FuLtixCWdz1d5Ek7Blxp9Cms98LB0vfr2wTWklFOr+QtfHZeFfWe4rcqCNH?= =?us-ascii?Q?lIrgdy4gOOIrb0Wvx9R8wckEhPL+SCk95j/Zz0//OBj2ia1MybIqnJDxczCk?= =?us-ascii?Q?AjY9YxMoj7mdq5xLQtSd/pdqi6vlNI4/2DMvW0aeEeJ54BGOZ+kRJP5IjCdf?= =?us-ascii?Q?FKyneS8zC6s/PgI1TsVyzZBb85mzhRuiUIg7/SsZEIMPD1RzqibWTh/Pik/8?= =?us-ascii?Q?QyVs5izogXB+1E9hvEidWm7vJpZyT/o5+bMqQxSAbo317bZyu1Rd04KuVdX/?= =?us-ascii?Q?h7N0UrTDaG2CxHSzdpU2ZoOgYJseqL8D9iMufKXzLFSmQ9tetReT04QgXrmG?= =?us-ascii?Q?ixAsIW5MNS9gKTR61qWE0ssPiuzqPG6uTHq+D7l+9W4XfowzGBaaLnyFUHVP?= =?us-ascii?Q?Y8mZwZGvBJdPfQEjW4US0D8VCXkml7WLHSvEvtpJp04K3lrBLOJi8nu/onyB?= =?us-ascii?Q?lX27BSQq4wci+Djn6x3lQxyVL+Jxfw1jrowE/n1ltjBaOOZJ2IPzqS5p1weZ?= =?us-ascii?Q?ImgelJQFedk8E8Z0Noj+YQQzbaiRauMLjzzbrAeVZPgmZgPGVOB7SgrgPAZd?= =?us-ascii?Q?JrvHUxMTpXnWxBKbGN7Wjuv8abYRI/ApHaAkQ/vz6isHQDV4LhDI6MhchuoB?= =?us-ascii?Q?VpuCLPpBC/4A/RK5Z0jsrWTnX6TbgvCC50QfBSxsLHzANDRMx1uZZhwYYhua?= =?us-ascii?Q?ywVHRjKffAsHb/MXvu5mlwrOWSYQhgzECONxsKJ0skIDaeH9hMB/9feufhb3?= =?us-ascii?Q?tgl3b70Gq1Lm5wWSIkienG73eEZSWfoQI8ziN/8rb4ESEIviT2dsKLnH22EO?= =?us-ascii?Q?bG5diyRLl5PDM8ON6HxVCXscsCAFO4ZqEsG/8EU27kyJ/stt9PIJ/FDHJ4JJ?= =?us-ascii?Q?nScEMfluAecoHJVWXHABmyJlKovvTFLX01qLeaLCpc9IMuHcDqUmpZAK/pvu?= =?us-ascii?Q?+N5qg8dqHCLm6oOLOSdo6OOlzAGemawkj6BfD8OZnTdwP+FiZzAqBgL8dmxM?= =?us-ascii?Q?7NmYALoHO6x+GPMV0Ip/2wEEascGSbuU352JTMZ2qGW/aXW6ynvlDGOp7j4+?= =?us-ascii?Q?exKJ9ZBECWNbgYAJHBDEXRROqy2xCN14sHujG3tFcrJ7i+TgVunEoN4n/HYK?= =?us-ascii?Q?beTq5DksH/KOdsb7daOx0FyW9dVAAFjOMu5eqvOxIFnlm9AxiRoBGHplMyuh?= =?us-ascii?Q?oQf8dV8WhvXWkUHnKB015OmpCNlUGhapmfSp4CRslUo2Ps0doaHiD+QogSo4?= =?us-ascii?Q?0XkLSgdFd8fjoZvL5wHAI=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB324;5:axiUoVMu/VMEcaEe45d7MqTCBCCzhqBdj4QlT4njePnSk/z8xMWXfDjBo3PLLsjKTcaN2DEZyuFlbr0NkF34IlKjgr2/TIeE1H7K4uH+1lMNYzn9nNCo4u6yQ/pQgCc5isboXcyRN46O/qC1AtQY3ZTBYtlUyURwi3lteRDg/p0=;24:hhz1icLaMfeg8Del6D6VuzyhZncUztyABwIeGBxvSPG2YJAYG75wq9LVzUnjX6rQt35bx6h1mFOahSAnWAT+vowOhM2Jbjc6wcgU6lpN51c= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2015 03:45:38.4213 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB324 X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB147;2:nL2PtrUABlR+8KNf1qiovGTlOGHS2TerIlOIiOLC7YGC4ThzOtfsqLrmzwa7A8gCJckCNeot+c8AGf9GgvKSJjxW5VFBYD8glI4VXtyyNIrPdbAk1C7Q6BUba7EW8MwoAjVj2mbbgcj5EI6Rr9lzz0SWlre81Wvr+2gCRnlEr+k=;3:6YTqtWsut1BEbjJdVJ3Krtw7BaKF5TXEiLcQK6YNy5N0o0wwINd9BL2E4A7uE+3Sy3MyaIvjh9UDDpuIJ/tQeu+tpz/ZQ+6pntMwvw9RXBj9+N9c6RGoeVuZnM8jG1EQzDMmz/uRXRe+zFyhdWisw7J2RA5Dt95PMaBNMlzmG2fibuHen5iTBcFMVTOmdfTpcFprvxxPD1P52rN3CuB95nmTNCyQEc1WsNO81AbTc6k=;25:MpMNXMOIdG9emkBimvWuarlTLx6pSRsQ6tAHWpBDCezxWAMdgihfaI/+bOyktbZrjwESujDltceQ4znmFdWOlmKjQOtNmMxtKQt7KZ+BSzlQinuIDp9kvX9njYq5PF2pbJ8HsUtcDL3lTgvZvZfPtE9pvkqw6XcVKtGQspY1pxOAYaXyk4CDLXeX4o/98PR2yy+nN5eQXiuFPTZSDz1wQ+KqQeExfu+V/1pBiKTwY4P1DdynapwaJDbwfkCckaA66jMp9Gp+8x3OGI4ztCaqzg==;23:AcZT3T+SCgyaC0tt05whU/OJw65CB/ONqQnVL9rEPcp9YFHBchyTdzx5g4FbFwOvOhgsNvzYn3pQg1cAsCNc3d1DjergTB691B/jTS6t0wOMj8Dw6nzEIxXJBFFyGtlWXj7oHIvlRlPtKQHUCMKY962ZB+VXYwE9D6sAvFwXhbE= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1294 Lines: 41 For state->fb may be NULL in fsl_dcu_drm_plane_atomic_check function, if so, return -EINVAL. No need check in fsl_dcu_drm_plane_atomic_update anymore. Signed-off-by: Jianwei Wang --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c index 82be6b8..8787920 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c @@ -41,6 +41,9 @@ static int fsl_dcu_drm_plane_atomic_check(struct drm_plane *plane, { struct drm_framebuffer *fb = state->fb; + if (!fb) + return -EINVAL; + switch (fb->pixel_format) { case DRM_FORMAT_RGB565: case DRM_FORMAT_RGB888: @@ -84,9 +87,6 @@ static void fsl_dcu_drm_plane_atomic_update(struct drm_plane *plane, unsigned int alpha, bpp; int index, ret; - if (!fb) - return; - index = fsl_dcu_drm_plane_index(plane); if (index < 0) return; -- 2.1.0.27.g96db324 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/