Merge "bus: mhi: misc: Add check for dev_rp if it is iommu range or not"
diff --git a/drivers/gpu/msm/kgsl_drawobj.c b/drivers/gpu/msm/kgsl_drawobj.c
index fc53176..63fefc5 100644
--- a/drivers/gpu/msm/kgsl_drawobj.c
+++ b/drivers/gpu/msm/kgsl_drawobj.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
*/
/*
@@ -283,7 +283,7 @@
}
}
-static void drawobj_sync_timeline_fence_work(struct irq_work *work)
+static void drawobj_sync_timeline_fence_work(struct work_struct *work)
{
struct kgsl_drawobj_sync_event *event = container_of(work,
struct kgsl_drawobj_sync_event, work);
@@ -303,7 +303,7 @@
* removing the fence
*/
if (drawobj_sync_expire(event->device, event))
- irq_work_queue(&event->work);
+ queue_work(kgsl_driver.mem_workqueue, &event->work);
}
static void syncobj_destroy(struct kgsl_drawobj *drawobj)
@@ -497,7 +497,7 @@
event->device = device;
event->context = NULL;
event->fence = fence;
- init_irq_work(&event->work, drawobj_sync_timeline_fence_work);
+ INIT_WORK(&event->work, drawobj_sync_timeline_fence_work);
INIT_LIST_HEAD(&event->cb.node);
diff --git a/drivers/gpu/msm/kgsl_drawobj.h b/drivers/gpu/msm/kgsl_drawobj.h
index f61c5d6..cd905a6 100644
--- a/drivers/gpu/msm/kgsl_drawobj.h
+++ b/drivers/gpu/msm/kgsl_drawobj.h
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2016-2019, 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef __KGSL_DRAWOBJ_H
@@ -169,8 +170,8 @@
struct dma_fence *fence;
/** @cb: Callback struct for KGSL_CMD_SYNCPOINT_TYPE_TIMELINE */
struct dma_fence_cb cb;
- /** @work : irq worker for KGSL_CMD_SYNCPOINT_TYPE_TIMELINE */
- struct irq_work work;
+ /** @work : work_struct for KGSL_CMD_SYNCPOINT_TYPE_TIMELINE */
+ struct work_struct work;
};
/**