Commit 5bde522e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-08-04' of... 

Merge tag 'drm-intel-fixes-2021-08-04' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Call i915_globals_exit if pci_register_device fails (Jason)
- Correct SFC_DONE register offset (Matt)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YQrdDGLsInSI+N7T@intel.com
parents e8a1ca91 1354d830

drivers/gpu/drm/i915/i915_globals.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void __exit __i915_globals_flush(void) 
	atomic_dec(&active);

}



void __exit i915_globals_exit(void)

void i915_globals_exit(void)

{

	GEM_BUG_ON(atomic_read(&active));

drivers/gpu/drm/i915/i915_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1195,6 +1195,7 @@ static int __init i915_init(void) 
	err = pci_register_driver(&i915_pci_driver);

	if (err) {

		i915_pmu_exit();

		i915_globals_exit();

		return err;

	}

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define   GEN12_HCP_SFC_LOCK_ACK_BIT		REG_BIT(1)

#define   GEN12_HCP_SFC_USAGE_BIT			REG_BIT(0)



#define GEN12_SFC_DONE(n)		_MMIO(0x1cc00 + (n) * 0x100)

#define GEN12_SFC_DONE(n)		_MMIO(0x1cc000 + (n) * 0x1000)

#define GEN12_SFC_DONE_MAX		4



#define RING_PP_DIR_BASE(base)		_MMIO((base) + 0x228)