dri-devel June 2013

dri-devel@lists.freedesktop.org

132 participants
727 discussions

[PATCH 2/2] drm: Convert drm class driver from legacy pm ops to dev_pm_ops
by Shuah Khan 22 Jun '13

22 Jun '13

Convert drivers/gpu/drm class to use dev_pm_ops for power management and remove Legacy PM ops hooks. With this change, drm class registers suspend/resume callbacks via class->pm (dev_pm_ops) instead of Legacy class->suspend/resume. When __device_suspend() runs call-backs, it will find class->pm ops for the drm class. Signed-off-by: Shuah Khan <shuah.kh(a)samsung.com> --- drivers/gpu/drm/drm_sysfs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 0229665..8d94778 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -37,7 +37,7 @@ static struct device_type drm_sysfs_device_minor = { * Just figures out what the actual struct drm_device associated with * @dev is and calls its suspend hook, if present. */ -static int drm_class_suspend(struct device *dev, pm_message_t state) +static int drm_class_suspend(struct device *dev) { if (dev->type == &drm_sysfs_device_minor) { struct drm_minor *drm_minor = to_drm_minor(dev); @@ -46,7 +46,8 @@ static int drm_class_suspend(struct device *dev, pm_message_t state) if (drm_minor->type == DRM_MINOR_LEGACY && !drm_core_check_feature(drm_dev, DRIVER_MODESET) && drm_dev->driver->suspend) - return drm_dev->driver->suspend(drm_dev, state); + return drm_dev->driver->suspend(drm_dev, + get_pm_transition()); } return 0; } @@ -72,6 +73,11 @@ static int drm_class_resume(struct device *dev) return 0; } +static const struct dev_pm_ops drm_class_dev_pm_ops = { + .suspend = drm_class_suspend, + .resume = drm_class_resume, +}; + static char *drm_devnode(struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev)); @@ -106,8 +112,7 @@ struct class *drm_sysfs_create(struct module *owner, char *name) goto err_out; } - class->suspend = drm_class_suspend; - class->resume = drm_class_resume; + class->pm = &drm_class_dev_pm_ops; err = class_create_file(class, &class_attr_version.attr); if (err) -- 1.7.10.4

1 0

[PATCH 0/2] Documentation improvements
by Laurent Pinchart 22 Jun '13

22 Jun '13

Hello, Here are two patches that improve the DRM documentation by documenting the KMS property API, and removing an outdated note about the i915 driver. Laurent Pinchart (2): drm/doc: Remove outdated note about i915 driver not behaving properly drm/doc: Document the KMS property API Documentation/DocBook/drm.tmpl | 147 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 143 insertions(+), 4 deletions(-) -- Regards, Laurent Pinchart

4 5

[PATCH v2 0/2] Documentation improvements
by Laurent Pinchart 22 Jun '13

22 Jun '13

Hello, Here are two patches that improve the DRM documentation by documenting the KMS property API, and removing an outdated note about the i915 driver. Changes since v1: - Fixed typos in patch 2/2 Laurent Pinchart (2): drm/doc: Remove outdated note about i915 driver not behaving properly drm/doc: Document the KMS property API Documentation/DocBook/drm.tmpl | 147 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 143 insertions(+), 4 deletions(-) -- Regards, Laurent Pinchart

1 2

[PULL] drm-tegra-fixes
by Thierry Reding 22 Jun '13

22 Jun '13

Hi Dave, The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75: Linux 3.10-rc2 (2013-05-20 14:37:38 -0700) are available in the git repository at: git://anongit.freedesktop.org/tegra/linux.git drm/fixes for you to fetch changes up to 2b15aa0fd466a4b2defdfd84c0b5168804b3eb33: gpu: host1x: Rework CPU syncpoint increment (2013-06-20 12:21:38 +0200) I know this comes awfully late and is much bigger than I'd like. It's all my fault, though, since I've been travelling a lot lately and just didn't find the time to prepare this earlier. I did want to sort out patches that didn't warrant to go in before the final 3.10 release, but all met the criteria as far as I could tell. The larger chunks are fixes for the firewall that checks job submissions from userspace, which was unfortunately not working properly. All other patches are mostly one-liners to fix things that were introduced in 3.10. Thierry ---------------------------------------------------------------- Arto Merilainen (5): gpu: host1x: Check reloc table before usage gpu: host1x: Copy gathers before verification gpu: host1x: Fix memory access in syncpt request gpu: host1x: Fix client_managed type gpu: host1x: Rework CPU syncpoint increment Emil Goode (1): drm/tegra: Include header drm/drm.h Laurent Pinchart (1): drm/tegra: Remove DRIVER_BUS_PLATFORM from driver_features Terje Bergstrom (2): gpu: host1x: Check INCR opcode correctly gpu: host1x: Don't reset firewall between gathers Thierry Reding (5): drm/tegra: Don't disable unused planes drm/tegra: Explicitly set irq_enabled drm/tegra: Honor pixel-format changes MAINTAINERS: Update Tegra DRM entry drm/tegra: Fix return value Wei Yongjun (2): drm/tegra: fix missing unlock on error drm/tegra: fix error return code in gr2d_submit() MAINTAINERS | 7 +- drivers/gpu/host1x/dev.h | 8 +-- drivers/gpu/host1x/drm/dc.c | 5 ++ drivers/gpu/host1x/drm/drm.c | 14 +++- drivers/gpu/host1x/drm/gr2d.c | 12 ++-- drivers/gpu/host1x/hw/cdma_hw.c | 2 +- drivers/gpu/host1x/hw/syncpt_hw.c | 12 ++-- drivers/gpu/host1x/job.c | 135 +++++++++++++++++--------------------- drivers/gpu/host1x/syncpt.c | 26 +++----- drivers/gpu/host1x/syncpt.h | 13 ++-- include/uapi/drm/tegra_drm.h | 2 + 11 files changed, 113 insertions(+), 123 deletions(-)

2 3

[PATCH] drm: always provide debugfs function prototypes
by Arnd Bergmann 22 Jun '13

22 Jun '13

It is generally considered bad style to enclose function prototypes in header files in #ifdef. This case illustrates why that is: The tegra host1x driver calls into the debugfs functions if CONFIG_DEBUG_FS is enabled, but that code is otherwise already discarded by the compiler, so leaving the prototype in place actually makes everything work. drivers/gpu/host1x/drm/dc.c: In function 'tegra_dc_debugfs_init': drivers/gpu/host1x/drm/dc.c:1004:2: error: implicit declaration of function 'drm_debugfs_create_files' [-Werror=implicit-function-declaration] drivers/gpu/host1x/drm/dc.c: In function 'tegra_dc_debugfs_exit': drivers/gpu/host1x/drm/dc.c:1026:2: error: implicit declaration of function 'drm_debugfs_remove_files' [-Werror=implicit-function-declaration] Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Cc: Ben Gamari <bgamari(a)gmail.com> Cc: Dave Airlie <airlied(a)redhat.com> diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 63d17ee..8bc105e 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1551,7 +1551,7 @@ extern int drm_proc_init(struct drm_minor *minor, struct proc_dir_entry *root); extern int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root); /* Debugfs support */ -#if defined(CONFIG_DEBUG_FS) + extern int drm_debugfs_init(struct drm_minor *minor, int minor_id, struct dentry *root); extern int drm_debugfs_create_files(struct drm_info_list *files, int count, @@ -1559,7 +1559,6 @@ extern int drm_debugfs_create_files(struct drm_info_list *files, int count, extern int drm_debugfs_remove_files(struct drm_info_list *files, int count, struct drm_minor *minor); extern int drm_debugfs_cleanup(struct drm_minor *minor); -#endif /* Info file support */ extern int drm_name_info(struct seq_file *m, void *data);

2 1

Re: drivers/gpu/drm/mgag200/mgag200_cursor.c:134:57: sparse: incorrect type in argument 1 (different address spaces)
by Christopher Harvey 21 Jun '13

21 Jun '13

Hey Dave, Do we care about these warnings? I'm not sure how to get around them. thanks, Chris P.S, this is my last day at Matrox, but I'll maintain it from another email. On Fri, Jun 21 2013, kbuild test robot <fengguang.wu(a)intel.com> wrote: > tree: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next master > head: 849aa58856855ae73d9654b2e675f2c7a6ad4c9b > commit: a080db9fdda77ffaa43679d21b4bd78ead0cf9e1 drm/mgag200: Hardware cursor support > date: 4 days ago > > > sparse warnings: (new ones prefixed by >>) > >>> drivers/gpu/drm/mgag200/mgag200_cursor.c:134:57: sparse: incorrect type in argument 1 (different address spaces) > drivers/gpu/drm/mgag200/mgag200_cursor.c:134:57: expected void [noderef] <asn:2>*<noident> > drivers/gpu/drm/mgag200/mgag200_cursor.c:134:57: got void * >>> drivers/gpu/drm/mgag200/mgag200_cursor.c:200:65: sparse: incorrect type in argument 1 (different address spaces) > drivers/gpu/drm/mgag200/mgag200_cursor.c:200:65: expected void [noderef] <asn:2>*<noident> > drivers/gpu/drm/mgag200/mgag200_cursor.c:200:65: got void * >>> drivers/gpu/drm/mgag200/mgag200_cursor.c:218:55: sparse: incorrect type in argument 1 (different address spaces) > drivers/gpu/drm/mgag200/mgag200_cursor.c:218:55: expected void volatile [noderef] <asn:2>*dst > drivers/gpu/drm/mgag200/mgag200_cursor.c:218:55: got void * > > vim +134 drivers/gpu/drm/mgag200/mgag200_cursor.c > > 128 } > 129 } > 130 > 131 memset(&colour_set[0], 0, sizeof(uint32_t)*16); > 132 /* width*height*4 = 16384 */ > 133 for (i = 0; i < 16384; i += 4) { > > 134 this_colour = ioread32(bo->kmap.virtual + i); > 135 /* No transparency */ > 136 if (this_colour>>24 != 0xff && > 137 this_colour>>24 != 0x0) { > 138 if (warn_transparent) { > 139 dev_info(&dev->pdev->dev, "Video card doesn't support cursors with partial transparency.\n"); > 140 dev_info(&dev->pdev->dev, "Not enabling hardware cursor.\n"); > 141 warn_transparent = false; /* Only tell the user once. */ > 142 } > 143 ret = -EINVAL; > 144 goto out3; > 145 } > 146 /* Don't need to store transparent pixels as colours */ > 147 if (this_colour>>24 == 0x0) > 148 continue; > 149 found = false; > 150 for (palette_iter = &colour_set[0]; palette_iter != next_space; palette_iter++) { > 151 if (*palette_iter == this_colour) { > 152 found = true; > 153 break; > 154 } > 155 } > 156 if (found) > 157 continue; > 158 /* We only support 4bit paletted cursors */ > 159 if (colour_count >= 16) { > 160 if (warn_palette) { > 161 dev_info(&dev->pdev->dev, "Video card only supports cursors with up to 16 colours.\n"); > 162 dev_info(&dev->pdev->dev, "Not enabling hardware cursor.\n"); > 163 warn_palette = false; /* Only tell the user once. */ > 164 } > 165 ret = -EINVAL; > 166 goto out3; > 167 } > 168 *next_space = this_colour; > 169 next_space++; > 170 colour_count++; > 171 } > 172 > 173 /* Program colours from cursor icon into palette */ > 174 for (i = 0; i < colour_count; i++) { > 175 if (i <= 2) > 176 reg_index = 0x8 + i*0x4; > 177 else > 178 reg_index = 0x60 + i*0x3; > 179 WREG_DAC(reg_index, colour_set[i] & 0xff); > 180 WREG_DAC(reg_index+1, colour_set[i]>>8 & 0xff); > 181 WREG_DAC(reg_index+2, colour_set[i]>>16 & 0xff); > 182 BUG_ON((colour_set[i]>>24 & 0xff) != 0xff); > 183 } > 184 > 185 /* Map up-coming buffer to write colour indices */ > 186 if (!pixels_prev->kmap.virtual) { > 187 ret = ttm_bo_kmap(&pixels_prev->bo, 0, > 188 pixels_prev->bo.num_pages, > 189 &pixels_prev->kmap); > 190 if (ret) { > 191 dev_err(&dev->pdev->dev, "failed to kmap cursor updates\n"); > 192 goto out3; > 193 } > 194 } > 195 > 196 /* now write colour indices into hardware cursor buffer */ > 197 for (row = 0; row < 64; row++) { > 198 memset(&this_row[0], 0, 48); > 199 for (col = 0; col < 64; col++) { > 200 this_colour = ioread32(bo->kmap.virtual + 4*(col + 64*row)); > 201 /* write transparent pixels */ > 202 if (this_colour>>24 == 0x0) { > 203 this_row[47 - col/8] |= 0x80>>(col%8); > 204 continue; > 205 } > 206 > 207 /* write colour index here */ > 208 for (i = 0; i < colour_count; i++) { > 209 if (colour_set[i] == this_colour) { > 210 if (col % 2) > 211 this_row[col/2] |= i<<4; > 212 else > 213 this_row[col/2] |= i; > 214 break; > 215 } > 216 } > 217 } > 218 memcpy_toio(pixels_prev->kmap.virtual + row*48, &this_row[0], 48); > 219 } > 220 > 221 /* Program gpu address of cursor buffer */ > > --- > 0-DAY kernel build testing backend Open Source Technology Center > http://lists.01.org/mailman/listinfo/kbuild Intel Corporation

1 0

re: drm/radeon/kms: get HPD info for connectors
by Dan Carpenter 21 Jun '13

21 Jun '13

Hello Alex Deucher, The patch eed45b30cd14: "drm/radeon/kms: get HPD info for connectors" from Dec 4, 2009, leads to the following warning: "drivers/gpu/drm/radeon/radeon_atombios.c:950 radeon_get_atom_connector_info_from_supported_devices_table() error: buffer overflow 'supported_devices->info.asConnInfo' 10 <= 15" drivers/gpu/drm/radeon/radeon_atombios.c 943 if (frev > 1) 944 max_device = ATOM_MAX_SUPPORTED_DEVICE; 945 else 946 max_device = ATOM_MAX_SUPPORTED_DEVICE_INFO; 947 948 for (i = 0; i < max_device; i++) { 949 ATOM_CONNECTOR_INFO_I2C ci = 950 supported_devices->info.asConnInfo[i]; If max_device is set to ATOM_MAX_SUPPORTED_DEVICE then we read beyond the end of the asConnInfo[] array and crash. 951 952 bios_connectors[i].valid = false; 953 regards, dan carpenter

2 1

[PATCH 0/2] i.MX53 IPU + TVE patches
by Philipp Zabel 21 Jun '13

21 Jun '13

Hi, converting the IPU IRQ handling to use irq_domain_add_linear is listed in drivers/staging/imx-drm/TODO as one of the tasks to be done before the IPU driver can be moved out of staging. These patches fix the number IPU_NUM_IRQS and add a linear irq domain. regards Philipp --- drivers/staging/imx-drm/TODO | 1 - drivers/staging/imx-drm/ipu-v3/ipu-common.c | 66 +++++++++++++++++++---------- drivers/staging/imx-drm/ipu-v3/ipu-prv.h | 4 +- 3 files changed, 45 insertions(+), 26 deletions(-)

1 3

[PATCH v3 0/3] exynos5420/hdmi: add support for hdmi subsystem
by Rahul Sharma 21 Jun '13

21 Jun '13

Add support for exynos5420 hdmi subsystem. It adds compatible strings for exynos5420 mixer and Changes the drivers as per IP modifications. This set doesn't have changes for hdmiphy, which will posted independently. This set is based on drm-next branch of Inki Dae's tree at http://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git. v3: 1) instead of replacing with old compatible strings, new ones are added without removing the support for older ones. 2) removed patch "drm/exynos: fix interlace resolutions for exynos5420" as it is independently merged. v2: 1)update device mixer tree binding document with "samsung,exynos5420-mixer" Rahul Sharma (3): drm/exynos: add new compatible strings for hdmi subsystem drm/exynos: add support for exynos5420 mixer ARM/dts: change compatible strings for hdmi subsystem .../devicetree/bindings/video/exynos_hdmi.txt | 7 ++- .../devicetree/bindings/video/exynos_hdmiddc.txt | 7 ++- .../devicetree/bindings/video/exynos_hdmiphy.txt | 7 ++- .../devicetree/bindings/video/exynos_mixer.txt | 9 ++- arch/arm/boot/dts/cros5250-common.dtsi | 4 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +- arch/arm/boot/dts/exynos5250.dtsi | 4 +- drivers/gpu/drm/exynos/exynos_ddc.c | 2 + drivers/gpu/drm/exynos/exynos_hdmi.c | 3 + drivers/gpu/drm/exynos/exynos_hdmiphy.c | 4 ++ drivers/gpu/drm/exynos/exynos_mixer.c | 62 ++++++++++++++------ drivers/gpu/drm/exynos/regs-mixer.h | 7 +++ 12 files changed, 89 insertions(+), 31 deletions(-) -- 1.7.10.4

6 11

[PATCH 0/5] clk/exynos5420: add clocks for hdmi subsystem
by Rahul Sharma 21 Jun '13

21 Jun '13

Add clock changes for hdmi subsystem for exynos5250 SoC. These include addition of new clocks like mout_hdmi and smmu_tv, associating ID to clk_hdmiphy and some essential corrections. This set is based on kukjin's for-next branch at http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git. This set dependents on the following patches which add support for Exynos5420 http://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg19264.html Rahul Sharma (5): clk/exynos5420: add sclk_hdmiphy to the list of special clocks clk/exynos5420: add gate clock for tv sysmmu clk/exynos5420: fix the order of parents of hdmi mux clk/exynos5420: add hdmi mux to change parents in hdmi driver clk/exynos5420: assign sclk_pixel id to pixel clock divider .../devicetree/bindings/clock/exynos5420-clock.txt | 7 +++++++ drivers/clk/samsung/clk-exynos5420.c | 18 +++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) -- 1.7.10.4

2 12

← Newer
1
...
55
56
57
58
59
60
61
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2013