mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-24 23:13:37 -04:00
drm/imagination: Rename FW booted to FW initialised
Rename the variable from 'booted' to 'initialised' to align with the driver's expectations and state, indicating that FW boot initialisation is complete and the firmware is fully initialised. Signed-off-by: Brajesh Gupta <brajesh.gupta@imgtec.com> Reviewed-by: Matt Coster <matt.coster@imgtec.com> Link: https://patch.msgid.link/20260519-b4-context_reset-v2-3-931018a7131d@imgtec.com Signed-off-by: Matt Coster <matt.coster@imgtec.com>
This commit is contained in:
committed by
Matt Coster
parent
ee7cb74253
commit
42577ba79f
@@ -213,7 +213,7 @@ static irqreturn_t pvr_device_irq_thread_handler(int irq, void *data)
|
||||
while (pvr_fw_irq_pending(pvr_dev)) {
|
||||
pvr_fw_irq_clear(pvr_dev);
|
||||
|
||||
if (pvr_dev->fw_dev.booted) {
|
||||
if (pvr_dev->fw_dev.initialised) {
|
||||
pvr_fwccb_process(pvr_dev);
|
||||
pvr_kccb_wake_up_waiters(pvr_dev);
|
||||
pvr_device_process_active_queues(pvr_dev);
|
||||
|
||||
@@ -1004,7 +1004,7 @@ pvr_fw_init(struct pvr_device *pvr_dev)
|
||||
goto err_fw_stop;
|
||||
}
|
||||
|
||||
fw_dev->booted = true;
|
||||
fw_dev->initialised = true;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -1044,7 +1044,7 @@ pvr_fw_fini(struct pvr_device *pvr_dev)
|
||||
{
|
||||
struct pvr_fw_device *fw_dev = &pvr_dev->fw_dev;
|
||||
|
||||
fw_dev->booted = false;
|
||||
fw_dev->initialised = false;
|
||||
|
||||
pvr_fw_destroy_structures(pvr_dev);
|
||||
pvr_fw_object_unmap_and_destroy(pvr_dev->kccb.rtn_obj);
|
||||
|
||||
@@ -295,8 +295,11 @@ struct pvr_fw_device {
|
||||
/** @mem: Structure containing objects representing firmware memory allocations. */
|
||||
struct pvr_fw_mem mem;
|
||||
|
||||
/** @booted: %true if the firmware has been booted, %false otherwise. */
|
||||
bool booted;
|
||||
/**
|
||||
* @initialised: %true if the firmware has been successfully initialised,
|
||||
* %false otherwise.
|
||||
*/
|
||||
bool initialised;
|
||||
|
||||
/**
|
||||
* @processor_type: FW processor type for this device. Must be one of
|
||||
|
||||
@@ -133,8 +133,8 @@ int pvr_mmu_flush_exec(struct pvr_device *pvr_dev, bool wait)
|
||||
if (!drm_dev_enter(from_pvr_device(pvr_dev), &idx))
|
||||
return -EIO;
|
||||
|
||||
/* Can't flush MMU if the firmware hasn't booted yet. */
|
||||
if (!pvr_dev->fw_dev.booted)
|
||||
/* Can't flush MMU if the firmware hasn't been initialised yet. */
|
||||
if (!pvr_dev->fw_dev.initialised)
|
||||
goto err_drm_dev_exit;
|
||||
|
||||
cmd_mmu_cache_data->cache_flags =
|
||||
|
||||
@@ -216,7 +216,7 @@ pvr_watchdog_worker(struct work_struct *work)
|
||||
if (pm_runtime_get_if_in_use(from_pvr_device(pvr_dev)->dev) <= 0)
|
||||
goto out_requeue;
|
||||
|
||||
if (!pvr_dev->fw_dev.booted)
|
||||
if (!pvr_dev->fw_dev.initialised)
|
||||
goto out_pm_runtime_put;
|
||||
|
||||
stalled = pvr_watchdog_kccb_stalled(pvr_dev);
|
||||
@@ -378,8 +378,8 @@ pvr_power_device_suspend(struct device *dev)
|
||||
if (!drm_dev_enter(drm_dev, &idx))
|
||||
return -EIO;
|
||||
|
||||
if (pvr_dev->fw_dev.booted) {
|
||||
err = pvr_power_fw_disable(pvr_dev, false, true);
|
||||
if (pvr_dev->fw_dev.initialised) {
|
||||
err = pvr_power_fw_disable(pvr_dev, false);
|
||||
if (err)
|
||||
goto err_drm_dev_exit;
|
||||
}
|
||||
@@ -408,8 +408,8 @@ pvr_power_device_resume(struct device *dev)
|
||||
if (err)
|
||||
goto err_drm_dev_exit;
|
||||
|
||||
if (pvr_dev->fw_dev.booted) {
|
||||
err = pvr_power_fw_enable(pvr_dev, true);
|
||||
if (pvr_dev->fw_dev.initialised) {
|
||||
err = pvr_power_fw_enable(pvr_dev);
|
||||
if (err)
|
||||
goto err_power_off;
|
||||
}
|
||||
@@ -548,7 +548,7 @@ pvr_power_reset(struct pvr_device *pvr_dev, bool hard_reset)
|
||||
err = pvr_power_fw_disable(pvr_dev, hard_reset, false);
|
||||
if (!err) {
|
||||
if (hard_reset) {
|
||||
pvr_dev->fw_dev.booted = false;
|
||||
pvr_dev->fw_dev.initialised = false;
|
||||
WARN_ON(pvr_power_device_suspend(from_pvr_device(pvr_dev)->dev));
|
||||
|
||||
err = pvr_fw_hard_reset(pvr_dev);
|
||||
@@ -556,7 +556,7 @@ pvr_power_reset(struct pvr_device *pvr_dev, bool hard_reset)
|
||||
goto err_device_lost;
|
||||
|
||||
err = pvr_power_device_resume(from_pvr_device(pvr_dev)->dev);
|
||||
pvr_dev->fw_dev.booted = true;
|
||||
pvr_dev->fw_dev.initialised = true;
|
||||
if (err)
|
||||
goto err_device_lost;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user