Commit f719c2a2 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/intel/pciids: rename i915_pciids.h to just pciids.h 



In preparation of sharing the PCI ID macros between i915 and xe, rename
i915_pciids.h to pciids.h.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/835143845faa5310e4bb58405a8a0848392bbf06.1729590029.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 1db363f6

arch/x86/kernel/early-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/bcma/bcma_regs.h>

#include <linux/platform_data/x86/apple.h>

#include <drm/intel/i915_drm.h>

#include <drm/intel/i915_pciids.h>

#include <drm/intel/pciids.h>

#include <asm/pci-direct.h>

#include <asm/dma.h>

#include <asm/io_apic.h>

drivers/gpu/drm/i915/display/intel_display_device.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright © 2023 Intel Corporation

 */



#include <drm/intel/i915_pciids.h>

#include <drm/intel/pciids.h>

#include <drm/drm_color_mgmt.h>

#include <linux/pci.h>

drivers/gpu/drm/i915/i915_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <drm/drm_color_mgmt.h>

#include <drm/drm_drv.h>

#include <drm/intel/i915_pciids.h>

#include <drm/intel/pciids.h>



#include "display/intel_display_driver.h"

#include "gt/intel_gt_regs.h"

drivers/gpu/drm/i915/intel_device_info.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/string_helpers.h>



#include <drm/drm_print.h>

#include <drm/intel/i915_pciids.h>

#include <drm/intel/pciids.h>



#include "gt/intel_gt_regs.h"

#include "i915_drv.h"

include/drm/intel/i915_pciids.h→include/drm/intel/pciids.h

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */

#ifndef _I915_PCIIDS_H

#define _I915_PCIIDS_H

#ifndef __PCIIDS_H__

#define __PCIIDS_H__



#ifdef __KERNEL__

#define INTEL_VGA_DEVICE(_id, _info) { \
@@ -822,4 +822,4 @@ 
	MACRO__(0xB0A1, ## __VA_ARGS__), \

	MACRO__(0xB0A2, ## __VA_ARGS__)



#endif /* _I915_PCIIDS_H */
 
#endif /* __PCIIDS_H__ */