Check for errors instead of silently not using icc if the msm driver probes before the interconnect driver. Allow ENODATA for ocmem path, as it is optional and this error is returned when "gfx-mem" path is provided but not "ocmem". Because msm_gpu_cleanup assumes msm_gpu_init has been called, the icc path init needs to be after msm_gpu_init for the error path to work. v2: changed to not only check for EPROBE_DEFER v3: move icc path init after msm_gpu_init to avoid deleting a WARN_ON v4: added two patches to fix issues with probe deferring later in v3 Jonathan Marek (3): drm/msm: fix unbalanced pm_runtime_enable in adreno_gpu_{init,cleanup} drm/msm: reset devfreq freq_table/max_state before devfreq_add_device drm/msm: handle for EPROBE_DEFER for of_icc_get drivers/gpu/drm/msm/adreno/adreno_gpu.c | 68 +++++++++++++++---------- drivers/gpu/drm/msm/msm_gpu.c | 4 ++ 2 files changed, 45 insertions(+), 27 deletions(-) -- 2.26.1