github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/display: add struct intel_error_regs and use it

Browse Source 
Add struct intel_error_regs, a display version of struct
i915_error_regs, and use it. The goal is to reduce the dependency on
i915 core types and headers.

Reviewed-by: Michał Grzelak <michal.grzelak@intel.com>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/7f909c6b1f7ae623792b5abc3d31d4a682006e24.1777972548.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2026-05-05 12:16:47 +03:00
parent 7091eef644
commit 1abb4a4e6d
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/display/intel_display_irq.c
View File

@ -73,7 +73,7 @@ static void irq_init(struct intel_display *display, struct intel_irq_regs regs,
intel_de_posting_read(display, regs.imr);
}
static void error_reset(struct intel_display *display, struct i915_error_regs regs)
static void error_reset(struct intel_display *display, struct intel_error_regs regs)
{
intel_de_write(display, regs.emr, 0xffffffff);
intel_de_posting_read(display, regs.emr);
@ -84,7 +84,7 @@ static void error_reset(struct intel_display *display, struct i915_error_regs re
intel_de_posting_read(display, regs.eir);
}
static void error_init(struct intel_display *display, struct i915_error_regs regs,
static void error_init(struct intel_display *display, struct intel_error_regs regs,
u32 emr_val)
{
intel_de_write(display, regs.eir, 0xffffffff);

8
drivers/gpu/drm/i915/display/intel_display_reg_defs.h
View File

@ -20,6 +20,14 @@ struct intel_irq_regs {
#define INTEL_IRQ_REGS(_imr, _ier, _iir) \
((const struct intel_irq_regs){ .imr = (_imr), .ier = (_ier), .iir = (_iir) })
struct intel_error_regs {
intel_reg_t emr;
intel_reg_t eir;
};
#define INTEL_ERROR_REGS(_emr, _eir) \
((const struct intel_error_regs){ .emr = (_emr), .eir = (_eir) })
#define VLV_DISPLAY_BASE 0x180000
/*

2
drivers/gpu/drm/i915/display/intel_display_regs.h
View File

@ -117,7 +117,7 @@
#define VLV_ERROR_PAGE_TABLE (1 << 4)
#define VLV_ERROR_CLAIM (1 << 0)
#define VLV_ERROR_REGS I915_ERROR_REGS(VLV_EMR, VLV_EIR)
#define VLV_ERROR_REGS INTEL_ERROR_REGS(VLV_EMR, VLV_EIR)
#define _MBUS_ABOX0_CTL 0x45038
#define _MBUS_ABOX1_CTL 0x45048