@@ -298,7 +298,6 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915)
*/
void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
{
- struct intel_device_info *info = mkwrite_device_info(dev_priv);
struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv);
enum pipe pipe;
@@ -424,7 +423,6 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
if (!HAS_DISPLAY(dev_priv)) {
dev_priv->drm.driver_features &= ~(DRIVER_MODESET |
DRIVER_ATOMIC);
- memset(&info->display, 0, sizeof(info->display));
memset(runtime->num_sprites, 0, sizeof(runtime->num_sprites));
memset(runtime->num_scalers, 0, sizeof(runtime->num_scalers));
}
This is the last blocker in making device info a pointer to const data. Hopefully resetting pipe_mask to 0 and thus ensuring HAS_DISPLAY() is false is enough, and we don't go ahead and do something with the display info regardless. Fingers crossed. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_device_info.c | 2 -- 1 file changed, 2 deletions(-)