| Message ID | 6c8fbc2b891094603666cfb59f2884dee6089bd9.1722263308.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/xe & drm/i915: drvdata usage changes | expand |
Quoting Jani Nikula (2024-07-29 11:30:11-03:00) >The display code no longer uses kdev_to_i915() or pdev_to_i915() >helpers. Remove them. > >Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com> >--- > drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 8 -------- > 1 file changed, 8 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 766fba88a3c8..e1d6ce829a0b 100644 >--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h >+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h >@@ -21,13 +21,6 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) > return container_of(dev, struct drm_i915_private, drm); > } > >-static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) >-{ >- struct drm_device *drm = dev_get_drvdata(kdev); >- >- return drm ? to_i915(drm) : NULL; >-} >- > #define IS_PLATFORM(xe, x) ((xe)->info.platform == x) > #define INTEL_INFO(dev_priv) (&((dev_priv)->info)) > #define IS_I830(dev_priv) (dev_priv && 0) >@@ -117,7 +110,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 >-- >2.39.2 >
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 766fba88a3c8..e1d6ce829a0b 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h @@ -21,13 +21,6 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) return container_of(dev, struct drm_i915_private, drm); } -static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) -{ - struct drm_device *drm = dev_get_drvdata(kdev); - - return drm ? to_i915(drm) : NULL; -} - #define IS_PLATFORM(xe, x) ((xe)->info.platform == x) #define INTEL_INFO(dev_priv) (&((dev_priv)->info)) #define IS_I830(dev_priv) (dev_priv && 0) @@ -117,7 +110,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
The display code no longer uses kdev_to_i915() or pdev_to_i915() helpers. Remove them. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 8 -------- 1 file changed, 8 deletions(-)