Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f54dc1486d13d44766cdb6551d094313f077b535

Authored by Xianzhong
Committed by Jason Liu
1 parent b4520dcfc6
Exists in smarc_8mm_imx_4.14.98_2.0.0_ga and in 4 other branches smarc-imx6_4.14.98_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga

MGS-4656 [#imx-1381] fix the wrong device check for imx8 gpu subsystem 

should check imx8-gpu instead of imx8x-gpu string for i.mx8 gpu sub-system

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
(cherry picked from commit ce6483c43465651469c75b0e5093bdc749866f84)

Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff

drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.c
Diff comments   View file @ f54dc14
... ... @@ -3,6 +3,7 @@
3 3 * The MIT License (MIT)
4 4 *
5 5 * Copyright (c) 2014 - 2018 Vivante Corporation
  6 +* Copyright 2019 NXP
6 7 *
7 8 * Permission is hereby granted, free of charge, to any person obtaining a
8 9 * copy of this software and associated documentation files (the "Software"),
... ... @@ -27,6 +28,7 @@
27 28 * The GPL License (GPL)
28 29 *
29 30 * Copyright (C) 2014 - 2018 Vivante Corporation
  31 +* Copyright 2019 NXP
30 32 *
31 33 * This program is free software; you can redistribute it and/or
32 34 * modify it under the terms of the GNU General Public License
33 35  
... ... @@ -1611,11 +1613,11 @@
1611 1613 #ifdef IMX_GPU_SUBSYSTEM
1612 1614 if (of_find_compatible_node(NULL, NULL, "fsl,imx8-gpu-ss")) {
1613 1615 use_imx_gpu_subsystem = 1;
1614   - }
1615 1616  
1616   - if (of_find_compatible_node(NULL, NULL, "fsl,imx8x-gpu")) {
1617   - printk(KERN_ERR "Incorrect device-tree, please update dtb.");
1618   - return -EINVAL;
  1617 + if (!of_find_compatible_node(NULL, NULL, "fsl,imx8-gpu")) {
  1618 + printk(KERN_ERR "Incorrect device-tree, please update dtb.");
  1619 + return -EINVAL;
  1620 + }
1619 1621 }
1620 1622 #endif
1621 1623