diff for duplicates of <55916943.50402@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 563f879..b8f0986 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -79,54 +79,3 @@ On 2015-06-29 11:44 AM, nick wrote: Sorry the second patch in the drm was the wrong one this was another patch I am lying around. Below is the actual second patch for the bug fix. Nick -From f1802ff61ef69ff9ecaaeadb941d4ed725a0255a Mon Sep 17 00:00:00 2001 -From: Nicholas Krause <xerofoify@gmail.com> -Date: Fri, 22 May 2015 23:10:49 -0400 -Subject: [PATCH 2/2] gma500: Add new error checking for the function, psb_driver_load - -This adds new error checking to the function, psb_driver_load -for when the function, psb_mmu_inset_pfn_sequence fails to grab -memory for the internal function call to psb_pd_addr_end. In -addition we now implement this by checking for a error code -return value from the internal call to the function, -psb_mmu_inset_pfn_sequence for the function, psb_driver_load. -If a error code is returned we must jump to a new label, -unlock_err in order to deallocate our usage count by -one for the usage of the semaphore, sem before unloading -the drm_device structure and returning a error code. - -Signed-off-by: Nicholas Krause <xerofoify@gmail.com> ---- - drivers/gpu/drm/gma500/psb_drv.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c -index 92e7e57..4cef2c9 100644 ---- a/drivers/gpu/drm/gma500/psb_drv.c -+++ b/drivers/gpu/drm/gma500/psb_drv.c -@@ -343,6 +343,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags) - dev_priv->stolen_base >> PAGE_SHIFT, - pg->gatt_start, - pg->stolen_size >> PAGE_SHIFT, 0); -+ if (ret) -+ goto unlock_err; - up_read(&pg->sem); - - psb_mmu_set_pd_context(psb_mmu_get_default_pd(dev_priv->mmu), 0); -@@ -405,6 +407,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags) - #endif - /* Intel drm driver load is done, continue doing pvr load */ - return 0; -+unlock_err: -+ up_read(&pg->sem); - out_err: - psb_driver_unload(dev); - return ret; --- -2.1.4 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index d6756ba..3caf9bc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -93,57 +93,6 @@ "> \n" "Sorry the second patch in the drm was the wrong one this was another patch I am lying around.\n" "Below is the actual second patch for the bug fix.\n" - "Nick\n" - "From f1802ff61ef69ff9ecaaeadb941d4ed725a0255a Mon Sep 17 00:00:00 2001\n" - "From: Nicholas Krause <xerofoify@gmail.com>\n" - "Date: Fri, 22 May 2015 23:10:49 -0400\n" - "Subject: [PATCH 2/2] gma500: Add new error checking for the function, psb_driver_load\n" - "\n" - "This adds new error checking to the function, psb_driver_load\n" - "for when the function, psb_mmu_inset_pfn_sequence fails to grab\n" - "memory for the internal function call to psb_pd_addr_end. In\n" - "addition we now implement this by checking for a error code\n" - "return value from the internal call to the function,\n" - "psb_mmu_inset_pfn_sequence for the function, psb_driver_load.\n" - "If a error code is returned we must jump to a new label,\n" - "unlock_err in order to deallocate our usage count by\n" - "one for the usage of the semaphore, sem before unloading\n" - "the drm_device structure and returning a error code.\n" - "\n" - "Signed-off-by: Nicholas Krause <xerofoify@gmail.com>\n" - "---\n" - " drivers/gpu/drm/gma500/psb_drv.c | 4 ++++\n" - " 1 file changed, 4 insertions(+)\n" - "\n" - "diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c\n" - "index 92e7e57..4cef2c9 100644\n" - "--- a/drivers/gpu/drm/gma500/psb_drv.c\n" - "+++ b/drivers/gpu/drm/gma500/psb_drv.c\n" - "@@ -343,6 +343,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)\n" - " \t\t\t\t\t dev_priv->stolen_base >> PAGE_SHIFT,\n" - " \t\t\t\t\t pg->gatt_start,\n" - " \t\t\t\t\t pg->stolen_size >> PAGE_SHIFT, 0);\n" - "+\tif (ret)\n" - "+\t\tgoto unlock_err;\n" - " \tup_read(&pg->sem);\n" - " \n" - " \tpsb_mmu_set_pd_context(psb_mmu_get_default_pd(dev_priv->mmu), 0);\n" - "@@ -405,6 +407,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)\n" - " #endif\n" - " \t/* Intel drm driver load is done, continue doing pvr load */\n" - " \treturn 0;\n" - "+unlock_err:\n" - "+\tup_read(&pg->sem);\n" - " out_err:\n" - " \tpsb_driver_unload(dev);\n" - " \treturn ret;\n" - "-- \n" - "2.1.4\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + Nick -752a50347679dfc8f489320971e76d3236ef2e3c31407ed935436299d4c42041 +cf626424ecd4c9f8fd8e780e0350ebd4ff3d29320a57774e2a7231d55b0e34b5
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.