diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2024-09-11 09:57:18 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2024-09-11 09:57:18 +0200 |
| commit | 02189ca8411253aa1328e9dd6137a40e390a5b37 (patch) | |
| tree | 94aa1a3f7aa6e863a790092dfe9d3b53c27565c3 /drivers/gpu/drm/msm/msm_gpu.c | |
| parent | drm/i915/bios: fix printk format width (diff) | |
| parent | Merge v6.11-rc7 into drm-next (diff) | |
| download | linux-02189ca8411253aa1328e9dd6137a40e390a5b37.tar.xz linux-02189ca8411253aa1328e9dd6137a40e390a5b37.zip | |
Merge drm/drm-next into drm-intel-next
Sync the branches to resolve the conflict reported in the below link.
Link: https://lore.kernel.org/r/20240906131502.7a7d1962@canb.auug.org.au
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 3666b42b4ecd..a274b8466423 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -931,7 +931,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, if (IS_ERR(gpu->gpu_cx)) gpu->gpu_cx = NULL; - gpu->pdev = pdev; platform_set_drvdata(pdev, &gpu->adreno_smmu); msm_devfreq_init(gpu); |