Message ID | 9f09274bddc14f555c0102f37af6df23b4433102.1724144570.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915 & drm/xe: rawclk freq cleanups | expand |
Excellent, for both patches: Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Den 2024-08-20 kl. 11:07, skrev Jani Nikula: > With rawclk_freq moved to display runtime info, xe has no users left for > them. > > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 1 - > drivers/gpu/drm/xe/xe_device_types.h | 6 ------ > 2 files changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h > index 2feedddf1e40..182c38905626 100644 > --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h > +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h > @@ -116,7 +116,6 @@ struct i915_sched_attr { > #define i915_gem_fence_wait_priority(fence, attr) do { (void) attr; } while (0) > > #define pdev_to_i915 pdev_to_xe_device > -#define RUNTIME_INFO(xe) (&(xe)->info.i915_runtime) > > #define FORCEWAKE_ALL XE_FORCEWAKE_ALL > > diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h > index cb60bc5ec21b..5ed6f5434f42 100644 > --- a/drivers/gpu/drm/xe/xe_device_types.h > +++ b/drivers/gpu/drm/xe/xe_device_types.h > @@ -305,12 +305,6 @@ struct xe_device { > u8 has_atomic_enable_pte_bit:1; > /** @info.has_device_atomics_on_smem: Supports device atomics on SMEM */ > u8 has_device_atomics_on_smem:1; > - > -#if IS_ENABLED(CONFIG_DRM_XE_DISPLAY) > - struct { > - u32 rawclk_freq; > - } i915_runtime; > -#endif > } info; > > /** @irq: device interrupt state */
On Tue, 20 Aug 2024, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote: > Excellent, for both patches: > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Thanks, both pushed to drm-intel-next. BR, Jani.
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h index 2feedddf1e40..182c38905626 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h @@ -116,7 +116,6 @@ struct i915_sched_attr { #define i915_gem_fence_wait_priority(fence, attr) do { (void) attr; } while (0) #define pdev_to_i915 pdev_to_xe_device -#define RUNTIME_INFO(xe) (&(xe)->info.i915_runtime) #define FORCEWAKE_ALL XE_FORCEWAKE_ALL diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index cb60bc5ec21b..5ed6f5434f42 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -305,12 +305,6 @@ struct xe_device { u8 has_atomic_enable_pte_bit:1; /** @info.has_device_atomics_on_smem: Supports device atomics on SMEM */ u8 has_device_atomics_on_smem:1; - -#if IS_ENABLED(CONFIG_DRM_XE_DISPLAY) - struct { - u32 rawclk_freq; - } i915_runtime; -#endif } info; /** @irq: device interrupt state */