dri-devel June 2013

dri-devel@lists.freedesktop.org

132 participants
727 discussions

[PATCH] drm: Avoid forcing a detection cycle following a hotplug event
by Chris Wilson 18 Jun '13

18 Jun '13

The typical procedure after a hotplug event is then to enumerate all the new modes. In the existing code, this is achieved by performing a forced detection cycle over all connectors. Ideally, we should just be able to use the current detection status and only enumerate the modes on the connectors that changed. This is a step in that direction by teaching the hotplug path to only use the known detection status rather than performing a second *forced* detection on every connector. As it currently stands, the first thing userspace does upon receipt of a hotplug uevent is call DRM_IOCTL_MODE_GETCONNECTOR on each connector, which of course, performs another full detection cycle. Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: dri-devel(a)lists.freedesktop.org Cc: Jakob Bornecrantz <jakob(a)vmware.com> Cc: Inki Dae <inki.dae(a)samsung.com> Cc: Adam Jackson <ajax(a)redhat.com> --- drivers/gpu/drm/drm_crtc.c | 3 ++- drivers/gpu/drm/drm_crtc_helper.c | 8 ++++++-- drivers/gpu/drm/drm_fb_helper.c | 14 ++++++++------ drivers/gpu/drm/exynos/exynos_drm_connector.c | 7 ++++--- drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 ++- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 3 ++- include/drm/drm_crtc.h | 2 +- include/drm/drm_crtc_helper.h | 2 +- 10 files changed, 28 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index e7e9242..635276c 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1537,7 +1537,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, if (out_resp->count_modes == 0) { connector->funcs->fill_modes(connector, dev->mode_config.max_width, - dev->mode_config.max_height); + dev->mode_config.max_height, + true); } /* delayed so we get modes regardless of pre-fill_modes state */ diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index ed1334e..7f2128c 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -96,6 +96,9 @@ static void drm_mode_validate_flag(struct drm_connector *connector, * @connector: connector to probe * @maxX: max width for modes * @maxY: max height for modes + * @force: whether to use the cached connector status or to force a + * fresh detection cycle, for instance after a hotplug event, we + * want to simply use the known status. * * LOCKING: * Caller must hold mode config lock. @@ -113,7 +116,8 @@ static void drm_mode_validate_flag(struct drm_connector *connector, * Number of modes found on @connector. */ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, - uint32_t maxX, uint32_t maxY) + uint32_t maxX, uint32_t maxY, + bool force) { struct drm_device *dev = connector->dev; struct drm_display_mode *mode; @@ -136,7 +140,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, connector->status = connector_status_disconnected; if (connector->funcs->force) connector->funcs->force(connector); - } else { + } else if (force) { connector->status = connector->funcs->detect(connector, true); } diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index b78cbe7..3e0802d 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1087,8 +1087,8 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe EXPORT_SYMBOL(drm_fb_helper_fill_var); static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper, - uint32_t maxX, - uint32_t maxY) + uint32_t maxX, uint32_t maxY, + bool force) { struct drm_connector *connector; int count = 0; @@ -1096,7 +1096,7 @@ static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper, for (i = 0; i < fb_helper->connector_count; i++) { connector = fb_helper->connector_info[i]->connector; - count += connector->funcs->fill_modes(connector, maxX, maxY); + count += connector->funcs->fill_modes(connector, maxX, maxY, force); } return count; @@ -1510,7 +1510,8 @@ bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel) count = drm_fb_helper_probe_connector_modes(fb_helper, dev->mode_config.max_width, - dev->mode_config.max_height); + dev->mode_config.max_height, + true); /* * we shouldn't end up with no modes here. */ @@ -1563,8 +1564,9 @@ int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper) max_height = fb_helper->fb->height; bpp_sel = fb_helper->fb->bits_per_pixel; - count = drm_fb_helper_probe_connector_modes(fb_helper, max_width, - max_height); + count = drm_fb_helper_probe_connector_modes(fb_helper, + max_width, max_height, + false); mutex_unlock(&fb_helper->dev->mode_config.mutex); drm_modeset_lock_all(dev); diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c index 8bcc13a..48ef16f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c @@ -249,7 +249,8 @@ static void exynos_drm_connector_dpms(struct drm_connector *connector, } static int exynos_drm_connector_fill_modes(struct drm_connector *connector, - unsigned int max_width, unsigned int max_height) + unsigned int max_width, unsigned int max_height, + bool force) { struct exynos_drm_connector *exynos_connector = to_exynos_connector(connector); @@ -267,8 +268,8 @@ static int exynos_drm_connector_fill_modes(struct drm_connector *connector, if (ops && ops->get_max_resol) ops->get_max_resol(manager->dev, &width, &height); - return drm_helper_probe_single_connector_modes(connector, width, - height); + return drm_helper_probe_single_connector_modes(connector, + width, height, force); } /* get detection status of display device. */ diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c index 51fa323..d18237d 100644 --- a/drivers/gpu/drm/i2c/ch7006_drv.c +++ b/drivers/gpu/drm/i2c/ch7006_drv.c @@ -355,7 +355,7 @@ static int ch7006_encoder_set_property(struct drm_encoder *encoder, } if (modes_changed) { - drm_helper_probe_single_connector_modes(connector, 0, 0); + drm_helper_probe_single_connector_modes(connector, 0, 0, false); /* Disable the crtc to ensure a full modeset is * performed whenever it's turned on again. */ diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c index acef48f..535dd14 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c @@ -759,7 +759,7 @@ static int nv17_tv_set_property(struct drm_encoder *encoder, } if (modes_changed) { - drm_helper_probe_single_connector_modes(connector, 0, 0); + drm_helper_probe_single_connector_modes(connector, 0, 0, false); /* Disable the crtc to ensure a full modeset is * performed whenever it's turned on again. */ diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 3e3c7ab..d9a0768 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1924,7 +1924,8 @@ static void vmw_guess_mode_timing(struct drm_display_mode *mode) int vmw_du_connector_fill_modes(struct drm_connector *connector, - uint32_t max_width, uint32_t max_height) + uint32_t max_width, uint32_t max_height, + bool force) { struct vmw_display_unit *du = vmw_connector_to_du(connector); struct drm_device *dev = connector->dev; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h index 6fa89c9..19fc306 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h @@ -138,7 +138,8 @@ void vmw_du_connector_restore(struct drm_connector *connector); enum drm_connector_status vmw_du_connector_detect(struct drm_connector *connector, bool force); int vmw_du_connector_fill_modes(struct drm_connector *connector, - uint32_t max_width, uint32_t max_height); + uint32_t max_width, uint32_t max_height, + bool force); int vmw_du_connector_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t val); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index adb3f9b..373e774 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -468,7 +468,7 @@ struct drm_connector_funcs { */ enum drm_connector_status (*detect)(struct drm_connector *connector, bool force); - int (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height); + int (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height, bool force); int (*set_property)(struct drm_connector *connector, struct drm_property *property, uint64_t val); void (*destroy)(struct drm_connector *connector); diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index f43d556..cce7221 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -125,7 +125,7 @@ struct drm_connector_helper_funcs { struct drm_encoder *(*best_encoder)(struct drm_connector *connector); }; -extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); +extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY, bool force); extern void drm_helper_disable_unused_functions(struct drm_device *dev); extern int drm_crtc_helper_set_config(struct drm_mode_set *set); extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, -- 1.7.10.4

3 4

Radeon lockup on 3.8.5-201.fc18.x86_64
by Andy Lutomirski 18 Jun '13

18 Jun '13

Every day or so, I'll click something and my screens go blank for a second or two. dmesg complains about a lockup, and afterwards everything is painfully slow. (Even switching focus to other emacs windows takes a second or two.) Once this happens, if I restart X, I get a blank screen, although the mouse still works and I can switch VTs and use the console. My userspace driver is xorg-x11-drv-ati-7.0.0-0.9.20121015gitbd9e2c064.fc18.src.rpm. I have Option "ColorTiling2D" "true", but I'm not sure this matters. lspci says: 08:00.0 VGA compatible controller: Advanced Micro Devices [AMD] nee ATI Caicos [Radeon HD 6450] [ 7508.750753] radeon 0000:08:00.0: GPU lockup CP stall for more than 5102593msec [ 7508.750757] radeon 0000:08:00.0: GPU lockup (waiting for 0x0000000000000155 last fence id 0x0000000000000154) [ 7508.751832] radeon 0000:08:00.0: Saved 71 dwords of commands on ring 0. [ 7508.751837] radeon 0000:08:00.0: GPU softreset: 0x00000007 [ 7508.762035] radeon 0000:08:00.0: GRBM_STATUS = 0xA0003828 [ 7508.762037] radeon 0000:08:00.0: GRBM_STATUS_SE0 = 0x00000007 [ 7508.762040] radeon 0000:08:00.0: GRBM_STATUS_SE1 = 0x00000007 [ 7508.762042] radeon 0000:08:00.0: SRBM_STATUS = 0x200400C0 [ 7508.762045] radeon 0000:08:00.0: R_008674_CP_STALLED_STAT1 = 0x00000000 [ 7508.762047] radeon 0000:08:00.0: R_008678_CP_STALLED_STAT2 = 0x00000000 [ 7508.762050] radeon 0000:08:00.0: R_00867C_CP_BUSY_STAT = 0x00000004 [ 7508.762053] radeon 0000:08:00.0: R_008680_CP_STAT = 0x80008647 [ 7508.762054] radeon 0000:08:00.0: GRBM_SOFT_RESET=0x00007F6B [ 7508.762109] radeon 0000:08:00.0: GRBM_STATUS = 0x00003828 [ 7508.762112] radeon 0000:08:00.0: GRBM_STATUS_SE0 = 0x00000007 [ 7508.762114] radeon 0000:08:00.0: GRBM_STATUS_SE1 = 0x00000007 [ 7508.762117] radeon 0000:08:00.0: SRBM_STATUS = 0x200400C0 [ 7508.762120] radeon 0000:08:00.0: R_008674_CP_STALLED_STAT1 = 0x00000000 [ 7508.762122] radeon 0000:08:00.0: R_008678_CP_STALLED_STAT2 = 0x00000000 [ 7508.762125] radeon 0000:08:00.0: R_00867C_CP_BUSY_STAT = 0x00000000 [ 7508.762127] radeon 0000:08:00.0: R_008680_CP_STAT = 0x00000000 [ 7508.762131] radeon 0000:08:00.0: R_00D034_DMA_STATUS_REG = 0x4448C156 [ 7508.762187] radeon 0000:08:00.0: R_00D034_DMA_STATUS_REG = 0x44C83D57 [ 7508.779603] radeon 0000:08:00.0: GPU reset succeeded, trying to resume [ 7508.798041] [drm] probing gen 2 caps for device 8086:1d1a = 2/0 [ 7508.798047] [drm] enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0 [ 7508.805050] [drm] PCIE GART of 512M enabled (table at 0x0000000000040000). [ 7508.805186] radeon 0000:08:00.0: WB enabled [ 7508.805189] radeon 0000:08:00.0: fence driver on ring 0 use gpu addr 0x0000000040000c00 and cpu addr 0xffff880442ddcc00 [ 7508.805190] radeon 0000:08:00.0: fence driver on ring 3 use gpu addr 0x0000000040000c0c and cpu addr 0xffff880442ddcc0c [ 7508.821692] [drm] ring test on 0 succeeded in 2 usecs [ 7508.821765] [drm] ring test on 3 succeeded in 1 usecs [ 7508.821845] [drm] ib test on ring 0 succeeded in 0 usecs [ 7508.821923] [drm] ib test on ring 3 succeeded in 1 usecs --Andy

5 14

[PATCH v4 0/2] Enhance EDID quirks to allow forcing a mode
by Dylan Semler 18 Jun '13

18 Jun '13

Changes in this version * rename do_force_quirk_modes() -> do_force_quirk_mode() * use list_for_each_entry() instead of list_for_each_entry_safe() in do_force_quirk_mode() * remove num_modes from do_force_quirk_mode(), just return 1 or 0 as appropriate * remove unused quirks argument from add_force_quirk_modes() * fixes to allow cases of forcing multiple modes * adjusted comments to adhere closer to style guides Changes in version 3 * Uses drm_cvt_mode() instead of drm_gtf_mode() to build modeline * Adds bool to specify reduced blanking to edid_quirk_force_mode * Removes preferred bit from all other modes Changes in version 2 * none There is at least one monitor that doesn't report its native resolution in its EDID block. This enhancement extends the EDID quirk logic to make monitors like this "just work". The first patch in this series sets up a new quirk list where monitors' correct width, height, refresh rate, and reduced blanking parameters are specified. When a matching monitor is attached the full mode is calculated with drm_cvt_mode() and added to the connector. The DRM_MODE_TYPE_PREFERRED bit is set on the new mode and unset from all other modes. The first patch also defines a new quirk bit: EDID_QUIRK_FORCE_MODE. This bit needs to be set for the new quirk list described above to be checked. The second patch adds the offending monitor to the quirk lists. Dylan Semler (2): drm: Enhance EDID quirks to explicitly set a mode drm: Add EDID force quirk for MMT Monitor2Go HD+ drivers/gpu/drm/drm_edid.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) -- 1.7.11.7

2 5

[PATCH 0/9] exynos5420/hdmi: add support for hdmi subsystem
by Rahul Sharma 18 Jun '13

18 Jun '13

Add support for exynos5420 hdmi subsystem. It adds compatible strings for exynos5420 and Changes the drivers as per IP modifications. 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. Rahul Sharma (9): drm/exynos: use SoC name to identify hdmi version drm/exynos: rename compatible strings for hdmi subsystem drm/exynos: add support for exynos5420 hdmi drm/exynos: add support for exynos5420 hdmiphy drm/exynos: add support for exynos5420 mixer drm/exynos: fix interlace resolutions for exynos5420 drm/exynos: use of_get_named_gpio to get hdmi hpd gpio ARM/dts: add phy property to exynos5250 hdmi dt node ARM/dts: update device tree binding documentation for hdmi susbsystem .../devicetree/bindings/video/exynos_hdmi.txt | 25 +- .../devicetree/bindings/video/exynos_hdmiddc.txt | 4 +- .../devicetree/bindings/video/exynos_hdmiphy.txt | 12 +- .../devicetree/bindings/video/exynos_mixer.txt | 14 +- arch/arm/boot/dts/cros5250-common.dtsi | 4 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 7 +- arch/arm/boot/dts/exynos5250.dtsi | 4 +- drivers/gpu/drm/exynos/exynos_ddc.c | 2 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 544 ++++++++++++++------ drivers/gpu/drm/exynos/exynos_hdmiphy.c | 2 +- drivers/gpu/drm/exynos/exynos_mixer.c | 61 ++- drivers/gpu/drm/exynos/regs-hdmi.h | 78 +-- drivers/gpu/drm/exynos/regs-mixer.h | 7 + 13 files changed, 526 insertions(+), 238 deletions(-) -- 1.7.10.4

5 16

[PATCH] drm/tegra: Include linux/types.h
by Paul Bolle 18 Jun '13

18 Jun '13

"make headers_check" complains about include/uapi/drm/tegra_drm.h: [...]/usr/include/drm/tegra_drm.h:21: found __[us]{8,16,32,64} type without #include <linux/types.h> So let's include linux/types.h in this header. Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl> --- Tested only with "make headers_check". I don't actually build or run code that uses tegra_drm.h. include/uapi/drm/tegra_drm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h index 6e132a2..6698e81 100644 --- a/include/uapi/drm/tegra_drm.h +++ b/include/uapi/drm/tegra_drm.h @@ -17,6 +17,8 @@ #ifndef _UAPI_TEGRA_DRM_H_ #define _UAPI_TEGRA_DRM_H_ +#include <linux/types.h> + struct drm_tegra_gem_create { __u64 size; __u32 flags; -- 1.8.1.4

2 3

[patch] drm/i915: remove a superflous semi-colon
by Dan Carpenter 18 Jun '13

18 Jun '13

This macro doesn't need a semi-colon. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index e5cc7c0..592b0eb9 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1773,7 +1773,7 @@ int __i915_add_request(struct intel_ring_buffer *ring, struct drm_i915_gem_object *batch_obj, u32 *seqno); #define i915_add_request(ring, seqno) \ - __i915_add_request(ring, NULL, NULL, seqno); + __i915_add_request(ring, NULL, NULL, seqno) int __must_check i915_wait_seqno(struct intel_ring_buffer *ring, uint32_t seqno); int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);

2 1

[PATCH 0/3] fbdev no more!
by Daniel Vetter 18 Jun '13

18 Jun '13

Hi all, So I've taken a look again at the locking mess in our fbdev support and cried. Fixing up the console_lock mess around the fbdev notifier will be real work, semanatically the fbdev layer does lots of stupid things (like the radeon resume issue I've just debugged) and the panic notifier is pretty much a lost cause. So I've decided to instead rip it all out. It seems to work \o/ Of course a general purpose distro propably wants David's kmscon for any fallbacks needs and a system compositor to ditch the VT subsystem - atm my machine here runs with the dummy console so that VT switching between different X sessions still works ;-) Oh and: At least fedora's boot splash seems to be unhappy about the lack of an fbdev (it doesn't seem to do anything), which breaks early disk encryption a bit. The black screen itself shouldn't be a big issue at least for i915, since with all the fastboot work we can just hang onto the current config and framebuffer (one missing patch from Chris for the fb preservartion). So as long as the bios/grub put up something nice, it'll look ok. So just a small step here really, but imo into the right direction. Now, please bring on the flames! Aside: We can hide the #ifdef mess a bit better in drm/i915 I think, but I'd like to wait for a bit of feedback first. And one more: This also removes the console_lock completely from our critical path in suspend/resume! One thing I haven't wasted a single thought about is kgdb and panic notifier support. But since the current code is pretty decently broken already (we have _tons_ of mutex grabbing and waits in there) I don't think people care that much about it anyway. Using a sprite to smash the kgdb/panic output on top of whatever's currently displaying might be an approach. Cheers, Daniel Daniel Vetter (3): drm: Add separate Kconfig option for fbdev helpers drm/i915: Kconfig option to disable the legacy fbdev support drm/i915: rename intel_fb.c to intel_fbdev.c drivers/gpu/drm/Kconfig | 57 ++----- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/ast/Kconfig | 1 + drivers/gpu/drm/cirrus/Kconfig | 1 + drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/gma500/Kconfig | 1 + drivers/gpu/drm/i915/Kconfig | 56 +++++++ drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/i915_dma.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_display.c | 12 +- drivers/gpu/drm/i915/intel_drv.h | 39 ++++- drivers/gpu/drm/i915/intel_fb.c | 314 ----------------------------------- drivers/gpu/drm/i915/intel_fbdev.c | 314 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/mgag200/Kconfig | 1 + drivers/gpu/drm/nouveau/Kconfig | 1 + drivers/gpu/drm/omapdrm/Kconfig | 1 + drivers/gpu/drm/qxl/Kconfig | 1 + drivers/gpu/drm/shmobile/Kconfig | 1 + drivers/gpu/drm/tilcdc/Kconfig | 1 + drivers/gpu/drm/udl/Kconfig | 1 + drivers/gpu/host1x/drm/Kconfig | 1 + drivers/staging/imx-drm/Kconfig | 1 + 24 files changed, 452 insertions(+), 373 deletions(-) create mode 100644 drivers/gpu/drm/i915/Kconfig delete mode 100644 drivers/gpu/drm/i915/intel_fb.c create mode 100644 drivers/gpu/drm/i915/intel_fbdev.c -- 1.7.11.7

4 8

linux-next: manual merge of the drm-intel tree with the drm tree
by Stephen Rothwell 18 Jun '13

18 Jun '13

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in drivers/gpu/drm/i915/intel_fb.c between commit b72447cdf129 ("drm/i915: Drop bogus fbdev sprite disable code") from the drm tree and commit b51b32cde175 ("drm/i915: s/drm_i915_private_t/struct drm_i915_private/") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_fb.c index 3b03c3c,244060a..0000000 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@@ -291,7 -292,9 +292,7 @@@ void intel_fb_output_poll_changed(struc void intel_fb_restore_mode(struct drm_device *dev) { int ret; - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_i915_private *dev_priv = dev->dev_private; - struct drm_mode_config *config = &dev->mode_config; - struct drm_plane *plane; if (INTEL_INFO(dev)->num_pipes == 0) return;

1 0

[PATCH] drm/nouveau: remove limit on gart
by Maarten Lankhorst 17 Jun '13

17 Jun '13

Most graphics cards nowadays have a multiple of this limit as their vram, so limiting GART doesn't seem to make much sense. Signed-off-by: Maarten >Lnkhorst <maarten.lankhorst(a)canonical.com> --- diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 3a5e19a..41ddecd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -168,9 +168,6 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man, struct nouveau_bo *nvbo = nouveau_bo(bo); struct nouveau_mem *node; - if (unlikely((mem->num_pages << PAGE_SHIFT) >= 512 * 1024 * 1024)) - return -ENOMEM; - node = kzalloc(sizeof(*node), GFP_KERNEL); if (!node) return -ENOMEM; @@ -406,8 +403,6 @@ nouveau_ttm_init(struct nouveau_drm *drm) /* GART init */ if (drm->agp.stat != ENABLED) { drm->gem.gart_available = nouveau_vmmgr(drm->device)->limit; - if (drm->gem.gart_available > 512 * 1024 * 1024) - drm->gem.gart_available = 512 * 1024 * 1024; } else { drm->gem.gart_available = drm->agp.size; }

2 1

[PATCH v3, part2 14/20] PCI, DRM: use hotplug-safe iterators to walk PCI buses
by Jiang Liu 17 Jun '13

17 Jun '13

Enhance DRM drvier to use hotplug-safe iterators to walk PCI buses. Signed-off-by: Jiang Liu <jiang.liu(a)huawei.com> Cc: David Airlie <airlied(a)linux.ie> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-kernel(a)vger.kernel.org --- drivers/gpu/drm/drm_fops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 429e07d..dc8c40b 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -359,9 +359,11 @@ static int drm_open_helper(struct inode *inode, struct file *filp, pci_dev_put(pci_dev); } if (!dev->hose) { - struct pci_bus *b = pci_bus_b(pci_root_buses.next); - if (b) + struct pci_bus *b = pci_get_next_root_bus(NULL); + if (b) { dev->hose = b->sysdata; + pci_bus_put(b); + } } } #endif -- 1.8.1.2

2 1

← Newer
1
...
59
60
61
62
63
64
65
...
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