From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [Intel-gfx] [PATCH 2/3] drm/i915/dp: use drm_edid_duplicate Date: Tue, 01 Oct 2013 10:37:08 +0300 Message-ID: <87bo394f2z.fsf@intel.com> References: <1380283709-30572-1-git-send-email-jani.nikula@intel.com> <1380283709-30572-2-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Dave Airlie Cc: "intel-gfx@lists.freedesktop.org" , dri-devel List-Id: intel-gfx@lists.freedesktop.org On Tue, 01 Oct 2013, Dave Airlie wrote: > Did you compile or boot this? I get a warning since you are using edid > uninitialised, I guess you meant to duplicate intel_connector->edid. Hi Dave, quite embarrassing, I thought I did, obviously didn't. Updated patch follows. BR, Jani. > > Dave. > >> drivers/gpu/drm/i915/intel_dp.c | 8 +------- >> 1 file changed, 1 insertion(+), 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index 95a3159..aed9d67 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -2920,18 +2920,12 @@ intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) >> /* use cached edid if we have one */ >> if (intel_connector->edid) { >> struct edid *edid; >> - int size; >> >> /* invalid edid */ >> if (IS_ERR(intel_connector->edid)) >> return NULL; >> >> - size = (intel_connector->edid->extensions + 1) * EDID_LENGTH; >> - edid = kmemdup(intel_connector->edid, size, GFP_KERNEL); >> - if (!edid) >> - return NULL; >> - >> - return edid; >> + return drm_edid_duplicate(edid); >> } >> >> return drm_get_edid(connector, adapter); >> -- >> 1.7.9.5 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center