diff options
| author | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2025-03-19 11:08:52 +0100 |
|---|---|---|
| committer | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2025-03-19 11:08:52 +0100 |
| commit | 52eb8cd788f1a56a0645c1f6650e5795e04aaed0 (patch) | |
| tree | 1d61fd7dbe5e7540e972069349b95ac65cd36880 /drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h | |
| parent | 28f79ac609de2797cccdd5fa6c4d5ec8bcef92b4 (diff) | |
| parent | 5da39dce1fa3c81dc6552a16a9f748ba2980d630 (diff) | |
Merge drm/drm-next into drm-xe-next
Backmerging to bring in the xe shrinker from drm-next.
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h index b03664c66dd61..4f3b7b5d9c1fe 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h @@ -50,6 +50,7 @@ struct amdgpu_isp { struct mfd_cell *isp_cell; struct resource *isp_res; struct resource *isp_i2c_res; + struct resource *isp_gpio_res; struct isp_platform_data *isp_pdata; unsigned int harvest_config; const struct firmware *fw; |