Commit 44e69495 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Rodrigo Vivi
Browse files

drm/xe/display: Implement display support 



As for display, the intent is to share the display code with the i915
driver so that there is maximum reuse there.

We do this by recompiling i915/display code twice.
Now that i915 has been adapted to support the Xe build, we can add
the xe/display support.

This initial work is a collaboration of many people and unfortunately
this squashed patch won't fully honor the proper credits.
But let's try to add a few from the squashed patches:

Co-developed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Co-developed-by: default avatarJani Nikula <jani.nikula@intel.com>
Co-developed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Co-developed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Co-developed-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Co-developed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Co-developed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent a839e365

drivers/gpu/drm/xe/.kunitconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ CONFIG_DRM=y 
CONFIG_DRM_FBDEV_EMULATION=y

CONFIG_DRM_KMS_HELPER=y

CONFIG_DRM_XE=y

CONFIG_DRM_XE_DISPLAY=n

CONFIG_EXPERT=y

CONFIG_FB=y

CONFIG_DRM_XE_KUNIT_TEST=y

drivers/gpu/drm/xe/Kconfig

+22 −0
Original line number Diff line number Diff line
@@ -12,8 +12,20 @@ config DRM_XE 
	select DRM_KMS_HELPER

	select DRM_PANEL

	select DRM_SUBALLOC_HELPER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_MIPI_DSI

	select RELAY

	select IRQ_WORK

	# i915 depends on ACPI_VIDEO when ACPI is enabled

	# but for select to work, need to select ACPI_VIDEO's dependencies, ick

	select BACKLIGHT_CLASS_DEVICE if ACPI

	select INPUT if ACPI

	select ACPI_VIDEO if X86 && ACPI

	select ACPI_BUTTON if ACPI

	select ACPI_WMI if ACPI

	select SYNC_FILE

	select IOSF_MBI

	select CRC32
@@ -33,6 +45,16 @@ config DRM_XE 


	  If "M" is selected, the module will be called xe.



config DRM_XE_DISPLAY

	bool "Enable display support"

	depends on DRM_XE && EXPERT && DRM_XE=m

	select FB_IOMEM_HELPERS

	select I2C

	select I2C_ALGOBIT

	default y

	help

	  Disable this option only if you want to compile out display support.



config DRM_XE_FORCE_PROBE

	string "Force probe xe for selected Intel hardware IDs"

	depends on DRM_XE

drivers/gpu/drm/xe/Makefile

+136 −5
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ subdir-ccflags-y += $(call cc-disable-warning, initializer-overrides) 
subdir-ccflags-y += $(call cc-disable-warning, frame-address)

subdir-ccflags-$(CONFIG_DRM_XE_WERROR) += -Werror



# Fine grained warnings disable

CFLAGS_xe_pci.o = $(call cc-disable-warning, override-init)



subdir-ccflags-y += -I$(obj) -I$(srctree)/$(src)



# generated sources
@@ -126,13 +123,147 @@ xe-y += xe_bb.o \ 
# graphics hardware monitoring (HWMON) support

xe-$(CONFIG_HWMON) += xe_hwmon.o



obj-$(CONFIG_DRM_XE) += xe.o

obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/

# i915 Display compat #defines and #includes

subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \

	-I$(srctree)/$(src)/display/ext \

	-I$(srctree)/$(src)/compat-i915-headers \

	-I$(srctree)/drivers/gpu/drm/xe/display/ \

	-I$(srctree)/drivers/gpu/drm/i915/display/ \

	-Ddrm_i915_gem_object=xe_bo \

	-Ddrm_i915_private=xe_device



CFLAGS_i915-display/intel_fbdev.o = $(call cc-disable-warning, override-init)

CFLAGS_i915-display/intel_display_device.o = $(call cc-disable-warning, override-init)



# Rule to build SOC code shared with i915

$(obj)/i915-soc/%.o: $(srctree)/drivers/gpu/drm/i915/soc/%.c FORCE

	$(call cmd,force_checksrc)

	$(call if_changed_rule,cc_o_c)



# Rule to build display code shared with i915

$(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE

	$(call cmd,force_checksrc)

	$(call if_changed_rule,cc_o_c)



# Display code specific to xe

xe-$(CONFIG_DRM_XE_DISPLAY) += \

	xe_display.o \

	display/xe_fb_pin.o \

	display/xe_hdcp_gsc.o \

	display/xe_plane_initial.o \

	display/xe_display_rps.o \

	display/intel_fbdev_fb.o \

	display/intel_fb_bo.o \

	display/ext/i915_irq.o \

	display/ext/i915_utils.o



# SOC code shared with i915

xe-$(CONFIG_DRM_XE_DISPLAY) += \

	i915-soc/intel_dram.o \

	i915-soc/intel_pch.o



# Display code shared with i915

xe-$(CONFIG_DRM_XE_DISPLAY) += \

	i915-display/icl_dsi.o \

	i915-display/intel_atomic.o \

	i915-display/intel_atomic_plane.o \

	i915-display/intel_audio.o \

	i915-display/intel_backlight.o \

	i915-display/intel_bios.o \

	i915-display/intel_bw.o \

	i915-display/intel_cdclk.o \

	i915-display/intel_color.o \

	i915-display/intel_combo_phy.o \

	i915-display/intel_connector.o \

	i915-display/intel_crtc.o \

	i915-display/intel_crtc_state_dump.o \

	i915-display/intel_cursor.o \

	i915-display/intel_cx0_phy.o \

	i915-display/intel_ddi.o \

	i915-display/intel_ddi_buf_trans.o \

	i915-display/intel_display.o \

	i915-display/intel_display_debugfs.o \

	i915-display/intel_display_debugfs_params.o \

	i915-display/intel_display_device.o \

	i915-display/intel_display_driver.o \

	i915-display/intel_display_irq.o \

	i915-display/intel_display_params.o \

	i915-display/intel_display_power.o \

	i915-display/intel_display_power_map.o \

	i915-display/intel_display_power_well.o \

	i915-display/intel_display_trace.o \

	i915-display/intel_display_wa.o \

	i915-display/intel_dkl_phy.o \

	i915-display/intel_dmc.o \

	i915-display/intel_dp.o \

	i915-display/intel_dp_aux.o \

	i915-display/intel_dp_aux_backlight.o \

	i915-display/intel_dp_hdcp.o \

	i915-display/intel_dp_link_training.o \

	i915-display/intel_dp_mst.o \

	i915-display/intel_dpll.o \

	i915-display/intel_dpll_mgr.o \

	i915-display/intel_dpt_common.o \

	i915-display/intel_drrs.o \

	i915-display/intel_dsb.o \

	i915-display/intel_dsi.o \

	i915-display/intel_dsi_dcs_backlight.o \

	i915-display/intel_dsi_vbt.o \

	i915-display/intel_fb.o \

	i915-display/intel_fbc.o \

	i915-display/intel_fdi.o \

	i915-display/intel_fifo_underrun.o \

	i915-display/intel_frontbuffer.o \

	i915-display/intel_global_state.o \

	i915-display/intel_gmbus.o \

	i915-display/intel_hdcp.o \

	i915-display/intel_hdmi.o \

	i915-display/intel_hotplug.o \

	i915-display/intel_hotplug_irq.o \

	i915-display/intel_hti.o \

	i915-display/intel_link_bw.o \

	i915-display/intel_lspcon.o \

	i915-display/intel_modeset_lock.o \

	i915-display/intel_modeset_setup.o \

	i915-display/intel_modeset_verify.o \

	i915-display/intel_panel.o \

	i915-display/intel_pipe_crc.o \

	i915-display/intel_pmdemand.o \

	i915-display/intel_pps.o \

	i915-display/intel_psr.o \

	i915-display/intel_qp_tables.o \

	i915-display/intel_quirks.o \

	i915-display/intel_snps_phy.o \

	i915-display/intel_tc.o \

	i915-display/intel_vblank.o \

	i915-display/intel_vdsc.o \

	i915-display/intel_vga.o \

	i915-display/intel_vrr.o \

	i915-display/intel_wm.o \

	i915-display/skl_scaler.o \

	i915-display/skl_universal_plane.o \

	i915-display/skl_watermark.o



xe-$(CONFIG_PERF_EVENTS) += xe_pmu.o



ifeq ($(CONFIG_ACPI),y)

	xe-$(CONFIG_DRM_XE_DISPLAY) += \

		i915-display/intel_acpi.o \

		i915-display/intel_opregion.o

endif



ifeq ($(CONFIG_DRM_FBDEV_EMULATION),y)

	xe-$(CONFIG_DRM_XE_DISPLAY) += i915-display/intel_fbdev.o

endif



obj-$(CONFIG_DRM_XE) += xe.o

obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/



# header test

hdrtest_find_args := -not -path xe_rtp_helpers.h

ifneq ($(CONFIG_DRM_XE_DISPLAY),y)

	hdrtest_find_args += -not -path display/\* -not -path compat-i915-headers/\* -not -path xe_display.h

endif



always-$(CONFIG_DRM_XE_WERROR) += \

	$(patsubst %.h,%.hdrtest, $(shell cd $(srctree)/$(src) && find * -name '*.h' $(hdrtest_find_args)))

drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_lmem.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/* Empty */

drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_mman.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2023 Intel Corporation

 */



#ifndef _I915_GEM_MMAN_H_

#define _I915_GEM_MMAN_H_



#include "xe_bo_types.h"

#include <drm/drm_prime.h>



static inline int i915_gem_fb_mmap(struct xe_bo *bo, struct vm_area_struct *vma)

{

	return drm_gem_prime_mmap(&bo->ttm.base, vma);

}



#endif