Re: [Intel-xe] [PATCH] fixup! drm/xe/display: Implement display support

[Jani Nikula <jani.nikula@intel.com>]

On Tue, 01 Aug 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> Removing unused declarations.
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Pushed.

BR,
Jani.

> ---
>  .../drm/xe/display/ext/intel_device_info.c    |  1 -
>  .../drm/xe/display/ext/intel_device_info.h    | 38 -------------------
>  drivers/gpu/drm/xe/xe_device_types.h          |  1 -
>  3 files changed, 40 deletions(-)
>  delete mode 100644 drivers/gpu/drm/xe/display/ext/intel_device_info.h
>
> diff --git a/drivers/gpu/drm/xe/display/ext/intel_device_info.c b/drivers/gpu/drm/xe/display/ext/intel_device_info.c
> index 9e9ccdef81f1..614cc2900104 100644
> --- a/drivers/gpu/drm/xe/display/ext/intel_device_info.c
> +++ b/drivers/gpu/drm/xe/display/ext/intel_device_info.c
> @@ -25,7 +25,6 @@
>  #include "intel_cdclk.h"
>  #include "intel_de.h"
>  #include "intel_display.h"
> -#include "intel_device_info.h"
>  #include "i915_drv.h"
>  #include "i915_reg.h"
>  #include <drm/drm_drv.h>
> diff --git a/drivers/gpu/drm/xe/display/ext/intel_device_info.h b/drivers/gpu/drm/xe/display/ext/intel_device_info.h
> deleted file mode 100644
> index 959acb261007..000000000000
> --- a/drivers/gpu/drm/xe/display/ext/intel_device_info.h
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -/*
> - * Copyright © 2014-2017 Intel Corporation
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the next
> - * paragraph) shall be included in all copies or substantial portions of the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> - * IN THE SOFTWARE.
> - *
> - */
> -
> -#ifndef _INTEL_DEVICE_INFO_H_
> -#define _INTEL_DEVICE_INFO_H_
> -
> -#include <linux/types.h>
> -#include "xe_device_types.h"
> -
> -struct drm_i915_private;
> -
> -/* Minimal parts used by xe */
> -#define intel_runtime_info xe_device_display_info
> -
> -void intel_device_info_runtime_init(struct drm_i915_private *dev_priv);
> -
> -#endif
> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
> index b156f69d7320..c60ce94c1aac 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -18,7 +18,6 @@
>  #include "xe_step_types.h"
>  
>  #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
> -#include "ext/intel_device_info.h"
>  #include "soc/intel_pch.h"
>  #include "intel_display_core.h"
>  #include "intel_display_device.h"

-- 
Jani Nikula, Intel Open Source Graphics Center