Merge drm/drm-next into drm-intel-next-queued

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / i915_pci.c

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 366ddfc..1fe3907 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -389,6 +389,7 @@ static const struct intel_device_info ilk_m_info = {
        GEN5_FEATURES,
        PLATFORM(INTEL_IRONLAKE),
        .is_mobile = 1,
+       .has_rps = true,
        .display.has_fbc = 1,
 };
 
@@ -846,6 +847,14 @@ static const struct intel_device_info ehl_info = {
        .ppgtt_size = 36,
 };
 
+static const struct intel_device_info jsl_info = {
+       GEN11_FEATURES,
+       PLATFORM(INTEL_JASPERLAKE),
+       .require_force_probe = 1,
+       .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VCS0) | BIT(VECS0),
+       .ppgtt_size = 36,
+};
+
 #define GEN12_FEATURES \
        GEN11_FEATURES, \
        GEN(12), \
@@ -900,6 +909,8 @@ static const struct intel_device_info rkl_info = {
        GEN12_FEATURES, \
        .memory_regions = REGION_SMEM | REGION_LMEM, \
        .has_master_unit_irq = 1, \
+       .has_llc = 0, \
+       .has_snoop = 1, \
        .is_dgfx = 1
 
 static const struct intel_device_info dg1_info __maybe_unused = {
@@ -910,6 +921,8 @@ static const struct intel_device_info dg1_info __maybe_unused = {
        .platform_engine_mask =
                BIT(RCS0) | BIT(BCS0) | BIT(VECS0) |
                BIT(VCS0) | BIT(VCS2),
+       /* Wa_16011227922 */
+       .ppgtt_size = 47,
 };
 
 #undef GEN
@@ -985,6 +998,7 @@ static const struct pci_device_id pciidlist[] = {
        INTEL_CNL_IDS(&cnl_info),
        INTEL_ICL_11_IDS(&icl_info),
        INTEL_EHL_IDS(&ehl_info),
+       INTEL_JSL_IDS(&jsl_info),
        INTEL_TGL_12_IDS(&tgl_info),
        INTEL_RKL_IDS(&rkl_info),
        {0, 0, 0}
@@ -1090,11 +1104,19 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        return 0;
 }
 
+static void i915_pci_shutdown(struct pci_dev *pdev)
+{
+       struct drm_i915_private *i915 = pci_get_drvdata(pdev);
+
+       i915_driver_shutdown(i915);
+}
+
 static struct pci_driver i915_pci_driver = {
        .name = DRIVER_NAME,
        .id_table = pciidlist,
        .probe = i915_pci_probe,
        .remove = i915_pci_remove,
+       .shutdown = i915_pci_shutdown,
        .driver.pm = &i915_pm_ops,
 };