dri-devel March 2014

dri-devel@lists.freedesktop.org

144 participants
926 discussions

[PATCH 4/4] drm/radeon: Use two-ended allocation with a 512kb threshold
by Lauri Kasanen 31 Mar '14

31 Mar '14

This decreases eviction by up to 20%, by improving the fragmentation quality. No harm in normal cases that fit VRAM fully (PTS gaming suite). In some cases, even the VRAM-fitting cases improved slightly (openarena, urban terror). 512kb was measured as the most optimal threshold for 3d workloads common to radeon. Other drivers may need different thresholds according to their workloads. Signed-off-by: Lauri Kasanen <cand(a)gmx.com> --- drivers/gpu/drm/radeon/radeon_ttm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index c8a8a51..1aef339 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -710,7 +710,8 @@ int radeon_ttm_init(struct radeon_device *rdev) &radeon_bo_driver, rdev->ddev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, - rdev->need_dma32); + rdev->need_dma32, + 512 * 1024); if (r) { DRM_ERROR("failed initializing buffer object driver(%d).\n", r); return r; -- 1.8.3.1

1 0

[PATCH 3/4] drm: Update the drivers for the two-ended allocation param
by Lauri Kasanen 31 Mar '14

31 Mar '14

This updates the other drivers to build, no-op behavior-wise. Signed-off-by: Lauri Kasanen <cand(a)gmx.com> --- drivers/gpu/drm/ast/ast_ttm.c | 3 ++- drivers/gpu/drm/bochs/bochs_mm.c | 3 ++- drivers/gpu/drm/cirrus/cirrus_ttm.c | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 3 ++- drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ++- drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 ++- drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c index b824622..61f9e39 100644 --- a/drivers/gpu/drm/ast/ast_ttm.c +++ b/drivers/gpu/drm/ast/ast_ttm.c @@ -262,7 +262,8 @@ int ast_mm_init(struct ast_private *ast) &ast_bo_driver, dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, - true); + true, + 0); if (ret) { DRM_ERROR("Error initialising bo driver; %d\n", ret); return ret; diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c index f488be5..9dfd24a 100644 --- a/drivers/gpu/drm/bochs/bochs_mm.c +++ b/drivers/gpu/drm/bochs/bochs_mm.c @@ -228,7 +228,8 @@ int bochs_mm_init(struct bochs_device *bochs) &bochs_bo_driver, bochs->dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, - true); + true, + 0); if (ret) { DRM_ERROR("Error initialising bo driver; %d\n", ret); return ret; diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c index 92e6b77..74e8e21 100644 --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c @@ -262,7 +262,8 @@ int cirrus_mm_init(struct cirrus_device *cirrus) &cirrus_bo_driver, dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, - true); + true, + 0); if (ret) { DRM_ERROR("Error initialising bo driver; %d\n", ret); return ret; diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 9c52f68..489bc33 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3270,7 +3270,8 @@ search_free: ret = drm_mm_insert_node_in_range_generic(&vm->mm, &vma->node, size, alignment, obj->cache_level, 0, gtt_max, - DRM_MM_SEARCH_DEFAULT); + DRM_MM_SEARCH_DEFAULT, + DRM_MM_CREATE_DEFAULT); if (ret) { ret = i915_gem_evict_something(dev, vm, size, alignment, obj->cache_level, flags); diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 63a6dc7..dd72d35 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1072,7 +1072,8 @@ alloc: &ppgtt->node, GEN6_PD_SIZE, GEN6_PD_ALIGN, 0, 0, dev_priv->gtt.base.total, - DRM_MM_SEARCH_DEFAULT); + DRM_MM_SEARCH_DEFAULT, + DRM_MM_CREATE_DEFAULT); if (ret == -ENOSPC && !retried) { ret = i915_gem_evict_something(dev, &dev_priv->gtt.base, GEN6_PD_SIZE, GEN6_PD_ALIGN, diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c index 5a00e90..6844b24 100644 --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c @@ -262,7 +262,8 @@ int mgag200_mm_init(struct mga_device *mdev) &mgag200_bo_driver, dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, - true); + true, + 0); if (ret) { DRM_ERROR("Error initialising bo driver; %d\n", ret); return ret; diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index ab0228f..3fef97c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -384,7 +384,7 @@ nouveau_ttm_init(struct nouveau_drm *drm) &nouveau_bo_driver, dev->anon_inode->i_mapping, DRM_FILE_PAGE_OFFSET, - bits <= 32 ? true : false); + bits <= 32 ? true : false, 0); if (ret) { NV_ERROR(drm, "error initialising bo driver, %d\n", ret); return ret; diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index 29c02e0..8401a00 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -495,7 +495,7 @@ int qxl_ttm_init(struct qxl_device *qdev) qdev->mman.bo_global_ref.ref.object, &qxl_bo_driver, qdev->ddev->anon_inode->i_mapping, - DRM_FILE_PAGE_OFFSET, 0); + DRM_FILE_PAGE_OFFSET, 0, 0); if (r) { DRM_ERROR("failed initializing buffer object driver(%d).\n", r); return r; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index c700958..59a50dd 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -725,7 +725,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) &vmw_bo_driver, dev->anon_inode->i_mapping, VMWGFX_FILE_PAGE_OFFSET, - false); + false, 0); if (unlikely(ret != 0)) { DRM_ERROR("Failed initializing TTM buffer object driver.\n"); goto out_err1; -- 1.8.3.1

1 0

[PATCH 0/4] Two-ended allocation support
by Lauri Kasanen 31 Mar '14

31 Mar '14

Cheers, This patchset is respun on top of today's drm-next. It has only been compile-tested, since my test computer is currently on strike in support of Ukraine. It was a simple spin though, so Mr. Murphy will likely stay away. Only Radeon behavior is affected, all other drivers have just compiling changes. - Lauri

1 0

[PATCH 1/1] drm/gma500: Code cleanup - inline documentation
by Arthur Borsboom 29 Mar '14

29 Mar '14

Mainly styling fixes of inline documentation Signed-off-by: Arthur Borsboom <arthurborsboom(a)gmail.com> --- drivers/gpu/drm/gma500/framebuffer.c | 36 ++-- drivers/gpu/drm/gma500/psb_intel_display.c | 35 ++-- drivers/gpu/drm/gma500/psb_intel_reg.h | 259 +++++++++++++---------------- drivers/gpu/drm/gma500/psb_irq.c | 64 +++---- 4 files changed, 181 insertions(+), 213 deletions(-) diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index e7fcc14..0dd015a 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -103,8 +103,10 @@ static int psbfb_pan(struct fb_var_screeninfo *var, struct fb_info *info) * the actual fb is mapped. In our case that isn't quite true. */ if (psbfb->gtt->npage) { - /* GTT roll shifts in 4K pages, we need to shift the right - number of pages */ + /* + * GTT roll shifts in 4K pages, we need to shift the right + number of pages + */ int pages = info->fix.line_length >> 12; psb_gtt_roll(dev, psbfb->gtt, var->yoffset * pages); } @@ -229,7 +231,7 @@ static struct fb_ops psbfb_unaccel_ops = { .fb_ioctl = psbfb_ioctl, }; -/** +/* * psb_framebuffer_init - initialize a framebuffer * @dev: our DRM device * @fb: framebuffer to set up @@ -270,7 +272,7 @@ static int psb_framebuffer_init(struct drm_device *dev, return 0; } -/** +/* * psb_framebuffer_create - create a framebuffer backed by gt * @dev: our DRM device * @mode_cmd: the description of the requested mode @@ -302,7 +304,7 @@ static struct drm_framebuffer *psb_framebuffer_create return &fb->base; } -/** +/* * psbfb_alloc - allocate frame buffer memory * @dev: the DRM device * @aligned_size: space needed @@ -327,7 +329,7 @@ static struct gtt_range *psbfb_alloc(struct drm_device *dev, int aligned_size) return NULL; } -/** +/* * psbfb_create - create a framebuffer * @fbdev: the framebuffer device * @sizes: specification of the layout @@ -386,9 +388,9 @@ static int psbfb_create(struct psb_fbdev *fbdev, if (backing == NULL) { /* - * We couldn't get the space we wanted, fall back to the - * display engine requirement instead. The HW requires - * the pitch to be 64 byte aligned + * We couldn't get the space we wanted, fall back to the + * display engine requirement instead. The HW requires + * the pitch to be 64 byte aligned */ gtt_roll = 0; /* Don't use GTT accelerated scrolling */ @@ -489,7 +491,7 @@ out_err1: return ret; } -/** +/* * psb_user_framebuffer_create - create framebuffer * @dev: our DRM device * @filp: client file @@ -549,9 +551,11 @@ static int psbfb_probe(struct drm_fb_helper *helper, if (bytespp == 3) /* no 24bit packed */ bytespp = 4; - /* If the mode will not fit in 32bit then switch to 16bit to get + /* + * If the mode will not fit in 32bit then switch to 16bit to get a console on full resolution. The X mode setting server will - allocate its own 32bit GEM framebuffer */ + allocate its own 32bit GEM framebuffer + */ if (ALIGN(sizes->fb_width * bytespp, 64) * sizes->fb_height > dev_priv->vram_stolen_size) { sizes->surface_bpp = 16; @@ -633,7 +637,7 @@ static void psbfb_output_poll_changed(struct drm_device *dev) drm_fb_helper_hotplug_event(&fbdev->psb_fb_helper); } -/** +/* * psb_user_framebuffer_create_handle - add hamdle to a framebuffer * @fb: framebuffer * @file_priv: our DRM file @@ -652,7 +656,7 @@ static int psb_user_framebuffer_create_handle(struct drm_framebuffer *fb, return drm_gem_handle_create(file_priv, &r->gem, handle); } -/** +/* * psb_user_framebuffer_destroy - destruct user created fb * @fb: framebuffer * @@ -666,7 +670,7 @@ static void psb_user_framebuffer_destroy(struct drm_framebuffer *fb) /* Let DRM do its clean up */ drm_framebuffer_cleanup(fb); - /* We are no longer using the resource in GEM */ + /* We are no longer using the resource in GEM */ drm_gem_object_unreference_unlocked(&r->gem); kfree(fb); } @@ -761,7 +765,7 @@ void psb_modeset_init(struct drm_device *dev) dev->mode_config.funcs = &psb_mode_funcs; /* set memory base */ - /* Oaktrail and Poulsbo should use BAR 2*/ + /* Oaktrail and Poulsbo should use BAR 2 */ pci_read_config_dword(dev->pdev, PSB_BSM, (u32 *) &(dev->mode_config.fb_base)); diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c index 21aed85..b11cbd6 100644 --- a/drivers/gpu/drm/gma500/psb_intel_display.c +++ b/drivers/gpu/drm/gma500/psb_intel_display.c @@ -1,5 +1,5 @@ /* - * Copyright Â© 2006-2011 Intel Corporation + * Copyright © 2006-2011 Intel Corporation * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -53,7 +53,8 @@ static const struct gma_limit_t psb_intel_limits[] = { .m2 = {.min = 3, .max = 7}, .p = {.min = 7, .max = 98}, .p1 = {.min = 1, .max = 8}, - /* The single-channel range is 25-112Mhz, and dual-channel + /* + * The single-channel range is 25-112Mhz, and dual-channel * is 80-224Mhz. Prefer single channel as much as possible. */ .p2 = {.dot_limit = 112000, .p2_slow = 14, .p2_fast = 7}, @@ -81,7 +82,7 @@ static void psb_intel_clock(int refclk, struct gma_clock_t *clock) clock->dot = clock->vco / clock->p; } -/** +/* * Return the pipe currently connected to the panel fitter, * or -1 if the panel fitter is not present or not in use */ @@ -226,7 +227,8 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, udelay(150); } - /* The LVDS pin pair needs to be on before the DPLLs are enabled. + /* + * The LVDS pin pair needs to be on before the DPLLs are enabled. * This is an exception to the general rule that mode_set doesn't turn * things on. */ @@ -238,7 +240,8 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, lvds |= LVDS_PIPEB_SELECT; lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP; - /* Set the B0-B3 data pairs corresponding to + /* + * Set the B0-B3 data pairs corresponding to * whether we're going to * set the DPLLs for dual-channel mode or not. */ @@ -246,7 +249,8 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, if (clock.p2 == 7) lvds |= LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP; - /* It would be nice to set 24 vs 18-bit mode (LVDS_A3_POWER_UP) + /* + * It would be nice to set 24 vs 18-bit mode (LVDS_A3_POWER_UP) * appropriately here, but we need to look more * thoroughly into how panels behave in the two modes. */ @@ -261,7 +265,7 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, /* Wait for the clocks to stabilize. */ udelay(150); - /* write it again -- the BIOS does, after all */ + /* Write it again -- the BIOS does, after all */ REG_WRITE(map->dpll, dpll); REG_READ(map->dpll); @@ -280,7 +284,8 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc, ((adjusted_mode->crtc_vblank_end - 1) << 16)); REG_WRITE(map->vsync, (adjusted_mode->crtc_vsync_start - 1) | ((adjusted_mode->crtc_vsync_end - 1) << 16)); - /* pipesrc and dspsize control the size that is scaled from, + /* + * pipesrc and dspsize control the size that is scaled from, * which should always be the user's requested size. */ REG_WRITE(map->size, @@ -371,7 +376,8 @@ static int psb_intel_crtc_clock_get(struct drm_device *dev, psb_intel_clock(48000, &clock); } - /* XXX: It would be nice to validate the clocks, but we can't reuse + /* + * XXX: It would be nice to validate the clocks, but we can't reuse * i830PllIsValid() because it relies on the xf86_config connector * configuration being accurate, which it isn't necessarily. */ @@ -379,7 +385,7 @@ static int psb_intel_crtc_clock_get(struct drm_device *dev, return clock.dot; } -/** Returns the currently programmed mode of the given pipe. */ +/* Returns the currently programmed mode of the given pipe. */ struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev, struct drm_crtc *crtc) { @@ -466,7 +472,8 @@ static void psb_intel_cursor_init(struct drm_device *dev, struct gtt_range *cursor_gt; if (dev_priv->ops->cursor_needs_phys) { - /* Allocate 4 pages of stolen mem for a hardware cursor. That + /* + * Allocate 4 pages of stolen mem for a hardware cursor. That * is enough for the 64 x 64 ARGB cursors we support. */ cursor_gt = psb_gtt_alloc_range(dev, 4 * PAGE_SIZE, "cursor", 1, @@ -495,8 +502,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, int i; uint16_t *r_base, *g_base, *b_base; - /* We allocate a extra array of drm_connector pointers - * for fbdev after the crtc */ + /* + * We allocate an extra array of drm_connector pointers + * for fbdev after the crtc + */ gma_crtc = kzalloc(sizeof(struct gma_crtc) + (INTELFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); diff --git a/drivers/gpu/drm/gma500/psb_intel_reg.h b/drivers/gpu/drm/gma500/psb_intel_reg.h index 0be30e4..ec32a06 100644 --- a/drivers/gpu/drm/gma500/psb_intel_reg.h +++ b/drivers/gpu/drm/gma500/psb_intel_reg.h @@ -17,9 +17,7 @@ #ifndef __PSB_INTEL_REG_H__ #define __PSB_INTEL_REG_H__ -/* - * GPIO regs - */ +/* GPIO regs */ #define GPIOA 0x5010 #define GPIOB 0x5014 #define GPIOC 0x5018 @@ -254,7 +252,7 @@ #define DPLL_LOCK (1 << 15) /* CDV */ /* - * The i830 generation, in DAC/serial mode, defines p1 as two plus this + * The i830 generation, in DAC/serial mode, defines p1 as two plus this * bitfield, or just 2 if PLL_P1_DIVIDE_BY_TWO is set. */ # define DPLL_FPA01_P1_POST_DIV_MASK_I830 0x001f0000 @@ -292,9 +290,7 @@ #define SDVO_MULTIPLIER_SHIFT_HIRES 4 #define SDVO_MULTIPLIER_SHIFT_VGA 0 -/* - * PLL_MD - */ +/* PLL_MD */ /* Pipe A SDVO/UDI clock multiplier/divider register for G965. */ #define DPLL_A_MD 0x0601c /* Pipe B SDVO/UDI clock multiplier/divider register for G965. */ @@ -385,7 +381,7 @@ #define TV_HOTPLUG_INT_EN (1 << 18) #define CRT_HOTPLUG_INT_EN (1 << 9) #define CRT_HOTPLUG_FORCE_DETECT (1 << 3) -/* CDV.. */ +/* CDV */ #define CRT_HOTPLUG_ACTIVATION_PERIOD_64 (1 << 8) #define CRT_HOTPLUG_DAC_ON_TIME_2M (0 << 7) #define CRT_HOTPLUG_DAC_ON_TIME_4M (1 << 7) @@ -419,7 +415,7 @@ #define SDVO_COLOR_RANGE_16_235 (1 << 8) #define SDVO_AUDIO_ENABLE (1 << 6) -/** +/* * 915G/GM SDVO pixel multiplier. * * Programmed value is multiplier - 1, up to 5x. @@ -702,9 +698,7 @@ struct dpst_guardband { #define VGA_2X_MODE (1 << 30) #define VGA_PIPE_B_SELECT (1 << 29) -/* - * Overlay registers - */ +/* Overlay registers */ #define OV_C_OFFSET 0x08000 #define OV_OVADD 0x30000 #define OV_DOVASTA 0x30008 @@ -739,9 +733,7 @@ struct dpst_guardband { #define SWF5 0x71424 #define SWF6 0x71428 -/* - * 855 scratch registers. - */ +/* 855 scratch registers */ #define SWF00 0x70410 #define SWF01 0x70414 #define SWF02 0x70418 @@ -762,10 +754,7 @@ struct dpst_guardband { #define SWF31 0x72418 #define SWF32 0x7241c - -/* - * Palette registers - */ +/* Palette registers */ #define PALETTE_A 0x0a000 #define PALETTE_B 0x0a800 #define PALETTE_C 0x0ac00 @@ -789,17 +778,13 @@ struct dpst_guardband { #define CURCBASE 0x700e4 #define CURCPOS 0x700e8 -/* - * Interrupt Registers - */ +/* Interrupt Registers */ #define IER 0x020a0 #define IIR 0x020a4 #define IMR 0x020a8 #define ISR 0x020ac -/* - * MOORESTOWN delta registers - */ +/* MOORESTOWN delta registers */ #define MRST_DPLL_A 0x0f014 #define MDFLD_DPLL_B 0x0f018 #define MDFLD_INPUT_REF_SEL (1 << 14) @@ -814,9 +799,7 @@ struct dpst_guardband { #define MDFLD_DPLL_DIV1 0x0f04c #define MRST_PERF_MODE 0x020f4 -/* - * MEDFIELD HDMI registers - */ +/* MEDFIELD HDMI registers */ #define HDMIPHYMISCCTL 0x61134 #define HDMI_PHY_POWER_DOWN 0x7f #define HDMIB_CONTROL 0x61140 @@ -862,13 +845,9 @@ struct dpst_guardband { #define MRST_DSPBBASE 0x7119c #define MDFLD_DSPCBASE 0x7219c -/* - * Moorestown registers. - */ +/* Moorestown registers */ -/* - * MIPI IP registers - */ +/* MIPI IP registers */ #define MIPIC_REG_OFFSET 0x800 #define DEVICE_READY_REG 0xb000 @@ -998,9 +977,7 @@ struct dpst_guardband { #define DBI_BW_CTRL_REG 0xb084 #define CLK_LANE_SWT_REG 0xb088 -/* - * MIPI Adapter registers - */ +/* MIPI Adapter registers */ #define MIPI_CONTROL_REG 0xb104 #define MIPI_2X_CLOCK_BITS ((1 << 0) | (1 << 1)) #define MIPI_DATA_ADDRESS_REG 0xb108 @@ -1020,161 +997,149 @@ struct dpst_guardband { /* DBI COMMANDS */ #define soft_reset 0x01 /* - * The display module performs a software reset. - * Registers are written with their SW Reset default values. + * The display module performs a software reset. + * Registers are written with their SW Reset default values. */ #define get_power_mode 0x0a -/* - * The display module returns the current power mode - */ +/* The display module returns the current power mode */ #define get_address_mode 0x0b -/* - * The display module returns the current status. - */ +/* The display module returns the current status */ #define get_pixel_format 0x0c /* - * This command gets the pixel format for the RGB image data - * used by the interface. + * This command gets the pixel format for the RGB image data + * used by the interface. */ #define get_display_mode 0x0d -/* - * The display module returns the Display Image Mode status. - */ +/* The display module returns the Display Image Mode status */ #define get_signal_mode 0x0e -/* - * The display module returns the Display Signal Mode. - */ +/* The display module returns the Display Signal Mode */ #define get_diagnostic_result 0x0f /* - * The display module returns the self-diagnostic results following - * a Sleep Out command. + * The display module returns the self-diagnostic results following + * a Sleep Out command. */ #define enter_sleep_mode 0x10 /* - * This command causes the display module to enter the Sleep mode. - * In this mode, all unnecessary blocks inside the display module are - * disabled except interface communication. This is the lowest power - * mode the display module supports. + * This command causes the display module to enter the Sleep mode. + * In this mode, all unnecessary blocks inside the display module are + * disabled except interface communication. This is the lowest power + * mode the display module supports. */ #define exit_sleep_mode 0x11 /* - * This command causes the display module to exit Sleep mode. - * All blocks inside the display module are enabled. + * This command causes the display module to exit Sleep mode. + * All blocks inside the display module are enabled. */ #define enter_partial_mode 0x12 /* - * This command causes the display module to enter the Partial Display - * Mode. The Partial Display Mode window is described by the - * set_partial_area command. + * This command causes the display module to enter the Partial Display + * Mode. The Partial Display Mode window is described by the + * set_partial_area command. */ #define enter_normal_mode 0x13 /* - * This command causes the display module to enter the Normal mode. - * Normal Mode is defined as Partial Display mode and Scroll mode are off + * This command causes the display module to enter the Normal mode. + * Normal Mode is defined as Partial Display mode and Scroll mode are off */ #define exit_invert_mode 0x20 /* - * This command causes the display module to stop inverting the image - * data on the display device. The frame memory contents remain unchanged. - * No status bits are changed. + * This command causes the display module to stop inverting the image + * data on the display device. The frame memory contents remain unchanged. + * No status bits are changed. */ #define enter_invert_mode 0x21 /* - * This command causes the display module to invert the image data only on - * the display device. The frame memory contents remain unchanged. - * No status bits are changed. + * This command causes the display module to invert the image data only on + * the display device. The frame memory contents remain unchanged. + * No status bits are changed. */ #define set_gamma_curve 0x26 /* - * This command selects the desired gamma curve for the display device. - * Four fixed gamma curves are defined in section DCS spec. + * This command selects the desired gamma curve for the display device. + * Four fixed gamma curves are defined in section DCS spec. */ #define set_display_off 0x28 -/* ************************************************************************* *\ -This command causes the display module to stop displaying the image data -on the display device. The frame memory contents remain unchanged. -No status bits are changed. -\* ************************************************************************* */ +/* + * This command causes the display module to stop displaying the image data + * on the display device. The frame memory contents remain unchanged. + * No status bits are changed. + */ #define set_display_on 0x29 -/* ************************************************************************* *\ -This command causes the display module to start displaying the image data -on the display device. The frame memory contents remain unchanged. -No status bits are changed. -\* ************************************************************************* */ +/* + * This command causes the display module to start displaying the image data + * on the display device. The frame memory contents remain unchanged. + * No status bits are changed. + */ #define set_column_address 0x2a /* - * This command defines the column extent of the frame memory accessed by - * the hostprocessor with the read_memory_continue and - * write_memory_continue commands. - * No status bits are changed. + * This command defines the column extent of the frame memory accessed by + * the hostprocessor with the read_memory_continue and + * write_memory_continue commands. + * No status bits are changed. */ #define set_page_addr 0x2b /* - * This command defines the page extent of the frame memory accessed by - * the host processor with the write_memory_continue and - * read_memory_continue command. - * No status bits are changed. + * This command defines the page extent of the frame memory accessed by + * the host processor with the write_memory_continue and + * read_memory_continue command. + * No status bits are changed. */ #define write_mem_start 0x2c /* - * This command transfers image data from the host processor to the - * display modules frame memory starting at the pixel location specified - * by preceding set_column_address and set_page_address commands. + * This command transfers image data from the host processor to the + * display modules frame memory starting at the pixel location specified + * by preceding set_column_address and set_page_address commands. */ #define set_partial_area 0x30 /* - * This command defines the Partial Display mode s display area. - * There are two parameters associated with this command, the first - * defines the Start Row (SR) and the second the End Row (ER). SR and ER - * refer to the Frame Memory Line Pointer. + * This command defines the Partial Display mode s display area. + * There are two parameters associated with this command, the first + * defines the Start Row (SR) and the second the End Row (ER). SR and ER + * refer to the Frame Memory Line Pointer. */ #define set_scroll_area 0x33 -/* - * This command defines the display modules Vertical Scrolling Area. - */ +/* This command defines the display modules Vertical Scrolling Area. */ #define set_tear_off 0x34 /* - * This command turns off the display modules Tearing Effect output - * signal on the TE signal line. + * This command turns off the display modules Tearing Effect output + * signal on the TE signal line. */ #define set_tear_on 0x35 /* - * This command turns on the display modules Tearing Effect output signal - * on the TE signal line. + * This command turns on the display modules Tearing Effect output signal + * on the TE signal line. */ #define set_address_mode 0x36 /* - * This command sets the data order for transfers from the host processor - * to display modules frame memory,bits B[7:5] and B3, and from the - * display modules frame memory to the display device, bits B[2:0] and B4. + * This command sets the data order for transfers from the host processor + * to display modules frame memory,bits B[7:5] and B3, and from the + * display modules frame memory to the display device, bits B[2:0] and B4. */ #define set_scroll_start 0x37 /* - * This command sets the start of the vertical scrolling area in the frame - * memory. The vertical scrolling area is fully defined when this command - * is used with the set_scroll_area command The set_scroll_start command - * has one parameter, the Vertical Scroll Pointer. The VSP defines the - * line in the frame memory that is written to the display device as the - * first line of the vertical scroll area. + * This command sets the start of the vertical scrolling area in the frame + * memory. The vertical scrolling area is fully defined when this command + * is used with the set_scroll_area command The set_scroll_start command + * has one parameter, the Vertical Scroll Pointer. The VSP defines the + * line in the frame memory that is written to the display device as the + * first line of the vertical scroll area. */ #define exit_idle_mode 0x38 -/* - * This command causes the display module to exit Idle mode. - */ +/* This command causes the display module to exit Idle mode. */ #define enter_idle_mode 0x39 /* - * This command causes the display module to enter Idle Mode. - * In Idle Mode, color expression is reduced. Colors are shown on the - * display device using the MSB of each of the R, G and B color - * components in the frame memory + * This command causes the display module to enter Idle Mode. + * In Idle Mode, color expression is reduced. Colors are shown on the + * display device using the MSB of each of the R, G and B color + * components in the frame memory */ #define set_pixel_format 0x3a /* - * This command sets the pixel format for the RGB image data used by the - * interface. - * Bits D[6:4] DPI Pixel Format Definition - * Bits D[2:0] DBI Pixel Format Definition - * Bits D7 and D3 are not used. + * This command sets the pixel format for the RGB image data used by the + * interface. + * Bits D[6:4] DPI Pixel Format Definition + * Bits D[2:0] DBI Pixel Format Definition + * Bits D7 and D3 are not used. */ #define DCS_PIXEL_FORMAT_3bpp 0x1 #define DCS_PIXEL_FORMAT_8bpp 0x2 @@ -1186,23 +1151,23 @@ No status bits are changed. #define write_mem_cont 0x3c /* - * This command transfers image data from the host processor to the - * display module's frame memory continuing from the pixel location - * following the previous write_memory_continue or write_memory_start - * command. + * This command transfers image data from the host processor to the + * display module's frame memory continuing from the pixel location + * following the previous write_memory_continue or write_memory_start + * command. */ #define set_tear_scanline 0x44 /* - * This command turns on the display modules Tearing Effect output signal - * on the TE signal line when the display module reaches line N. + * This command turns on the display modules Tearing Effect output signal + * on the TE signal line when the display module reaches line N. */ #define get_scanline 0x45 /* - * The display module returns the current scanline, N, used to update the - * display device. The total number of scanlines on a display device is - * defined as VSYNC + VBP + VACT + VFP.The first scanline is defined as - * the first line of V Sync and is denoted as Line 0. - * When in Sleep Mode, the value returned by get_scanline is undefined. + * The display module returns the current scanline, N, used to update the + * display device. The total number of scanlines on a display device is + * defined as VSYNC + VBP + VACT + VFP.The first scanline is defined as + * the first line of V Sync and is denoted as Line 0. + * When in Sleep Mode, the value returned by get_scanline is undefined. */ /* MCS or Generic COMMANDS */ @@ -1404,7 +1369,8 @@ No status bits are changed. #define DP_VOLTAGE_MASK (7 << 25) #define DP_VOLTAGE_SHIFT 25 -/* Signal pre-emphasis levels, like voltages, the other end tells us what +/* + * Signal pre-emphasis levels, like voltages, the other end tells us what * they want */ #define DP_PRE_EMPHASIS_0 (0 << 22) @@ -1423,29 +1389,30 @@ No status bits are changed. /* Mystic DPCD version 1.1 special mode */ #define DP_ENHANCED_FRAMING (1 << 18) -/** locked once port is enabled */ +/* locked once port is enabled */ #define DP_PORT_REVERSAL (1 << 15) -/** sends the clock on lane 15 of the PEG for debug */ +/* sends the clock on lane 15 of the PEG for debug */ #define DP_CLOCK_OUTPUT_ENABLE (1 << 13) #define DP_SCRAMBLING_DISABLE (1 << 12) #define DP_SCRAMBLING_DISABLE_IRONLAKE (1 << 7) -/** limit RGB values to avoid confusing TVs */ +/* limit RGB values to avoid confusing TVs */ #define DP_COLOR_RANGE_16_235 (1 << 8) -/** Turn on the audio link */ +/* Turn on the audio link */ #define DP_AUDIO_OUTPUT_ENABLE (1 << 6) -/** vs and hs sync polarity */ +/* vs and hs sync polarity */ #define DP_SYNC_VS_HIGH (1 << 4) #define DP_SYNC_HS_HIGH (1 << 3) -/** A fantasy */ +/* A fantasy */ #define DP_DETECTED (1 << 2) -/** The aux channel provides a way to talk to the +/* + * The aux channel provides a way to talk to the * signal sink for DDC etc. Max packet size supported * is 20 bytes in each direction, hence the 5 fixed * data registers diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c index 624eb36..ba3fd4f 100644 --- a/drivers/gpu/drm/gma500/psb_irq.c +++ b/drivers/gpu/drm/gma500/psb_irq.c @@ -19,8 +19,6 @@ * develop this driver. * **************************************************************************/ -/* - */ #include <drm/drmP.h> #include "psb_drv.h" @@ -30,10 +28,7 @@ #include "psb_irq.h" #include "mdfld_output.h" -/* - * inline functions - */ - +/* inline functions */ static inline u32 psb_pipestat(int pipe) { @@ -139,10 +134,7 @@ static void mid_disable_pipe_event(struct drm_psb_private *dev_priv, int pipe) } } -/** - * Display controller interrupt handler for pipe event. - * - */ +/* Display controller interrupt handler for pipe event */ static void mid_pipe_event_handler(struct drm_device *dev, int pipe) { struct drm_psb_private *dev_priv = @@ -163,8 +155,10 @@ static void mid_pipe_event_handler(struct drm_device *dev, int pipe) spin_unlock(&dev_priv->irqmask_lock); - /* Clear the 2nd level interrupt status bits - * Sometimes the bits are very sticky so we repeat until they unstick */ + /* + * Clear the 2nd level interrupt status bits + * Sometimes the bits are very sticky so we repeat until they unstick + */ for (i = 0; i < 0xffff; i++) { PSB_WVDC32(PSB_RVDC32(pipe_stat_reg), pipe_stat_reg); pipe_clear = PSB_RVDC32(pipe_stat_reg) & pipe_status; @@ -185,9 +179,7 @@ static void mid_pipe_event_handler(struct drm_device *dev, int pipe) drm_handle_vblank(dev, pipe); } -/* - * Display controller interrupt handler. - */ +/* Display controller interrupt handler */ static void psb_vdc_interrupt(struct drm_device *dev, uint32_t vdc_stat) { if (vdc_stat & _PSB_IRQ_ASLE) @@ -200,9 +192,7 @@ static void psb_vdc_interrupt(struct drm_device *dev, uint32_t vdc_stat) mid_pipe_event_handler(dev, 1); } -/* - * SGX interrupt handler - */ +/* SGX interrupt handler */ static void psb_sgx_interrupt(struct drm_device *dev, u32 stat_1, u32 stat_2) { struct drm_psb_private *dev_priv = dev->dev_private; @@ -267,7 +257,8 @@ irqreturn_t psb_irq_handler(int irq, void *arg) if (vdc_stat & (_PSB_PIPE_EVENT_FLAG|_PSB_IRQ_ASLE)) dsp_int = 1; - /* FIXME: Handle Medfield + /* + * FIXME: Handle Medfield if (vdc_stat & _MDFLD_DISP_ALL_IRQ_FLAG) dsp_int = 1; */ @@ -292,8 +283,10 @@ irqreturn_t psb_irq_handler(int irq, void *arg) handled = 1; } - /* Note: this bit has other meanings on some devices, so we will - need to address that later if it ever matters */ + /* + * Note: this bit has other meanings on some devices, so we will + need to address that later if it ever matters + */ if (hotplug_int && dev_priv->ops->hotplug) { handled = dev_priv->ops->hotplug(dev); REG_WRITE(PORT_HOTPLUG_STAT, REG_READ(PORT_HOTPLUG_STAT)); @@ -336,7 +329,7 @@ void psb_irq_preinstall(struct drm_device *dev) dev_priv->vdc_irq_mask |= _MDFLD_PIPEC_EVENT_FLAG; */ - /* Revisit this area - want per device masks ? */ + /* TODO: Revisit this area - want per device masks ? */ if (dev_priv->ops->hotplug) dev_priv->vdc_irq_mask |= _PSB_IRQ_DISP_HOTSYNC; dev_priv->vdc_irq_mask |= _PSB_IRQ_ASLE | _PSB_IRQ_SGX_FLAG; @@ -461,7 +454,7 @@ int psb_irq_enable_dpst(struct drm_device *dev) spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags); - /* enable DPST */ + /* Enable DPST */ mid_enable_pipe_event(dev_priv, 0); psb_irq_turn_on_dpst(dev); @@ -507,9 +500,7 @@ int psb_irq_disable_dpst(struct drm_device *dev) return 0; } -/* - * It is used to enable VBLANK interrupt - */ +/* It is used to enable VBLANK interrupt */ int psb_enable_vblank(struct drm_device *dev, int pipe) { struct drm_psb_private *dev_priv = dev->dev_private; @@ -517,8 +508,10 @@ int psb_enable_vblank(struct drm_device *dev, int pipe) uint32_t reg_val = 0; uint32_t pipeconf_reg = mid_pipeconf(pipe); - /* Medfield is different - we should perhaps extract out vblank - and blacklight etc ops */ + /* + * Medfield is different - we should perhaps extract out vblank + * and blacklight etc ops + */ if (IS_MFLD(dev)) return mdfld_enable_te(dev, pipe); @@ -546,9 +539,7 @@ int psb_enable_vblank(struct drm_device *dev, int pipe) return 0; } -/* - * It is used to disable VBLANK interrupt - */ +/* It is used to disable VBLANK interrupt */ void psb_disable_vblank(struct drm_device *dev, int pipe) { struct drm_psb_private *dev_priv = dev->dev_private; @@ -570,9 +561,7 @@ void psb_disable_vblank(struct drm_device *dev, int pipe) spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags); } -/* - * It is used to enable TE interrupt - */ +/* It is used to enable TE interrupt */ int mdfld_enable_te(struct drm_device *dev, int pipe) { struct drm_psb_private *dev_priv = @@ -599,9 +588,7 @@ int mdfld_enable_te(struct drm_device *dev, int pipe) return 0; } -/* - * It is used to disable TE interrupt - */ +/* It is used to disable TE interrupt */ void mdfld_disable_te(struct drm_device *dev, int pipe) { struct drm_psb_private *dev_priv = @@ -619,7 +606,8 @@ void mdfld_disable_te(struct drm_device *dev, int pipe) spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags); } -/* Called from drm generic code, passed a 'crtc', which +/* + * Called from drm generic code, passed a 'crtc', which * we use as a pipe index */ u32 psb_get_vblank_counter(struct drm_device *dev, int pipe) -- 1.9.0

2 2

[PATCH v2] drm/omap: Don't dereference list head when the connectors list is empty
by Laurent Pinchart 28 Mar '14

28 Mar '14

The connectors list iterator returns the list head when the list is empty. Fix it by returning NULL in that case. Signed-off-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> --- drivers/gpu/drm/omapdrm/omap_fb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Changes since v1: - Use list_first_entry_or_null diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index f2b8f06..2c3acb3 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c @@ -302,7 +302,8 @@ struct drm_connector *omap_framebuffer_get_next_connector( struct drm_connector *connector = from; if (!from) - return list_first_entry(connector_list, typeof(*from), head); + return list_first_entry_or_null(connector_list, typeof(*from), + head); list_for_each_entry_from(connector, connector_list, head) { if (connector != from) { -- Regards, Laurent Pinchart

2 2

[PATCH] drm/i915: use __func__ instead of __FUNCTION__
by Christoph Jaeger 28 Mar '14

28 Mar '14

__FUNCTION__ is gcc specific; use __func__ instead. Signed-off-by: Christoph Jaeger <christophjaeger(a)linux.com> --- drivers/gpu/drm/i915/dvo_ns2501.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/dvo_ns2501.c index 954acb2..e40cd26 100644 --- a/drivers/gpu/drm/i915/dvo_ns2501.c +++ b/drivers/gpu/drm/i915/dvo_ns2501.c @@ -234,7 +234,7 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo, { DRM_DEBUG_KMS ("%s: is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n", - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, + __func__, mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal); /* @@ -262,7 +262,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, DRM_DEBUG_KMS ("%s: set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n", - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, + __func__, mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal); /* @@ -277,8 +277,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, if (mode->hdisplay == 800 && mode->vdisplay == 600) { /* mode 277 */ ns->reg_8_shadow &= ~NS2501_8_BPAS; - DRM_DEBUG_KMS("%s: switching to 800x600\n", - __FUNCTION__); + DRM_DEBUG_KMS("%s: switching to 800x600\n", __func__); /* * No, I do not know where this data comes from. @@ -341,8 +340,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, } else if (mode->hdisplay == 640 && mode->vdisplay == 480) { /* mode 274 */ - DRM_DEBUG_KMS("%s: switching to 640x480\n", - __FUNCTION__); + DRM_DEBUG_KMS("%s: switching to 640x480\n", __func__); /* * No, I do not know where this data comes from. * It is just what the video bios left in the DVO, so @@ -406,8 +404,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, } else if (mode->hdisplay == 1024 && mode->vdisplay == 768) { /* mode 280 */ - DRM_DEBUG_KMS("%s: switching to 1024x768\n", - __FUNCTION__); + DRM_DEBUG_KMS("%s: switching to 1024x768\n", __func__); /* * This might or might not work, actually. I'm silently * assuming here that the native panel resolution is @@ -459,7 +456,7 @@ static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable) unsigned char ch; DRM_DEBUG_KMS("%s: Trying set the dpms of the DVO to %i\n", - __FUNCTION__, enable); + __func__, enable); ch = ns->reg_8_shadow; -- 1.8.5.3

3 5

[PULL] vmwgfx-next
by Thomas Hellstrom 28 Mar '14

28 Mar '14

Dave, vmwgfx render-node support and drm + ttm changes it depends upon. The following changes since commit 60f2b4af1258c05e6b037af866be81abc24438f7: drm/i915: fix build warning on 32-bit (v2) (2014-03-28 13:40:48 +1000) are available in the git repository at: git://people.freedesktop.org/~thomash/linux tags/vmwgfx-next-2014-03-28 for you to fetch changes up to 03c5b8f077218bec50f1355b76dea405a7112878: drm/vmwgfx: Bump driver minor and date (2014-03-28 14:19:05 +0100) ---------------------------------------------------------------- Pull request of 2014-03-28 ---------------------------------------------------------------- Thomas Hellstrom (16): drm: Have the crtc code only reference master from legacy nodes v2 drm: Break out ioctl permission check to a separate function v2 drm: Make control nodes master-less v3 drm: Improve on minor type helpers v3 drm: Remove the minor master list drm: Protect the master management with a drm_device::master_mutex v3 drm: Add a function to get the ioctl flags drm/vmwgfx: Use a per-device semaphore for reservation protection drm/vmwgfx: Reinstate and tighten security around legacy master model drm/vmwgfx: Drop authentication requirement on UNREF ioctls drm/vmwgfx: Allow prime fds in the surface reference ioctls drm/vmwgfx: Tighten security around surface sharing v2 drm/ttm: Add a ttm_ref_object_exists function drm/vmwgfx: Tighten the security around buffer maps drm/vmwgfx: Enable render nodes drm/vmwgfx: Bump driver minor and date drivers/gpu/drm/drm_crtc.c | 14 +-- drivers/gpu/drm/drm_drv.c | 132 +++++++++++++++++++-------- drivers/gpu/drm/drm_fops.c | 26 +++--- drivers/gpu/drm/drm_stub.c | 48 +++++----- drivers/gpu/drm/ttm/ttm_object.c | 46 ++++++++++ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 15 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 143 +++++++++++++++++++++++------- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 10 +-- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 15 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 24 ++--- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 5 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 143 +++++++++++++++++++++--------- include/drm/drmP.h | 61 ++++++++----- include/drm/ttm/ttm_object.h | 4 + include/uapi/drm/vmwgfx_drm.h | 12 ++- 19 files changed, 500 insertions(+), 226 deletions(-)

1 0

[PATCH] drm: Specify a bit more the DRM_CAP_CURSOR_{WIDTH, HEIGHT} caps
by Damien Lespiau 28 Mar '14

28 Mar '14

Earlier this week, there was a bit of confusion about those new capabilities, to the point I think it's better to document the intention and API contract. The comment documents the current situation: - the radeon driver returns the only valid size for the hw - i915 returns the maximun cursor size - other drivers fall back to returning 64x64 The common contract is to return a valid cursor size. Cc: Sagar Kamble <sagar.a.kamble(a)intel.com> Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: Imre Deak <imre.deak(a)intel.com> Signed-off-by: Damien Lespiau <damien.lespiau(a)intel.com> --- include/uapi/drm/drm.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index b06c8ed..ec6b259 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -619,6 +619,15 @@ struct drm_gem_open { #define DRM_PRIME_CAP_EXPORT 0x2 #define DRM_CAP_TIMESTAMP_MONOTONIC 0x6 #define DRM_CAP_ASYNC_PAGE_FLIP 0x7 +/* + * The CURSOR_WIDTH and CURSOR_HEIGHT capabilities return a valid widthxheight + * combination for the hardware cursor. The intention is that a hardware + * agnostic userspace can query a cursor plane size to use. + * + * Note that the cross-driver contract is to merely return a valid size; + * drivers are free to attach another meaning on top, eg. i915 returns the + * maximum plane size. + */ #define DRM_CAP_CURSOR_WIDTH 0x8 #define DRM_CAP_CURSOR_HEIGHT 0x9 -- 1.8.3.1

3 2

[PATCH 06/16] drm: Protect the master management with a drm_device::master_mutex v3
by Thomas Hellstrom 28 Mar '14

28 Mar '14

The master management was previously protected by the drm_device::struct_mutex. In order to avoid locking order violations in a reworked dropped master security check in the vmwgfx driver, break it out into a separate master_mutex. Locking order is master_mutex -> struct_mutex. Also remove drm_master::blocked since it's not used. v2: Add an inline comment about what drm_device::master_mutex is protecting. v3: Remove unneeded struct_mutex locks. Fix error returns in drm_setmaster_ioctl(). Signed-off-by: Thomas Hellstrom <thellstrom(a)vmware.com> Reviewed-by: Brian Paul <brianp(a)vmware.com> --- drivers/gpu/drm/drm_fops.c | 22 ++++++++++----------- drivers/gpu/drm/drm_stub.c | 43 ++++++++++++++++++++++++++--------------- include/drm/drmP.h | 46 ++++++++++++++++++++++++-------------------- 3 files changed, 64 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index c7792b1..a0ce39c 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -231,12 +231,11 @@ static int drm_open_helper(struct inode *inode, struct file *filp, /* if there is no current master make this fd it, but do not create * any master object for render clients */ - mutex_lock(&dev->struct_mutex); + mutex_lock(&dev->master_mutex); if (drm_is_primary_client(priv) && !priv->minor->master) { /* create a new master */ priv->minor->master = drm_master_create(priv->minor); if (!priv->minor->master) { - mutex_unlock(&dev->struct_mutex); ret = -ENOMEM; goto out_close; } @@ -244,29 +243,23 @@ static int drm_open_helper(struct inode *inode, struct file *filp, priv->is_master = 1; /* take another reference for the copy in the local file priv */ priv->master = drm_master_get(priv->minor->master); - priv->authenticated = 1; - mutex_unlock(&dev->struct_mutex); if (dev->driver->master_create) { ret = dev->driver->master_create(dev, priv->master); if (ret) { - mutex_lock(&dev->struct_mutex); /* drop both references if this fails */ drm_master_put(&priv->minor->master); drm_master_put(&priv->master); - mutex_unlock(&dev->struct_mutex); goto out_close; } } - mutex_lock(&dev->struct_mutex); if (dev->driver->master_set) { ret = dev->driver->master_set(dev, priv, true); if (ret) { /* drop both references if this fails */ drm_master_put(&priv->minor->master); drm_master_put(&priv->master); - mutex_unlock(&dev->struct_mutex); goto out_close; } } @@ -274,7 +267,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp, /* get a reference to the master */ priv->master = drm_master_get(priv->minor->master); } - mutex_unlock(&dev->struct_mutex); + mutex_unlock(&dev->master_mutex); mutex_lock(&dev->struct_mutex); list_add(&priv->lhead, &dev->filelist); @@ -302,6 +295,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp, return 0; out_close: + mutex_unlock(&dev->master_mutex); if (dev->driver->postclose) dev->driver->postclose(dev, priv); out_prime_destroy: @@ -489,11 +483,13 @@ int drm_release(struct inode *inode, struct file *filp) } mutex_unlock(&dev->ctxlist_mutex); - mutex_lock(&dev->struct_mutex); + mutex_lock(&dev->master_mutex); if (file_priv->is_master) { struct drm_master *master = file_priv->master; struct drm_file *temp; + + mutex_lock(&dev->struct_mutex); list_for_each_entry(temp, &dev->filelist, lhead) { if ((temp->master == file_priv->master) && (temp != file_priv)) @@ -512,6 +508,7 @@ int drm_release(struct inode *inode, struct file *filp) master->lock.file_priv = NULL; wake_up_interruptible_all(&master->lock.lock_queue); } + mutex_unlock(&dev->struct_mutex); if (file_priv->minor->master == file_priv->master) { /* drop the reference held my the minor */ @@ -521,10 +518,13 @@ int drm_release(struct inode *inode, struct file *filp) } } - /* drop the reference held my the file priv */ + /* drop the master reference held by the file priv */ if (file_priv->master) drm_master_put(&file_priv->master); file_priv->is_master = 0; + mutex_unlock(&dev->master_mutex); + + mutex_lock(&dev->struct_mutex); list_del(&file_priv->lhead); mutex_unlock(&dev->struct_mutex); diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index d344513..8f65045 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -152,6 +152,7 @@ static void drm_master_destroy(struct kref *kref) struct drm_device *dev = master->minor->dev; struct drm_map_list *r_list, *list_temp; + mutex_lock(&dev->struct_mutex); if (dev->driver->master_destroy) dev->driver->master_destroy(dev, master); @@ -179,6 +180,7 @@ static void drm_master_destroy(struct kref *kref) drm_ht_remove(&master->magiclist); + mutex_unlock(&dev->struct_mutex); kfree(master); } @@ -194,19 +196,20 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, { int ret = 0; + mutex_lock(&dev->master_mutex); if (file_priv->is_master) - return 0; + goto out_unlock; - if (file_priv->minor->master && file_priv->minor->master != file_priv->master) - return -EINVAL; - - if (!file_priv->master) - return -EINVAL; + if (file_priv->minor->master) { + ret = -EINVAL; + goto out_unlock; + } - if (file_priv->minor->master) - return -EINVAL; + if (!file_priv->master) { + ret = -EINVAL; + goto out_unlock; + } - mutex_lock(&dev->struct_mutex); file_priv->minor->master = drm_master_get(file_priv->master); file_priv->is_master = 1; if (dev->driver->master_set) { @@ -216,27 +219,33 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, drm_master_put(&file_priv->minor->master); } } - mutex_unlock(&dev->struct_mutex); +out_unlock: + mutex_unlock(&dev->master_mutex); return ret; } int drm_dropmaster_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { + int ret = -EINVAL; + + mutex_lock(&dev->master_mutex); if (!file_priv->is_master) - return -EINVAL; + goto out_unlock; if (!file_priv->minor->master) - return -EINVAL; + goto out_unlock; - mutex_lock(&dev->struct_mutex); + ret = 0; if (dev->driver->master_drop) dev->driver->master_drop(dev, file_priv, false); drm_master_put(&file_priv->minor->master); file_priv->is_master = 0; - mutex_unlock(&dev->struct_mutex); - return 0; + +out_unlock: + mutex_unlock(&dev->master_mutex); + return ret; } /* @@ -567,6 +576,7 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver, spin_lock_init(&dev->event_lock); mutex_init(&dev->struct_mutex); mutex_init(&dev->ctxlist_mutex); + mutex_init(&dev->master_mutex); dev->anon_inode = drm_fs_inode_new(); if (IS_ERR(dev->anon_inode)) { @@ -620,6 +630,7 @@ err_minors: drm_minor_free(dev, DRM_MINOR_CONTROL); drm_fs_inode_free(dev->anon_inode); err_free: + mutex_destroy(&dev->master_mutex); kfree(dev); return NULL; } @@ -641,6 +652,8 @@ static void drm_dev_release(struct kref *ref) drm_minor_free(dev, DRM_MINOR_CONTROL); kfree(dev->devname); + + mutex_destroy(&dev->master_mutex); kfree(dev); } diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 30670d3..9a9a657 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -435,7 +435,8 @@ struct drm_prime_file_private { struct drm_file { unsigned always_authenticated :1; unsigned authenticated :1; - unsigned is_master :1; /* this file private is a master for a minor */ + /* Whether we're master for a minor. Protected by master_mutex */ + unsigned is_master :1; /* true when the client has asked us to expose stereo 3D mode flags */ unsigned stereo_allowed :1; @@ -714,28 +715,29 @@ struct drm_gem_object { #include <drm/drm_crtc.h> -/* per-master structure */ +/** + * struct drm_master - drm master structure + * + * @refcount: Refcount for this master object. + * @minor: Link back to minor char device we are master for. Immutable. + * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex. + * @unique_len: Length of unique field. Protected by drm_global_mutex. + * @unique_size: Amount allocated. Protected by drm_global_mutex. + * @magiclist: Hash of used authentication tokens. Protected by struct_mutex. + * @magicfree: List of used authentication tokens. Protected by struct_mutex. + * @lock: DRI lock information. + * @driver_priv: Pointer to driver-private information. + */ struct drm_master { - - struct kref refcount; /* refcount for this master */ - - struct drm_minor *minor; /**< link back to minor we are a master for */ - - char *unique; /**< Unique identifier: e.g., busid */ - int unique_len; /**< Length of unique field */ - int unique_size; /**< amount allocated */ - - int blocked; /**< Blocked due to VC switch? */ - - /** \name Authentication */ - /*@{ */ + struct kref refcount; + struct drm_minor *minor; + char *unique; + int unique_len; + int unique_size; struct drm_open_hash magiclist; struct list_head magicfree; - /*@} */ - - struct drm_lock_data lock; /**< Information on hardware lock */ - - void *driver_priv; /**< Private structure for driver to use */ + struct drm_lock_data lock; + void *driver_priv; }; /* Size of ringbuffer for vblank timestamps. Just double-buffer @@ -1050,7 +1052,8 @@ struct drm_minor { struct list_head debugfs_list; struct mutex debugfs_lock; /* Protects debugfs_list. */ - struct drm_master *master; /* currently active master for this node */ + /* currently active master for this node. Protected by master_mutex */ + struct drm_master *master; struct drm_mode_group mode_group; }; @@ -1100,6 +1103,7 @@ struct drm_device { /*@{ */ spinlock_t count_lock; /**< For inuse, drm_device::open_count, drm_device::buf_use */ struct mutex struct_mutex; /**< For others */ + struct mutex master_mutex; /**< For drm_minor::master and drm_file::is_master */ /*@} */ /** \name Usage Counters */ -- 1.7.10.4

2 3

[PATCH 0/3] drm/exynos: more cleanup with super device support
by Inki Dae 28 Mar '14

28 Mar '14

This patch series cleans up exynos drm framework and kms sub drivers using the component framework[1]. And this patch series had been posted for RFC[2]. Thanks, Inki Dae [1] http://lists.freedesktop.org/archives/dri-devel/2014-January/051249.html [2] http://comments.gmane.org/gmane.comp.video.dri.devel/101200 Inki Dae (3): drm/exynos: add super device support drm/exynos: register platform driver at each kms sub drivers ARM: dts: exynos4210-universal: add a super device node for exynos drm arch/arm/boot/dts/exynos4210-universal_c210.dts | 5 + drivers/gpu/drm/exynos/exynos_dp_core.c | 46 ++-- drivers/gpu/drm/exynos/exynos_drm_core.c | 216 ++++--------------- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 17 ++ drivers/gpu/drm/exynos/exynos_drm_crtc.h | 4 + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 14 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 259 +++++++++++------------ drivers/gpu/drm/exynos/exynos_drm_drv.h | 74 +++---- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 58 +++-- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 61 ++++-- drivers/gpu/drm/exynos/exynos_hdmi.c | 46 ++-- drivers/gpu/drm/exynos/exynos_mixer.c | 55 ++++- 12 files changed, 406 insertions(+), 449 deletions(-) -- 1.7.9.5

2 8

← Newer
1
...
63
64
65
66
67
68
69
...
93
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2014