mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-13 20:16:26 +00:00
drm/i915: Nuke the cursor size defines
No point in having this extra indireciton for the cursor max size. So drop the defines and just write out the raw numbers. Makes it easier to see what's going on. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180615174406.12258-1-ville.syrjala@linux.intel.com Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
This commit is contained in:
parent
1a4b8901c5
commit
98fac1d5c5
2 changed files with 4 additions and 10 deletions
|
@ -15052,11 +15052,11 @@ int intel_modeset_init(struct drm_device *dev)
|
|||
dev->mode_config.cursor_width = IS_I845G(dev_priv) ? 64 : 512;
|
||||
dev->mode_config.cursor_height = 1023;
|
||||
} else if (IS_GEN2(dev_priv)) {
|
||||
dev->mode_config.cursor_width = GEN2_CURSOR_WIDTH;
|
||||
dev->mode_config.cursor_height = GEN2_CURSOR_HEIGHT;
|
||||
dev->mode_config.cursor_width = 64;
|
||||
dev->mode_config.cursor_height = 64;
|
||||
} else {
|
||||
dev->mode_config.cursor_width = MAX_CURSOR_WIDTH;
|
||||
dev->mode_config.cursor_height = MAX_CURSOR_HEIGHT;
|
||||
dev->mode_config.cursor_width = 256;
|
||||
dev->mode_config.cursor_height = 256;
|
||||
}
|
||||
|
||||
dev->mode_config.fb_base = ggtt->gmadr.start;
|
||||
|
|
|
@ -158,12 +158,6 @@
|
|||
#define MAX_OUTPUTS 6
|
||||
/* maximum connectors per crtcs in the mode set */
|
||||
|
||||
/* Maximum cursor sizes */
|
||||
#define GEN2_CURSOR_WIDTH 64
|
||||
#define GEN2_CURSOR_HEIGHT 64
|
||||
#define MAX_CURSOR_WIDTH 256
|
||||
#define MAX_CURSOR_HEIGHT 256
|
||||
|
||||
#define INTEL_I2C_BUS_DVO 1
|
||||
#define INTEL_I2C_BUS_SDVO 2
|
||||
|
||||
|
|
Loading…
Reference in a new issue