Re: linux-next: manual merge of the drm tree with Linus' tree

[Sedat Dilek <sedat.dilek@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]

On Fri, Aug 24, 2012 at 9:12 AM, Dave Airlie <airlied@gmail.com> wrote:
> On Fri, Aug 24, 2012 at 5:13 PM, Jani Nikula <jani.nikula@intel.com> wrote:
>> On Fri, 24 Aug 2012, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>> Hi Dave,
>>>
>>> Today's linux-next merge of the drm tree got a conflict in
>>> drivers/gpu/drm/i915/intel_modes.c between commit 4eab81366465
>>> ("drm/i915: extract connector update from intel_ddc_get_modes() for
>>> reuse") from Linus' tree and commit 451023dc32d4 ("drm: remove the
>>> raw_edid field from struct drm_display_info") from the drm tree.
>>
>> Ugh, both from me, sorry about that. Wasn't sure when or in what order
>> they'd go in.
>>
>>> I fixed it up (see below) and can carry the fix as necessary.
>>
>> I'm not quite sure what the patch below is against, but just removing
>> the reference to raw_edid from a slightly different place is the way to
>> go. Like you seem to do, so:
>>
>> Acked-by: Jani Nikula <jani.nikula@intel.com>
>>
>> I can also provide a patch against drm-next if needed.
>
> That applied fine, I pulled it in for tomorrow -next.
>

Is that the correct fix for both issues reported by Stephen?

- Sedat -

> Dave.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: 0001-drm-i915-Context-fixes.patch --]
[-- Type: application/octet-stream, Size: 1494 bytes --]

From 94aee4eb3dee5713f7c34c1d97050c481d1233d9 Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@gmail.com>
Date: Fri, 24 Aug 2012 22:24:31 +0200
Subject: [PATCH -next] drm: i915: Context fixes


Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
 drivers/gpu/drm/i915/i915_gem.c    |    4 ++--
 drivers/gpu/drm/i915/intel_modes.c |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 4f6841d..e8a5cb2 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2273,11 +2273,11 @@ int i915_gpu_idle(struct drm_device *dev)
 
 	/* Flush everything onto the inactive list. */
 	for_each_ring(ring, dev_priv, i) {
-		ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
+		ret = i915_ring_idle(ring);
 		if (ret)
 			return ret;
 
-		ret = i915_ring_idle(ring);
+		ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
 		if (ret)
 			return ret;
 
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index 29b7259..4bc1c0f 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -45,7 +45,6 @@ int intel_connector_update_modes(struct drm_connector *connector,
 	drm_mode_connector_update_edid_property(connector, edid);
 	ret = drm_add_edid_modes(connector, edid);
 	drm_edid_to_eld(connector, edid);
-	connector->display_info.raw_edid = NULL;
 	kfree(edid);
 
 	return ret;
-- 
1.7.9.5