Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "msm: kgsl: Return error on gmu request irq failure"

Browse source
This commit is contained in:
qctecmdr 2020-01-13 09:09:29 -08:00 • committed by Gerrit - the friendly Code Review server
commit 67765b382b
1 changed files with 11 additions and 8 deletions

19
drivers/gpu/msm/kgsl_gmu.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
*/
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
@ -1339,14 +1339,17 @@ static int gmu_probe(struct kgsl_device *device, struct device_node *node)
device->gmu_core.reg_len = gmu->reg_len;
/* Initialize HFI and GMU interrupts */
hfi->hfi_interrupt_num = kgsl_request_irq(gmu->pdev, "kgsl_hfi_irq",
hfi_irq_handler, device);
gmu->gmu_interrupt_num = kgsl_request_irq(gmu->pdev, "kgsl_gmu_irq",
gmu_irq_handler, device);
if (hfi->hfi_interrupt_num < 0 || gmu->gmu_interrupt_num < 0)
ret = kgsl_request_irq(gmu->pdev, "kgsl_hfi_irq",
hfi_irq_handler, device);
if (ret < 0)
goto error;
hfi->hfi_interrupt_num = ret;
ret = kgsl_request_irq(gmu->pdev, "kgsl_gmu_irq",
gmu_irq_handler, device);
if (ret < 0)
goto error;
gmu->gmu_interrupt_num = ret;
/* Don't enable GMU interrupts until GMU started */
/* We cannot use irq_disable because it writes registers */